diff --git a/src/aipass/templates/cortex/branch_template/docs/.gitkeep b/src/aipass/templates/agents/branch_template/.backup/.gitkeep
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/docs/.gitkeep
rename to src/aipass/templates/agents/branch_template/.backup/.gitkeep
diff --git a/src/aipass/templates/cortex/branch_template/logs/.gitkeep b/src/aipass/templates/agents/branch_template/.chroma/.gitkeep
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/logs/.gitkeep
rename to src/aipass/templates/agents/branch_template/.chroma/.gitkeep
diff --git a/src/aipass/templates/cortex/branch_template/.cotrex/.backup_ignore.json b/src/aipass/templates/agents/branch_template/.cotrex/.backup_ignore.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/.cotrex/.backup_ignore.json
rename to src/aipass/templates/agents/branch_template/.cotrex/.backup_ignore.json
diff --git a/src/aipass/templates/cortex/branch_template/.cotrex/.migrations.json b/src/aipass/templates/agents/branch_template/.cotrex/.migrations.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/.cotrex/.migrations.json
rename to src/aipass/templates/agents/branch_template/.cotrex/.migrations.json
diff --git a/src/aipass/templates/cortex/branch_template/.cotrex/.registry_ignore.json b/src/aipass/templates/agents/branch_template/.cotrex/.registry_ignore.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/.cotrex/.registry_ignore.json
rename to src/aipass/templates/agents/branch_template/.cotrex/.registry_ignore.json
diff --git a/src/aipass/templates/cortex/branch_template/.cotrex/.template_registry.json b/src/aipass/templates/agents/branch_template/.cotrex/.template_registry.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/.cotrex/.template_registry.json
rename to src/aipass/templates/agents/branch_template/.cotrex/.template_registry.json
diff --git a/src/aipass/templates/cortex/branch_template/.gitignore b/src/aipass/templates/agents/branch_template/.gitignore
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/.gitignore
rename to src/aipass/templates/agents/branch_template/.gitignore
diff --git a/src/aipass/templates/cortex/branch_template/apps/handlers/__init__.py b/src/aipass/templates/agents/branch_template/.seedgo/.gitkeep
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/apps/handlers/__init__.py
rename to src/aipass/templates/agents/branch_template/.seedgo/.gitkeep
diff --git a/src/aipass/templates/cortex/branch_template/.trinity/local.json b/src/aipass/templates/agents/branch_template/.trinity/local.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/.trinity/local.json
rename to src/aipass/templates/agents/branch_template/.trinity/local.json
diff --git a/src/aipass/templates/cortex/branch_template/.trinity/observations.json b/src/aipass/templates/agents/branch_template/.trinity/observations.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/.trinity/observations.json
rename to src/aipass/templates/agents/branch_template/.trinity/observations.json
diff --git a/src/aipass/templates/cortex/branch_template/.trinity/passport.json b/src/aipass/templates/agents/branch_template/.trinity/passport.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/.trinity/passport.json
rename to src/aipass/templates/agents/branch_template/.trinity/passport.json
diff --git a/src/aipass/templates/cortex/branch_template/DASHBOARD.local.json b/src/aipass/templates/agents/branch_template/DASHBOARD.local.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/DASHBOARD.local.json
rename to src/aipass/templates/agents/branch_template/DASHBOARD.local.json
diff --git a/src/aipass/templates/cortex/branch_template/README.md b/src/aipass/templates/agents/branch_template/README.md
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/README.md
rename to src/aipass/templates/agents/branch_template/README.md
diff --git a/src/aipass/templates/cortex/branch_template/apps/__init__.py b/src/aipass/templates/agents/branch_template/apps/__init__.py
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/apps/__init__.py
rename to src/aipass/templates/agents/branch_template/apps/__init__.py
diff --git a/src/aipass/templates/cortex/branch_template/apps/branch.py b/src/aipass/templates/agents/branch_template/apps/branch.py
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/apps/branch.py
rename to src/aipass/templates/agents/branch_template/apps/branch.py
diff --git a/src/aipass/templates/cortex/branch_template/apps/modules/__init__.py b/src/aipass/templates/agents/branch_template/apps/handlers/__init__.py
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/apps/modules/__init__.py
rename to src/aipass/templates/agents/branch_template/apps/handlers/__init__.py
diff --git a/src/aipass/templates/cortex/branch_template/apps/plugins/__init__.py b/src/aipass/templates/agents/branch_template/apps/modules/__init__.py
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/apps/plugins/__init__.py
rename to src/aipass/templates/agents/branch_template/apps/modules/__init__.py
diff --git a/src/aipass/templates/agents/branch_template/apps/plugins/__init__.py b/src/aipass/templates/agents/branch_template/apps/plugins/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/aipass/templates/cortex/branch_template/artifacts/artifact_7_cortex_birth_certificate.json b/src/aipass/templates/agents/branch_template/artifacts/artifact_7_cortex_birth_certificate.json
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/artifacts/artifact_7_cortex_birth_certificate.json
rename to src/aipass/templates/agents/branch_template/artifacts/artifact_7_cortex_birth_certificate.json
diff --git a/src/aipass/templates/agents/branch_template/docs/.gitkeep b/src/aipass/templates/agents/branch_template/docs/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/aipass/templates/cortex/branch_template/flow.local.md b/src/aipass/templates/agents/branch_template/flow.local.md
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/flow.local.md
rename to src/aipass/templates/agents/branch_template/flow.local.md
diff --git a/src/aipass/templates/agents/branch_template/logs/.gitkeep b/src/aipass/templates/agents/branch_template/logs/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/aipass/templates/cortex/branch_template/pytest.ini b/src/aipass/templates/agents/branch_template/pytest.ini
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/pytest.ini
rename to src/aipass/templates/agents/branch_template/pytest.ini
diff --git a/src/aipass/templates/cortex/branch_template/tests/__init__.py b/src/aipass/templates/agents/branch_template/tests/__init__.py
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/tests/__init__.py
rename to src/aipass/templates/agents/branch_template/tests/__init__.py
diff --git a/src/aipass/templates/cortex/branch_template/tests/conftest.py b/src/aipass/templates/agents/branch_template/tests/conftest.py
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/tests/conftest.py
rename to src/aipass/templates/agents/branch_template/tests/conftest.py
diff --git a/src/aipass/templates/cortex/branch_template/tools/verify_branch.py b/src/aipass/templates/agents/branch_template/tools/verify_branch.py
similarity index 100%
rename from src/aipass/templates/cortex/branch_template/tools/verify_branch.py
rename to src/aipass/templates/agents/branch_template/tools/verify_branch.py
diff --git a/src/aipass/templates/agents/branch_template/{{BRANCH}}_json/.gitkeep b/src/aipass/templates/agents/branch_template/{{BRANCH}}_json/.gitkeep
new file mode 100644
index 00000000..e69de29b