diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index a1aa2eb..81d44dc 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Install PyYAML
         run: python -m pip install --no-input --disable-pip-version-check pyyaml==6.0.1
 
-      - name: Run validator
+      - name: Run validator (--strict: hard-fail on cross-tree '..')
         run: |
           chmod +x .molecule-ci/scripts/validate-tree.py
-          .molecule-ci/scripts/validate-tree.py
+          .molecule-ci/scripts/validate-tree.py --strict
diff --git a/app-lead/workspace.yaml b/app-lead/workspace.yaml
deleted file mode 100644
index 4edcf38..0000000
--- a/app-lead/workspace.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: App & Docs Lead
-role: >-
-  App & Docs team lead. Owns molecule-app and docs site. Triage+merge
-  authority. Dispatches to App-FE, App-QA, Doc Specialist, Technical Writer.
-tier: 3
-runtime: claude-code
-model: MiniMax-M2.7
-parent: dev-lead
-files_dir: app-lead
-plugins: [molecule-skill-code-review, molecule-skill-llm-judge]
-idle_interval_seconds: 900
-schedules:
-  - name: Orchestrator pulse (every 5 min)
-    cron_expr: "0,5,10,15,20,25,30,35,40,45,50,55 * * * *"
-    enabled: true
-    prompt_file: schedules/orchestrator-pulse.md
diff --git a/core-lead/workspace.yaml b/core-lead/workspace.yaml
deleted file mode 100644
index 1e12183..0000000
--- a/core-lead/workspace.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Core Platform Lead
-role: >-
-  Core Platform team lead. Owns molecule-core (the monorepo). Has
-  triage+merge authority for all molecule-core PRs. Reviews PRs,
-  manages issues, dispatches work to Core-BE, Core-FE, Core-QA,
-  Core-Security, Core-UIUX, Core-DevOps, Core-OffSec. Enforces
-  staging-first workflow for molecule-core.
-tier: 3
-runtime: claude-code
-model: MiniMax-M2.7
-parent: dev-lead
-files_dir: core-lead
-plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
-idle_interval_seconds: 900
-schedules:
-  - name: Orchestrator pulse (every 5 min)
-    cron_expr: "1,6,11,16,21,26,31,36,41,46,51,56 * * * *"
-    enabled: true
-    prompt_file: schedules/orchestrator-pulse.md
diff --git a/cp-lead/workspace.yaml b/cp-lead/workspace.yaml
deleted file mode 100644
index f6c8f1e..0000000
--- a/cp-lead/workspace.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Controlplane Lead
-role: >-
-  Controlplane team lead. Owns molecule-controlplane and molecule-tenant-proxy.
-  Triage+merge authority. Dispatches to CP-BE, CP-QA, CP-Security.
-tier: 3
-runtime: claude-code
-model: MiniMax-M2.7
-parent: dev-lead
-files_dir: cp-lead
-plugins: [molecule-hitl, molecule-skill-code-review, molecule-security-scan, molecule-skill-llm-judge, molecule-compliance]
-idle_interval_seconds: 900
-schedules:
-  - name: Orchestrator pulse (every 5 min)
-    cron_expr: "2,7,12,17,22,27,32,37,42,47,52,57 * * * *"
-    enabled: true
-    prompt_file: schedules/orchestrator-pulse.md
diff --git a/dev-department.yaml b/dev-department.yaml
index 22b8a84..4d6c2e7 100644
--- a/dev-department.yaml
+++ b/dev-department.yaml
@@ -83,4 +83,4 @@ defaults:
 # + fullstack-engineer floaters + documentation-specialist + triage-operator
 # (the last two added per Hongming Q1+Q2).
 roots:
-  - !include teams/dev.yaml
+  - !include ./dev-lead/workspace.yaml
diff --git a/app-fe/idle-prompt.md b/dev-lead/app-lead/app-fe/idle-prompt.md
similarity index 100%
rename from app-fe/idle-prompt.md
rename to dev-lead/app-lead/app-fe/idle-prompt.md
diff --git a/app-fe/initial-prompt.md b/dev-lead/app-lead/app-fe/initial-prompt.md
similarity index 100%
rename from app-fe/initial-prompt.md
rename to dev-lead/app-lead/app-fe/initial-prompt.md
diff --git a/app-fe/schedules/pick-up-work.md b/dev-lead/app-lead/app-fe/schedules/pick-up-work.md
similarity index 100%
rename from app-fe/schedules/pick-up-work.md
rename to dev-lead/app-lead/app-fe/schedules/pick-up-work.md
diff --git a/app-fe/system-prompt.md b/dev-lead/app-lead/app-fe/system-prompt.md
similarity index 100%
rename from app-fe/system-prompt.md
rename to dev-lead/app-lead/app-fe/system-prompt.md
diff --git a/app-fe/workspace.yaml b/dev-lead/app-lead/app-fe/workspace.yaml
similarity index 92%
rename from app-fe/workspace.yaml
rename to dev-lead/app-lead/app-fe/workspace.yaml
index bcea8d6..228c277 100644
--- a/app-fe/workspace.yaml
+++ b/dev-lead/app-lead/app-fe/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: app-lead
-files_dir: app-fe
+files_dir: dev-lead/app-lead/app-fe
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge]
 idle_interval_seconds: 900
 schedules:
diff --git a/app-qa/idle-prompt.md b/dev-lead/app-lead/app-qa/idle-prompt.md
similarity index 100%
rename from app-qa/idle-prompt.md
rename to dev-lead/app-lead/app-qa/idle-prompt.md
diff --git a/app-lead/initial-prompt.md b/dev-lead/app-lead/app-qa/initial-prompt.md
similarity index 100%
rename from app-lead/initial-prompt.md
rename to dev-lead/app-lead/app-qa/initial-prompt.md
diff --git a/app-qa/schedules/qa-review.md b/dev-lead/app-lead/app-qa/schedules/qa-review.md
similarity index 100%
rename from app-qa/schedules/qa-review.md
rename to dev-lead/app-lead/app-qa/schedules/qa-review.md
diff --git a/app-qa/system-prompt.md b/dev-lead/app-lead/app-qa/system-prompt.md
similarity index 100%
rename from app-qa/system-prompt.md
rename to dev-lead/app-lead/app-qa/system-prompt.md
diff --git a/app-qa/workspace.yaml b/dev-lead/app-lead/app-qa/workspace.yaml
similarity index 92%
rename from app-qa/workspace.yaml
rename to dev-lead/app-lead/app-qa/workspace.yaml
index ac47f19..1b76aac 100644
--- a/app-qa/workspace.yaml
+++ b/dev-lead/app-lead/app-qa/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: app-lead
-files_dir: app-qa
+files_dir: dev-lead/app-lead/app-qa
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/documentation-specialist/idle-prompt.md b/dev-lead/app-lead/documentation-specialist/idle-prompt.md
similarity index 100%
rename from documentation-specialist/idle-prompt.md
rename to dev-lead/app-lead/documentation-specialist/idle-prompt.md
diff --git a/documentation-specialist/initial-prompt.md b/dev-lead/app-lead/documentation-specialist/initial-prompt.md
similarity index 100%
rename from documentation-specialist/initial-prompt.md
rename to dev-lead/app-lead/documentation-specialist/initial-prompt.md
diff --git a/documentation-specialist/schedules/cross-repo-docs-watch-every-2h.md b/dev-lead/app-lead/documentation-specialist/schedules/cross-repo-docs-watch-every-2h.md
similarity index 100%
rename from documentation-specialist/schedules/cross-repo-docs-watch-every-2h.md
rename to dev-lead/app-lead/documentation-specialist/schedules/cross-repo-docs-watch-every-2h.md
diff --git a/documentation-specialist/schedules/daily-changelog.md b/dev-lead/app-lead/documentation-specialist/schedules/daily-changelog.md
similarity index 100%
rename from documentation-specialist/schedules/daily-changelog.md
rename to dev-lead/app-lead/documentation-specialist/schedules/daily-changelog.md
diff --git a/documentation-specialist/schedules/daily-docs-sync.md b/dev-lead/app-lead/documentation-specialist/schedules/daily-docs-sync.md
similarity index 100%
rename from documentation-specialist/schedules/daily-docs-sync.md
rename to dev-lead/app-lead/documentation-specialist/schedules/daily-docs-sync.md
diff --git a/documentation-specialist/schedules/weekly-terminology-audit.md b/dev-lead/app-lead/documentation-specialist/schedules/weekly-terminology-audit.md
similarity index 100%
rename from documentation-specialist/schedules/weekly-terminology-audit.md
rename to dev-lead/app-lead/documentation-specialist/schedules/weekly-terminology-audit.md
diff --git a/documentation-specialist/system-prompt.md b/dev-lead/app-lead/documentation-specialist/system-prompt.md
similarity index 100%
rename from documentation-specialist/system-prompt.md
rename to dev-lead/app-lead/documentation-specialist/system-prompt.md
diff --git a/teams/documentation-specialist.yaml b/dev-lead/app-lead/documentation-specialist/workspace.yaml
similarity index 98%
rename from teams/documentation-specialist.yaml
rename to dev-lead/app-lead/documentation-specialist/workspace.yaml
index 46ec62f..d9eb0c2 100644
--- a/teams/documentation-specialist.yaml
+++ b/dev-lead/app-lead/documentation-specialist/workspace.yaml
@@ -34,7 +34,7 @@ role: >-
   stay current; nothing private leaks to public.
 tier: 3
 model: opus
-files_dir: documentation-specialist
+files_dir: dev-lead/app-lead/documentation-specialist
 canvas: {x: 900, y: 250}
         # Documentation Specialist needs browser-automation to crawl the live
         # docs site (visual regressions, broken links, dead anchors) plus
diff --git a/app-lead/idle-prompt.md b/dev-lead/app-lead/idle-prompt.md
similarity index 100%
rename from app-lead/idle-prompt.md
rename to dev-lead/app-lead/idle-prompt.md
diff --git a/app-qa/initial-prompt.md b/dev-lead/app-lead/initial-prompt.md
similarity index 100%
rename from app-qa/initial-prompt.md
rename to dev-lead/app-lead/initial-prompt.md
diff --git a/app-lead/schedules/orchestrator-pulse.md b/dev-lead/app-lead/schedules/orchestrator-pulse.md
similarity index 100%
rename from app-lead/schedules/orchestrator-pulse.md
rename to dev-lead/app-lead/schedules/orchestrator-pulse.md
diff --git a/app-lead/system-prompt.md b/dev-lead/app-lead/system-prompt.md
similarity index 100%
rename from app-lead/system-prompt.md
rename to dev-lead/app-lead/system-prompt.md
diff --git a/technical-writer/idle-prompt.md b/dev-lead/app-lead/technical-writer/idle-prompt.md
similarity index 100%
rename from technical-writer/idle-prompt.md
rename to dev-lead/app-lead/technical-writer/idle-prompt.md
diff --git a/technical-writer/initial-prompt.md b/dev-lead/app-lead/technical-writer/initial-prompt.md
similarity index 100%
rename from technical-writer/initial-prompt.md
rename to dev-lead/app-lead/technical-writer/initial-prompt.md
diff --git a/technical-writer/schedules/pick-up-work.md b/dev-lead/app-lead/technical-writer/schedules/pick-up-work.md
similarity index 100%
rename from technical-writer/schedules/pick-up-work.md
rename to dev-lead/app-lead/technical-writer/schedules/pick-up-work.md
diff --git a/technical-writer/system-prompt.md b/dev-lead/app-lead/technical-writer/system-prompt.md
similarity index 100%
rename from technical-writer/system-prompt.md
rename to dev-lead/app-lead/technical-writer/system-prompt.md
diff --git a/technical-writer/workspace.yaml b/dev-lead/app-lead/technical-writer/workspace.yaml
similarity index 91%
rename from technical-writer/workspace.yaml
rename to dev-lead/app-lead/technical-writer/workspace.yaml
index d4248f5..140d68d 100644
--- a/technical-writer/workspace.yaml
+++ b/dev-lead/app-lead/technical-writer/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: app-lead
-files_dir: technical-writer
+files_dir: dev-lead/app-lead/technical-writer
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, browser-automation]
 idle_interval_seconds: 900
 schedules:
diff --git a/teams/app-docs.yaml b/dev-lead/app-lead/workspace.yaml
similarity index 70%
rename from teams/app-docs.yaml
rename to dev-lead/app-lead/workspace.yaml
index 083017a..89921ba 100644
--- a/teams/app-docs.yaml
+++ b/dev-lead/app-lead/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: dev-lead
-files_dir: app-lead
+files_dir: dev-lead/app-lead
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge]
 idle_interval_seconds: 900
 schedules:
@@ -15,7 +15,7 @@ schedules:
     enabled: true
     prompt_file: schedules/orchestrator-pulse.md
 children:
-  - !include ../app-fe/workspace.yaml
-  - !include ../app-qa/workspace.yaml
-  - !include documentation-specialist.yaml
-  - !include ../technical-writer/workspace.yaml
+  - !include ./app-fe/workspace.yaml
+  - !include ./app-qa/workspace.yaml
+  - !include ./documentation-specialist/workspace.yaml
+  - !include ./technical-writer/workspace.yaml
diff --git a/core-be/idle-prompt.md b/dev-lead/core-lead/core-be/idle-prompt.md
similarity index 100%
rename from core-be/idle-prompt.md
rename to dev-lead/core-lead/core-be/idle-prompt.md
diff --git a/core-be/initial-prompt.md b/dev-lead/core-lead/core-be/initial-prompt.md
similarity index 100%
rename from core-be/initial-prompt.md
rename to dev-lead/core-lead/core-be/initial-prompt.md
diff --git a/core-be/schedules/pick-up-work.md b/dev-lead/core-lead/core-be/schedules/pick-up-work.md
similarity index 100%
rename from core-be/schedules/pick-up-work.md
rename to dev-lead/core-lead/core-be/schedules/pick-up-work.md
diff --git a/core-be/system-prompt.md b/dev-lead/core-lead/core-be/system-prompt.md
similarity index 100%
rename from core-be/system-prompt.md
rename to dev-lead/core-lead/core-be/system-prompt.md
diff --git a/core-be/workspace.yaml b/dev-lead/core-lead/core-be/workspace.yaml
similarity index 94%
rename from core-be/workspace.yaml
rename to dev-lead/core-lead/core-be/workspace.yaml
index fbf686c..c7bb489 100644
--- a/core-be/workspace.yaml
+++ b/dev-lead/core-lead/core-be/workspace.yaml
@@ -7,7 +7,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: core-lead
-files_dir: core-be
+files_dir: dev-lead/core-lead/core-be
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-security-scan, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/core-devops/idle-prompt.md b/dev-lead/core-lead/core-devops/idle-prompt.md
similarity index 100%
rename from core-devops/idle-prompt.md
rename to dev-lead/core-lead/core-devops/idle-prompt.md
diff --git a/core-devops/initial-prompt.md b/dev-lead/core-lead/core-devops/initial-prompt.md
similarity index 100%
rename from core-devops/initial-prompt.md
rename to dev-lead/core-lead/core-devops/initial-prompt.md
diff --git a/core-devops/schedules/pick-up-work.md b/dev-lead/core-lead/core-devops/schedules/pick-up-work.md
similarity index 100%
rename from core-devops/schedules/pick-up-work.md
rename to dev-lead/core-lead/core-devops/schedules/pick-up-work.md
diff --git a/core-devops/system-prompt.md b/dev-lead/core-lead/core-devops/system-prompt.md
similarity index 100%
rename from core-devops/system-prompt.md
rename to dev-lead/core-lead/core-devops/system-prompt.md
diff --git a/core-devops/workspace.yaml b/dev-lead/core-lead/core-devops/workspace.yaml
similarity index 93%
rename from core-devops/workspace.yaml
rename to dev-lead/core-lead/core-devops/workspace.yaml
index c7187e9..2407332 100644
--- a/core-devops/workspace.yaml
+++ b/dev-lead/core-lead/core-devops/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: core-lead
-files_dir: core-devops
+files_dir: dev-lead/core-lead/core-devops
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-freeze-scope]
 channels:
   - type: telegram
diff --git a/core-fe/idle-prompt.md b/dev-lead/core-lead/core-fe/idle-prompt.md
similarity index 100%
rename from core-fe/idle-prompt.md
rename to dev-lead/core-lead/core-fe/idle-prompt.md
diff --git a/core-fe/initial-prompt.md b/dev-lead/core-lead/core-fe/initial-prompt.md
similarity index 100%
rename from core-fe/initial-prompt.md
rename to dev-lead/core-lead/core-fe/initial-prompt.md
diff --git a/core-fe/schedules/pick-up-work.md b/dev-lead/core-lead/core-fe/schedules/pick-up-work.md
similarity index 100%
rename from core-fe/schedules/pick-up-work.md
rename to dev-lead/core-lead/core-fe/schedules/pick-up-work.md
diff --git a/core-fe/system-prompt.md b/dev-lead/core-lead/core-fe/system-prompt.md
similarity index 100%
rename from core-fe/system-prompt.md
rename to dev-lead/core-lead/core-fe/system-prompt.md
diff --git a/core-fe/workspace.yaml b/dev-lead/core-lead/core-fe/workspace.yaml
similarity index 93%
rename from core-fe/workspace.yaml
rename to dev-lead/core-lead/core-fe/workspace.yaml
index 8682546..ef2c202 100644
--- a/core-fe/workspace.yaml
+++ b/dev-lead/core-lead/core-fe/workspace.yaml
@@ -7,7 +7,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: core-lead
-files_dir: core-fe
+files_dir: dev-lead/core-lead/core-fe
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge]
 idle_interval_seconds: 900
 schedules:
diff --git a/core-offsec/idle-prompt.md b/dev-lead/core-lead/core-offsec/idle-prompt.md
similarity index 100%
rename from core-offsec/idle-prompt.md
rename to dev-lead/core-lead/core-offsec/idle-prompt.md
diff --git a/core-lead/initial-prompt.md b/dev-lead/core-lead/core-offsec/initial-prompt.md
similarity index 100%
rename from core-lead/initial-prompt.md
rename to dev-lead/core-lead/core-offsec/initial-prompt.md
diff --git a/core-offsec/schedules/pick-up-work.md b/dev-lead/core-lead/core-offsec/schedules/pick-up-work.md
similarity index 100%
rename from core-offsec/schedules/pick-up-work.md
rename to dev-lead/core-lead/core-offsec/schedules/pick-up-work.md
diff --git a/core-offsec/schedules/security-scan.md b/dev-lead/core-lead/core-offsec/schedules/security-scan.md
similarity index 100%
rename from core-offsec/schedules/security-scan.md
rename to dev-lead/core-lead/core-offsec/schedules/security-scan.md
diff --git a/core-offsec/system-prompt.md b/dev-lead/core-lead/core-offsec/system-prompt.md
similarity index 100%
rename from core-offsec/system-prompt.md
rename to dev-lead/core-lead/core-offsec/system-prompt.md
diff --git a/core-offsec/workspace.yaml b/dev-lead/core-lead/core-offsec/workspace.yaml
similarity index 93%
rename from core-offsec/workspace.yaml
rename to dev-lead/core-lead/core-offsec/workspace.yaml
index 7b09082..c4bc65d 100644
--- a/core-offsec/workspace.yaml
+++ b/dev-lead/core-lead/core-offsec/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: core-lead
-files_dir: core-offsec
+files_dir: dev-lead/core-lead/core-offsec
 plugins:
   - molecule-skill-code-review
   - molecule-skill-cross-vendor-review
diff --git a/core-qa/idle-prompt.md b/dev-lead/core-lead/core-qa/idle-prompt.md
similarity index 100%
rename from core-qa/idle-prompt.md
rename to dev-lead/core-lead/core-qa/idle-prompt.md
diff --git a/core-offsec/initial-prompt.md b/dev-lead/core-lead/core-qa/initial-prompt.md
similarity index 100%
rename from core-offsec/initial-prompt.md
rename to dev-lead/core-lead/core-qa/initial-prompt.md
diff --git a/core-qa/schedules/qa-review.md b/dev-lead/core-lead/core-qa/schedules/qa-review.md
similarity index 100%
rename from core-qa/schedules/qa-review.md
rename to dev-lead/core-lead/core-qa/schedules/qa-review.md
diff --git a/core-qa/system-prompt.md b/dev-lead/core-lead/core-qa/system-prompt.md
similarity index 100%
rename from core-qa/system-prompt.md
rename to dev-lead/core-lead/core-qa/system-prompt.md
diff --git a/core-qa/workspace.yaml b/dev-lead/core-lead/core-qa/workspace.yaml
similarity index 93%
rename from core-qa/workspace.yaml
rename to dev-lead/core-lead/core-qa/workspace.yaml
index eae0a55..32343c4 100644
--- a/core-qa/workspace.yaml
+++ b/dev-lead/core-lead/core-qa/workspace.yaml
@@ -7,7 +7,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: core-lead
-files_dir: core-qa
+files_dir: dev-lead/core-lead/core-qa
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/core-security/idle-prompt.md b/dev-lead/core-lead/core-security/idle-prompt.md
similarity index 100%
rename from core-security/idle-prompt.md
rename to dev-lead/core-lead/core-security/idle-prompt.md
diff --git a/core-qa/initial-prompt.md b/dev-lead/core-lead/core-security/initial-prompt.md
similarity index 100%
rename from core-qa/initial-prompt.md
rename to dev-lead/core-lead/core-security/initial-prompt.md
diff --git a/core-security/schedules/security-scan.md b/dev-lead/core-lead/core-security/schedules/security-scan.md
similarity index 100%
rename from core-security/schedules/security-scan.md
rename to dev-lead/core-lead/core-security/schedules/security-scan.md
diff --git a/core-security/system-prompt.md b/dev-lead/core-lead/core-security/system-prompt.md
similarity index 100%
rename from core-security/system-prompt.md
rename to dev-lead/core-lead/core-security/system-prompt.md
diff --git a/core-security/workspace.yaml b/dev-lead/core-lead/core-security/workspace.yaml
similarity index 93%
rename from core-security/workspace.yaml
rename to dev-lead/core-lead/core-security/workspace.yaml
index 338f28e..f6a9104 100644
--- a/core-security/workspace.yaml
+++ b/dev-lead/core-lead/core-security/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: core-lead
-files_dir: core-security
+files_dir: dev-lead/core-lead/core-security
 plugins:
   - molecule-skill-code-review
   - molecule-skill-cross-vendor-review
diff --git a/core-uiux/idle-prompt.md b/dev-lead/core-lead/core-uiux/idle-prompt.md
similarity index 100%
rename from core-uiux/idle-prompt.md
rename to dev-lead/core-lead/core-uiux/idle-prompt.md
diff --git a/core-security/initial-prompt.md b/dev-lead/core-lead/core-uiux/initial-prompt.md
similarity index 100%
rename from core-security/initial-prompt.md
rename to dev-lead/core-lead/core-uiux/initial-prompt.md
diff --git a/core-uiux/schedules/pick-up-work.md b/dev-lead/core-lead/core-uiux/schedules/pick-up-work.md
similarity index 100%
rename from core-uiux/schedules/pick-up-work.md
rename to dev-lead/core-lead/core-uiux/schedules/pick-up-work.md
diff --git a/core-uiux/system-prompt.md b/dev-lead/core-lead/core-uiux/system-prompt.md
similarity index 100%
rename from core-uiux/system-prompt.md
rename to dev-lead/core-lead/core-uiux/system-prompt.md
diff --git a/core-uiux/workspace.yaml b/dev-lead/core-lead/core-uiux/workspace.yaml
similarity index 92%
rename from core-uiux/workspace.yaml
rename to dev-lead/core-lead/core-uiux/workspace.yaml
index f075b8c..c071855 100644
--- a/core-uiux/workspace.yaml
+++ b/dev-lead/core-lead/core-uiux/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: core-lead
-files_dir: core-uiux
+files_dir: dev-lead/core-lead/core-uiux
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, browser-automation]
 idle_interval_seconds: 900
 schedules:
diff --git a/core-lead/idle-prompt.md b/dev-lead/core-lead/idle-prompt.md
similarity index 100%
rename from core-lead/idle-prompt.md
rename to dev-lead/core-lead/idle-prompt.md
diff --git a/core-uiux/initial-prompt.md b/dev-lead/core-lead/initial-prompt.md
similarity index 100%
rename from core-uiux/initial-prompt.md
rename to dev-lead/core-lead/initial-prompt.md
diff --git a/core-lead/schedules/orchestrator-pulse.md b/dev-lead/core-lead/schedules/orchestrator-pulse.md
similarity index 100%
rename from core-lead/schedules/orchestrator-pulse.md
rename to dev-lead/core-lead/schedules/orchestrator-pulse.md
diff --git a/core-lead/system-prompt.md b/dev-lead/core-lead/system-prompt.md
similarity index 100%
rename from core-lead/system-prompt.md
rename to dev-lead/core-lead/system-prompt.md
diff --git a/teams/core-platform.yaml b/dev-lead/core-lead/workspace.yaml
similarity index 62%
rename from teams/core-platform.yaml
rename to dev-lead/core-lead/workspace.yaml
index fcb2a15..b694a55 100644
--- a/teams/core-platform.yaml
+++ b/dev-lead/core-lead/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: dev-lead
-files_dir: core-lead
+files_dir: dev-lead/core-lead
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
@@ -15,10 +15,10 @@ schedules:
     enabled: true
     prompt_file: schedules/orchestrator-pulse.md
 children:
-  - !include ../core-be/workspace.yaml
-  - !include ../core-fe/workspace.yaml
-  - !include ../core-qa/workspace.yaml
-  - !include ../core-security/workspace.yaml
-  - !include ../core-uiux/workspace.yaml
-  - !include ../core-devops/workspace.yaml
-  - !include ../core-offsec/workspace.yaml
+  - !include ./core-be/workspace.yaml
+  - !include ./core-fe/workspace.yaml
+  - !include ./core-qa/workspace.yaml
+  - !include ./core-security/workspace.yaml
+  - !include ./core-uiux/workspace.yaml
+  - !include ./core-devops/workspace.yaml
+  - !include ./core-offsec/workspace.yaml
diff --git a/cp-be/idle-prompt.md b/dev-lead/cp-lead/cp-be/idle-prompt.md
similarity index 100%
rename from cp-be/idle-prompt.md
rename to dev-lead/cp-lead/cp-be/idle-prompt.md
diff --git a/cp-be/initial-prompt.md b/dev-lead/cp-lead/cp-be/initial-prompt.md
similarity index 100%
rename from cp-be/initial-prompt.md
rename to dev-lead/cp-lead/cp-be/initial-prompt.md
diff --git a/cp-be/schedules/pick-up-work.md b/dev-lead/cp-lead/cp-be/schedules/pick-up-work.md
similarity index 100%
rename from cp-be/schedules/pick-up-work.md
rename to dev-lead/cp-lead/cp-be/schedules/pick-up-work.md
diff --git a/cp-be/system-prompt.md b/dev-lead/cp-lead/cp-be/system-prompt.md
similarity index 100%
rename from cp-be/system-prompt.md
rename to dev-lead/cp-lead/cp-be/system-prompt.md
diff --git a/cp-be/workspace.yaml b/dev-lead/cp-lead/cp-be/workspace.yaml
similarity index 94%
rename from cp-be/workspace.yaml
rename to dev-lead/cp-lead/cp-be/workspace.yaml
index f099bf2..ee240aa 100644
--- a/cp-be/workspace.yaml
+++ b/dev-lead/cp-lead/cp-be/workspace.yaml
@@ -7,7 +7,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: cp-lead
-files_dir: cp-be
+files_dir: dev-lead/cp-lead/cp-be
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-security-scan, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/cp-qa/idle-prompt.md b/dev-lead/cp-lead/cp-qa/idle-prompt.md
similarity index 100%
rename from cp-qa/idle-prompt.md
rename to dev-lead/cp-lead/cp-qa/idle-prompt.md
diff --git a/cp-lead/initial-prompt.md b/dev-lead/cp-lead/cp-qa/initial-prompt.md
similarity index 100%
rename from cp-lead/initial-prompt.md
rename to dev-lead/cp-lead/cp-qa/initial-prompt.md
diff --git a/cp-qa/schedules/qa-review.md b/dev-lead/cp-lead/cp-qa/schedules/qa-review.md
similarity index 100%
rename from cp-qa/schedules/qa-review.md
rename to dev-lead/cp-lead/cp-qa/schedules/qa-review.md
diff --git a/cp-qa/system-prompt.md b/dev-lead/cp-lead/cp-qa/system-prompt.md
similarity index 100%
rename from cp-qa/system-prompt.md
rename to dev-lead/cp-lead/cp-qa/system-prompt.md
diff --git a/cp-qa/workspace.yaml b/dev-lead/cp-lead/cp-qa/workspace.yaml
similarity index 93%
rename from cp-qa/workspace.yaml
rename to dev-lead/cp-lead/cp-qa/workspace.yaml
index e032407..eb7d0b0 100644
--- a/cp-qa/workspace.yaml
+++ b/dev-lead/cp-lead/cp-qa/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: cp-lead
-files_dir: cp-qa
+files_dir: dev-lead/cp-lead/cp-qa
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/cp-security/idle-prompt.md b/dev-lead/cp-lead/cp-security/idle-prompt.md
similarity index 100%
rename from cp-security/idle-prompt.md
rename to dev-lead/cp-lead/cp-security/idle-prompt.md
diff --git a/cp-qa/initial-prompt.md b/dev-lead/cp-lead/cp-security/initial-prompt.md
similarity index 100%
rename from cp-qa/initial-prompt.md
rename to dev-lead/cp-lead/cp-security/initial-prompt.md
diff --git a/cp-security/schedules/security-scan.md b/dev-lead/cp-lead/cp-security/schedules/security-scan.md
similarity index 100%
rename from cp-security/schedules/security-scan.md
rename to dev-lead/cp-lead/cp-security/schedules/security-scan.md
diff --git a/cp-security/system-prompt.md b/dev-lead/cp-lead/cp-security/system-prompt.md
similarity index 100%
rename from cp-security/system-prompt.md
rename to dev-lead/cp-lead/cp-security/system-prompt.md
diff --git a/cp-security/workspace.yaml b/dev-lead/cp-lead/cp-security/workspace.yaml
similarity index 93%
rename from cp-security/workspace.yaml
rename to dev-lead/cp-lead/cp-security/workspace.yaml
index a13f986..b95569b 100644
--- a/cp-security/workspace.yaml
+++ b/dev-lead/cp-lead/cp-security/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: cp-lead
-files_dir: cp-security
+files_dir: dev-lead/cp-lead/cp-security
 plugins:
   - molecule-skill-code-review
   - molecule-skill-cross-vendor-review
diff --git a/cp-lead/idle-prompt.md b/dev-lead/cp-lead/idle-prompt.md
similarity index 100%
rename from cp-lead/idle-prompt.md
rename to dev-lead/cp-lead/idle-prompt.md
diff --git a/cp-security/initial-prompt.md b/dev-lead/cp-lead/initial-prompt.md
similarity index 100%
rename from cp-security/initial-prompt.md
rename to dev-lead/cp-lead/initial-prompt.md
diff --git a/cp-lead/schedules/orchestrator-pulse.md b/dev-lead/cp-lead/schedules/orchestrator-pulse.md
similarity index 100%
rename from cp-lead/schedules/orchestrator-pulse.md
rename to dev-lead/cp-lead/schedules/orchestrator-pulse.md
diff --git a/cp-lead/system-prompt.md b/dev-lead/cp-lead/system-prompt.md
similarity index 100%
rename from cp-lead/system-prompt.md
rename to dev-lead/cp-lead/system-prompt.md
diff --git a/teams/controlplane.yaml b/dev-lead/cp-lead/workspace.yaml
similarity index 79%
rename from teams/controlplane.yaml
rename to dev-lead/cp-lead/workspace.yaml
index 32bfc0d..d8a558f 100644
--- a/teams/controlplane.yaml
+++ b/dev-lead/cp-lead/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: dev-lead
-files_dir: cp-lead
+files_dir: dev-lead/cp-lead
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-security-scan, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
@@ -15,6 +15,6 @@ schedules:
     enabled: true
     prompt_file: schedules/orchestrator-pulse.md
 children:
-  - !include ../cp-be/workspace.yaml
-  - !include ../cp-qa/workspace.yaml
-  - !include ../cp-security/workspace.yaml
+  - !include ./cp-be/workspace.yaml
+  - !include ./cp-qa/workspace.yaml
+  - !include ./cp-security/workspace.yaml
diff --git a/fullstack-engineer/config.yaml b/dev-lead/fullstack-engineer/config.yaml
similarity index 100%
rename from fullstack-engineer/config.yaml
rename to dev-lead/fullstack-engineer/config.yaml
diff --git a/fullstack-engineer/idle-prompt.md b/dev-lead/fullstack-engineer/idle-prompt.md
similarity index 100%
rename from fullstack-engineer/idle-prompt.md
rename to dev-lead/fullstack-engineer/idle-prompt.md
diff --git a/fullstack-engineer/initial-prompt.md b/dev-lead/fullstack-engineer/initial-prompt.md
similarity index 100%
rename from fullstack-engineer/initial-prompt.md
rename to dev-lead/fullstack-engineer/initial-prompt.md
diff --git a/fullstack-engineer/schedules/hourly-pick-up-work.md b/dev-lead/fullstack-engineer/schedules/hourly-pick-up-work.md
similarity index 100%
rename from fullstack-engineer/schedules/hourly-pick-up-work.md
rename to dev-lead/fullstack-engineer/schedules/hourly-pick-up-work.md
diff --git a/fullstack-engineer/schedules/pick-up-work.md b/dev-lead/fullstack-engineer/schedules/pick-up-work.md
similarity index 100%
rename from fullstack-engineer/schedules/pick-up-work.md
rename to dev-lead/fullstack-engineer/schedules/pick-up-work.md
diff --git a/fullstack-engineer/system-prompt.md b/dev-lead/fullstack-engineer/system-prompt.md
similarity index 100%
rename from fullstack-engineer/system-prompt.md
rename to dev-lead/fullstack-engineer/system-prompt.md
diff --git a/fullstack-engineer/workspace.yaml b/dev-lead/fullstack-engineer/workspace.yaml
similarity index 93%
rename from fullstack-engineer/workspace.yaml
rename to dev-lead/fullstack-engineer/workspace.yaml
index 8d45fcc..3998adc 100644
--- a/fullstack-engineer/workspace.yaml
+++ b/dev-lead/fullstack-engineer/workspace.yaml
@@ -6,7 +6,7 @@ role: >-
   Bridges backend + frontend for cross-cutting features.
 tier: 3
 model: opus
-files_dir: fullstack-engineer
+files_dir: dev-lead/fullstack-engineer
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-security-scan, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 600
 schedules:
diff --git a/infra-lead/idle-prompt.md b/dev-lead/infra-lead/idle-prompt.md
similarity index 100%
rename from infra-lead/idle-prompt.md
rename to dev-lead/infra-lead/idle-prompt.md
diff --git a/infra-runtime-be/idle-prompt.md b/dev-lead/infra-lead/infra-runtime-be/idle-prompt.md
similarity index 100%
rename from infra-runtime-be/idle-prompt.md
rename to dev-lead/infra-lead/infra-runtime-be/idle-prompt.md
diff --git a/infra-lead/initial-prompt.md b/dev-lead/infra-lead/infra-runtime-be/initial-prompt.md
similarity index 100%
rename from infra-lead/initial-prompt.md
rename to dev-lead/infra-lead/infra-runtime-be/initial-prompt.md
diff --git a/infra-runtime-be/schedules/pick-up-work.md b/dev-lead/infra-lead/infra-runtime-be/schedules/pick-up-work.md
similarity index 100%
rename from infra-runtime-be/schedules/pick-up-work.md
rename to dev-lead/infra-lead/infra-runtime-be/schedules/pick-up-work.md
diff --git a/infra-runtime-be/system-prompt.md b/dev-lead/infra-lead/infra-runtime-be/system-prompt.md
similarity index 100%
rename from infra-runtime-be/system-prompt.md
rename to dev-lead/infra-lead/infra-runtime-be/system-prompt.md
diff --git a/infra-runtime-be/workspace.yaml b/dev-lead/infra-lead/infra-runtime-be/workspace.yaml
similarity index 91%
rename from infra-runtime-be/workspace.yaml
rename to dev-lead/infra-lead/infra-runtime-be/workspace.yaml
index b0093da..5a6dbe5 100644
--- a/infra-runtime-be/workspace.yaml
+++ b/dev-lead/infra-lead/infra-runtime-be/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: infra-lead
-files_dir: infra-runtime-be
+files_dir: dev-lead/infra-lead/infra-runtime-be
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-security-scan, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/infra-sre/idle-prompt.md b/dev-lead/infra-lead/infra-sre/idle-prompt.md
similarity index 100%
rename from infra-sre/idle-prompt.md
rename to dev-lead/infra-lead/infra-sre/idle-prompt.md
diff --git a/infra-runtime-be/initial-prompt.md b/dev-lead/infra-lead/infra-sre/initial-prompt.md
similarity index 100%
rename from infra-runtime-be/initial-prompt.md
rename to dev-lead/infra-lead/infra-sre/initial-prompt.md
diff --git a/infra-sre/schedules/pick-up-work.md b/dev-lead/infra-lead/infra-sre/schedules/pick-up-work.md
similarity index 100%
rename from infra-sre/schedules/pick-up-work.md
rename to dev-lead/infra-lead/infra-sre/schedules/pick-up-work.md
diff --git a/infra-sre/system-prompt.md b/dev-lead/infra-lead/infra-sre/system-prompt.md
similarity index 100%
rename from infra-sre/system-prompt.md
rename to dev-lead/infra-lead/infra-sre/system-prompt.md
diff --git a/infra-sre/workspace.yaml b/dev-lead/infra-lead/infra-sre/workspace.yaml
similarity index 93%
rename from infra-sre/workspace.yaml
rename to dev-lead/infra-lead/infra-sre/workspace.yaml
index 2504565..4fe9cc1 100644
--- a/infra-sre/workspace.yaml
+++ b/dev-lead/infra-lead/infra-sre/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: infra-lead
-files_dir: infra-sre
+files_dir: dev-lead/infra-lead/infra-sre
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-freeze-scope]
 channels:
   - type: telegram
diff --git a/infra-sre/initial-prompt.md b/dev-lead/infra-lead/initial-prompt.md
similarity index 100%
rename from infra-sre/initial-prompt.md
rename to dev-lead/infra-lead/initial-prompt.md
diff --git a/infra-lead/schedules/orchestrator-pulse.md b/dev-lead/infra-lead/schedules/orchestrator-pulse.md
similarity index 100%
rename from infra-lead/schedules/orchestrator-pulse.md
rename to dev-lead/infra-lead/schedules/orchestrator-pulse.md
diff --git a/infra-lead/system-prompt.md b/dev-lead/infra-lead/system-prompt.md
similarity index 100%
rename from infra-lead/system-prompt.md
rename to dev-lead/infra-lead/system-prompt.md
diff --git a/teams/infra.yaml b/dev-lead/infra-lead/workspace.yaml
similarity index 81%
rename from teams/infra.yaml
rename to dev-lead/infra-lead/workspace.yaml
index ec19603..a8adf00 100644
--- a/teams/infra.yaml
+++ b/dev-lead/infra-lead/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: dev-lead
-files_dir: infra-lead
+files_dir: dev-lead/infra-lead
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-freeze-scope]
 idle_interval_seconds: 900
 schedules:
@@ -15,5 +15,5 @@ schedules:
     enabled: true
     prompt_file: schedules/orchestrator-pulse.md
 children:
-  - !include ../infra-sre/workspace.yaml
-  - !include ../infra-runtime-be/workspace.yaml
+  - !include ./infra-sre/workspace.yaml
+  - !include ./infra-runtime-be/workspace.yaml
diff --git a/integration-tester/idle-prompt.md b/dev-lead/integration-tester/idle-prompt.md
similarity index 100%
rename from integration-tester/idle-prompt.md
rename to dev-lead/integration-tester/idle-prompt.md
diff --git a/integration-tester/initial-prompt.md b/dev-lead/integration-tester/initial-prompt.md
similarity index 100%
rename from integration-tester/initial-prompt.md
rename to dev-lead/integration-tester/initial-prompt.md
diff --git a/integration-tester/schedules/e2e-test.md b/dev-lead/integration-tester/schedules/e2e-test.md
similarity index 100%
rename from integration-tester/schedules/e2e-test.md
rename to dev-lead/integration-tester/schedules/e2e-test.md
diff --git a/integration-tester/system-prompt.md b/dev-lead/integration-tester/system-prompt.md
similarity index 100%
rename from integration-tester/system-prompt.md
rename to dev-lead/integration-tester/system-prompt.md
diff --git a/integration-tester/workspace.yaml b/dev-lead/integration-tester/workspace.yaml
similarity index 92%
rename from integration-tester/workspace.yaml
rename to dev-lead/integration-tester/workspace.yaml
index 62f15ed..f479ae2 100644
--- a/integration-tester/workspace.yaml
+++ b/dev-lead/integration-tester/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: dev-lead
-files_dir: integration-tester
+files_dir: dev-lead/integration-tester
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/plugin-dev/idle-prompt.md b/dev-lead/release-manager/idle-prompt.md
similarity index 100%
rename from plugin-dev/idle-prompt.md
rename to dev-lead/release-manager/idle-prompt.md
diff --git a/plugin-dev/initial-prompt.md b/dev-lead/release-manager/initial-prompt.md
similarity index 100%
rename from plugin-dev/initial-prompt.md
rename to dev-lead/release-manager/initial-prompt.md
diff --git a/release-manager/schedules/release-cycle.md b/dev-lead/release-manager/schedules/release-cycle.md
similarity index 100%
rename from release-manager/schedules/release-cycle.md
rename to dev-lead/release-manager/schedules/release-cycle.md
diff --git a/release-manager/system-prompt.md b/dev-lead/release-manager/system-prompt.md
similarity index 100%
rename from release-manager/system-prompt.md
rename to dev-lead/release-manager/system-prompt.md
diff --git a/release-manager/workspace.yaml b/dev-lead/release-manager/workspace.yaml
similarity index 93%
rename from release-manager/workspace.yaml
rename to dev-lead/release-manager/workspace.yaml
index 3953261..f62bee1 100644
--- a/release-manager/workspace.yaml
+++ b/dev-lead/release-manager/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: dev-lead
-files_dir: release-manager
+files_dir: dev-lead/release-manager
 plugins: [molecule-hitl, molecule-skill-code-review, molecule-freeze-scope]
 idle_interval_seconds: 900
 schedules:
diff --git a/sdk-lead/idle-prompt.md b/dev-lead/sdk-lead/idle-prompt.md
similarity index 100%
rename from sdk-lead/idle-prompt.md
rename to dev-lead/sdk-lead/idle-prompt.md
diff --git a/sdk-dev/initial-prompt.md b/dev-lead/sdk-lead/initial-prompt.md
similarity index 100%
rename from sdk-dev/initial-prompt.md
rename to dev-lead/sdk-lead/initial-prompt.md
diff --git a/release-manager/idle-prompt.md b/dev-lead/sdk-lead/plugin-dev/idle-prompt.md
similarity index 100%
rename from release-manager/idle-prompt.md
rename to dev-lead/sdk-lead/plugin-dev/idle-prompt.md
diff --git a/release-manager/initial-prompt.md b/dev-lead/sdk-lead/plugin-dev/initial-prompt.md
similarity index 100%
rename from release-manager/initial-prompt.md
rename to dev-lead/sdk-lead/plugin-dev/initial-prompt.md
diff --git a/plugin-dev/schedules/pick-up-work.md b/dev-lead/sdk-lead/plugin-dev/schedules/pick-up-work.md
similarity index 100%
rename from plugin-dev/schedules/pick-up-work.md
rename to dev-lead/sdk-lead/plugin-dev/schedules/pick-up-work.md
diff --git a/plugin-dev/schedules/plugin-ecosystem-audit.md b/dev-lead/sdk-lead/plugin-dev/schedules/plugin-ecosystem-audit.md
similarity index 100%
rename from plugin-dev/schedules/plugin-ecosystem-audit.md
rename to dev-lead/sdk-lead/plugin-dev/schedules/plugin-ecosystem-audit.md
diff --git a/plugin-dev/system-prompt.md b/dev-lead/sdk-lead/plugin-dev/system-prompt.md
similarity index 100%
rename from plugin-dev/system-prompt.md
rename to dev-lead/sdk-lead/plugin-dev/system-prompt.md
diff --git a/plugin-dev/workspace.yaml b/dev-lead/sdk-lead/plugin-dev/workspace.yaml
similarity index 92%
rename from plugin-dev/workspace.yaml
rename to dev-lead/sdk-lead/plugin-dev/workspace.yaml
index 2b8a7a7..c9fd97a 100644
--- a/plugin-dev/workspace.yaml
+++ b/dev-lead/sdk-lead/plugin-dev/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: sdk-lead
-files_dir: plugin-dev
+files_dir: dev-lead/sdk-lead/plugin-dev
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/sdk-lead/schedules/orchestrator-pulse.md b/dev-lead/sdk-lead/schedules/orchestrator-pulse.md
similarity index 100%
rename from sdk-lead/schedules/orchestrator-pulse.md
rename to dev-lead/sdk-lead/schedules/orchestrator-pulse.md
diff --git a/sdk-dev/idle-prompt.md b/dev-lead/sdk-lead/sdk-dev/idle-prompt.md
similarity index 100%
rename from sdk-dev/idle-prompt.md
rename to dev-lead/sdk-lead/sdk-dev/idle-prompt.md
diff --git a/sdk-lead/initial-prompt.md b/dev-lead/sdk-lead/sdk-dev/initial-prompt.md
similarity index 100%
rename from sdk-lead/initial-prompt.md
rename to dev-lead/sdk-lead/sdk-dev/initial-prompt.md
diff --git a/sdk-dev/schedules/pick-up-work.md b/dev-lead/sdk-lead/sdk-dev/schedules/pick-up-work.md
similarity index 100%
rename from sdk-dev/schedules/pick-up-work.md
rename to dev-lead/sdk-lead/sdk-dev/schedules/pick-up-work.md
diff --git a/sdk-dev/system-prompt.md b/dev-lead/sdk-lead/sdk-dev/system-prompt.md
similarity index 100%
rename from sdk-dev/system-prompt.md
rename to dev-lead/sdk-lead/sdk-dev/system-prompt.md
diff --git a/sdk-dev/workspace.yaml b/dev-lead/sdk-lead/sdk-dev/workspace.yaml
similarity index 92%
rename from sdk-dev/workspace.yaml
rename to dev-lead/sdk-lead/sdk-dev/workspace.yaml
index 2c97436..10cf9ca 100644
--- a/sdk-dev/workspace.yaml
+++ b/dev-lead/sdk-lead/sdk-dev/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: sdk-lead
-files_dir: sdk-dev
+files_dir: dev-lead/sdk-lead/sdk-dev
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
diff --git a/sdk-lead/system-prompt.md b/dev-lead/sdk-lead/system-prompt.md
similarity index 100%
rename from sdk-lead/system-prompt.md
rename to dev-lead/sdk-lead/system-prompt.md
diff --git a/teams/sdk.yaml b/dev-lead/sdk-lead/workspace.yaml
similarity index 82%
rename from teams/sdk.yaml
rename to dev-lead/sdk-lead/workspace.yaml
index 4a14265..57bcee7 100644
--- a/teams/sdk.yaml
+++ b/dev-lead/sdk-lead/workspace.yaml
@@ -6,7 +6,7 @@ tier: 3
 runtime: claude-code
 model: MiniMax-M2.7
 parent: dev-lead
-files_dir: sdk-lead
+files_dir: dev-lead/sdk-lead
 plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
 idle_interval_seconds: 900
 schedules:
@@ -15,5 +15,5 @@ schedules:
     enabled: true
     prompt_file: schedules/orchestrator-pulse.md
 children:
-  - !include ../sdk-dev/workspace.yaml
-  - !include ../plugin-dev/workspace.yaml
+  - !include ./sdk-dev/workspace.yaml
+  - !include ./plugin-dev/workspace.yaml
diff --git a/triage-operator/SKILL.md b/dev-lead/triage-operator/SKILL.md
similarity index 100%
rename from triage-operator/SKILL.md
rename to dev-lead/triage-operator/SKILL.md
diff --git a/triage-operator/handoff-notes.md b/dev-lead/triage-operator/handoff-notes.md
similarity index 100%
rename from triage-operator/handoff-notes.md
rename to dev-lead/triage-operator/handoff-notes.md
diff --git a/triage-operator/idle-prompt.md b/dev-lead/triage-operator/idle-prompt.md
similarity index 100%
rename from triage-operator/idle-prompt.md
rename to dev-lead/triage-operator/idle-prompt.md
diff --git a/triage-operator/initial-prompt.md b/dev-lead/triage-operator/initial-prompt.md
similarity index 100%
rename from triage-operator/initial-prompt.md
rename to dev-lead/triage-operator/initial-prompt.md
diff --git a/triage-operator/philosophy.md b/dev-lead/triage-operator/philosophy.md
similarity index 100%
rename from triage-operator/philosophy.md
rename to dev-lead/triage-operator/philosophy.md
diff --git a/triage-operator/playbook.md b/dev-lead/triage-operator/playbook.md
similarity index 100%
rename from triage-operator/playbook.md
rename to dev-lead/triage-operator/playbook.md
diff --git a/triage-operator/schedules/hourly-triage.md b/dev-lead/triage-operator/schedules/hourly-triage.md
similarity index 100%
rename from triage-operator/schedules/hourly-triage.md
rename to dev-lead/triage-operator/schedules/hourly-triage.md
diff --git a/triage-operator/system-prompt.md b/dev-lead/triage-operator/system-prompt.md
similarity index 100%
rename from triage-operator/system-prompt.md
rename to dev-lead/triage-operator/system-prompt.md
diff --git a/teams/triage-operator.yaml b/dev-lead/triage-operator/workspace.yaml
similarity index 99%
rename from teams/triage-operator.yaml
rename to dev-lead/triage-operator/workspace.yaml
index cffd73c..aed61e9 100644
--- a/teams/triage-operator.yaml
+++ b/dev-lead/triage-operator/workspace.yaml
@@ -18,7 +18,7 @@ role: >-
   at the start of every tick before taking any action.
 tier: 3
 model: opus
-files_dir: triage-operator
+files_dir: dev-lead/triage-operator
 canvas: {x: 1150, y: 250}
         # #370-aligned: Triage Operator is a standing-rules-first role. The
         # plugin stack below is what the prior operator identified as the
diff --git a/teams/dev.yaml b/dev-lead/workspace.yaml
similarity index 78%
rename from teams/dev.yaml
rename to dev-lead/workspace.yaml
index 9808b7a..ef7a568 100644
--- a/teams/dev.yaml
+++ b/dev-lead/workspace.yaml
@@ -27,17 +27,17 @@ schedules:
     enabled: true
     prompt_file: schedules/orchestrator-pulse.md
 children:
-  - !include core-platform.yaml
-  - !include controlplane.yaml
-  - !include app-docs.yaml
-  - !include infra.yaml
-  - !include sdk.yaml
-  - !include ../release-manager/workspace.yaml
-  - !include ../integration-tester/workspace.yaml
-  - !include ../fullstack-engineer/workspace.yaml
+  - !include ./core-lead/workspace.yaml
+  - !include ./cp-lead/workspace.yaml
+  - !include ./app-lead/workspace.yaml
+  - !include ./infra-lead/workspace.yaml
+  - !include ./sdk-lead/workspace.yaml
+  - !include ./release-manager/workspace.yaml
+  - !include ./integration-tester/workspace.yaml
+  - !include ./fullstack-engineer/workspace.yaml
   # Q2 (Hongming 2026-05-08): triage-operator moved into dev tree as dev-lead child.
   # Q1: doc-spec is already a child of teams/app-docs.yaml (within app-lead),
   # so it's transitively under dev-lead via the app-docs sub-team — no
   # additional include here, otherwise the validator flags duplicate parent.
-  - !include triage-operator.yaml
+  - !include ./triage-operator/workspace.yaml
 initial_prompt_file: initial-prompt.md
diff --git a/infra-lead/workspace.yaml b/infra-lead/workspace.yaml
deleted file mode 100644
index fbf83b6..0000000
--- a/infra-lead/workspace.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Infra Lead
-role: >-
-  Infrastructure team lead. Owns molecule-ai-workspace-runtime,
-  molecule-ai-status, molecule-ci, Molecule-AI/internal. Triage+merge
-  authority. Dispatches to Infra-SRE, Infra-Runtime-BE.
-tier: 3
-runtime: claude-code
-model: MiniMax-M2.7
-parent: dev-lead
-files_dir: infra-lead
-plugins: [molecule-hitl, molecule-skill-code-review, molecule-freeze-scope]
-idle_interval_seconds: 900
-schedules:
-  - name: Orchestrator pulse (every 5 min)
-    cron_expr: "3,8,13,18,23,28,33,38,43,48,53,58 * * * *"
-    enabled: true
-    prompt_file: schedules/orchestrator-pulse.md
diff --git a/sdk-lead/workspace.yaml b/sdk-lead/workspace.yaml
deleted file mode 100644
index 7b9ad35..0000000
--- a/sdk-lead/workspace.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: SDK Lead
-role: >-
-  SDK & Plugins team lead. Owns molecule-sdk-python, molecule-mcp-server,
-  molecule-cli, and all plugin repos. Triage+merge authority.
-  Dispatches to SDK-Dev, Plugin-Dev.
-tier: 3
-runtime: claude-code
-model: MiniMax-M2.7
-parent: dev-lead
-files_dir: sdk-lead
-plugins: [molecule-skill-code-review, molecule-skill-llm-judge, molecule-compliance]
-idle_interval_seconds: 900
-schedules:
-  - name: Orchestrator pulse (every 5 min)
-    cron_expr: "4,9,14,19,24,29,34,39,44,49,54,59 * * * *"
-    enabled: true
-    prompt_file: schedules/orchestrator-pulse.md