diff --git a/.claude/skills/team-coordinate-v2/SKILL.md b/.claude/skills/team-coordinate/SKILL.md
similarity index 100%
rename from .claude/skills/team-coordinate-v2/SKILL.md
rename to .claude/skills/team-coordinate/SKILL.md
diff --git a/.claude/skills/team-coordinate-v2/roles/coordinator/commands/analyze-task.md b/.claude/skills/team-coordinate/roles/coordinator/commands/analyze-task.md
similarity index 100%
rename from .claude/skills/team-coordinate-v2/roles/coordinator/commands/analyze-task.md
rename to .claude/skills/team-coordinate/roles/coordinator/commands/analyze-task.md
diff --git a/.claude/skills/team-coordinate-v2/roles/coordinator/commands/dispatch.md b/.claude/skills/team-coordinate/roles/coordinator/commands/dispatch.md
similarity index 100%
rename from .claude/skills/team-coordinate-v2/roles/coordinator/commands/dispatch.md
rename to .claude/skills/team-coordinate/roles/coordinator/commands/dispatch.md
diff --git a/.claude/skills/team-coordinate-v2/roles/coordinator/commands/monitor.md b/.claude/skills/team-coordinate/roles/coordinator/commands/monitor.md
similarity index 100%
rename from .claude/skills/team-coordinate-v2/roles/coordinator/commands/monitor.md
rename to .claude/skills/team-coordinate/roles/coordinator/commands/monitor.md
diff --git a/.claude/skills/team-coordinate-v2/roles/coordinator/role.md b/.claude/skills/team-coordinate/roles/coordinator/role.md
similarity index 100%
rename from .claude/skills/team-coordinate-v2/roles/coordinator/role.md
rename to .claude/skills/team-coordinate/roles/coordinator/role.md
diff --git a/.claude/skills/team-coordinate-v2/specs/role-spec-template.md b/.claude/skills/team-coordinate/specs/role-spec-template.md
similarity index 100%
rename from .claude/skills/team-coordinate-v2/specs/role-spec-template.md
rename to .claude/skills/team-coordinate/specs/role-spec-template.md
diff --git a/.claude/skills/team-coordinate-v2/subagents/discuss-subagent.md b/.claude/skills/team-coordinate/subagents/discuss-subagent.md
similarity index 100%
rename from .claude/skills/team-coordinate-v2/subagents/discuss-subagent.md
rename to .claude/skills/team-coordinate/subagents/discuss-subagent.md
diff --git a/.claude/skills/team-coordinate-v2/subagents/explore-subagent.md b/.claude/skills/team-coordinate/subagents/explore-subagent.md
similarity index 100%
rename from .claude/skills/team-coordinate-v2/subagents/explore-subagent.md
rename to .claude/skills/team-coordinate/subagents/explore-subagent.md
diff --git a/.claude/skills/team-executor-v2/SKILL.md b/.claude/skills/team-executor/SKILL.md
similarity index 100%
rename from .claude/skills/team-executor-v2/SKILL.md
rename to .claude/skills/team-executor/SKILL.md
diff --git a/.claude/skills/team-executor-v2/roles/executor/commands/monitor.md b/.claude/skills/team-executor/roles/executor/commands/monitor.md
similarity index 100%
rename from .claude/skills/team-executor-v2/roles/executor/commands/monitor.md
rename to .claude/skills/team-executor/roles/executor/commands/monitor.md
diff --git a/.claude/skills/team-executor-v2/roles/executor/role.md b/.claude/skills/team-executor/roles/executor/role.md
similarity index 100%
rename from .claude/skills/team-executor-v2/roles/executor/role.md
rename to .claude/skills/team-executor/roles/executor/role.md
diff --git a/.claude/skills/team-executor-v2/specs/session-schema.md b/.claude/skills/team-executor/specs/session-schema.md
similarity index 100%
rename from .claude/skills/team-executor-v2/specs/session-schema.md
rename to .claude/skills/team-executor/specs/session-schema.md
diff --git a/.claude/skills/team-lifecycle-v5/SKILL.md b/.claude/skills/team-lifecycle/SKILL.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/SKILL.md
rename to .claude/skills/team-lifecycle/SKILL.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/analyst.md b/.claude/skills/team-lifecycle/role-specs/analyst.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/analyst.md
rename to .claude/skills/team-lifecycle/role-specs/analyst.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/architect.md b/.claude/skills/team-lifecycle/role-specs/architect.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/architect.md
rename to .claude/skills/team-lifecycle/role-specs/architect.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/executor.md b/.claude/skills/team-lifecycle/role-specs/executor.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/executor.md
rename to .claude/skills/team-lifecycle/role-specs/executor.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/fe-developer.md b/.claude/skills/team-lifecycle/role-specs/fe-developer.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/fe-developer.md
rename to .claude/skills/team-lifecycle/role-specs/fe-developer.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/fe-qa.md b/.claude/skills/team-lifecycle/role-specs/fe-qa.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/fe-qa.md
rename to .claude/skills/team-lifecycle/role-specs/fe-qa.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/planner.md b/.claude/skills/team-lifecycle/role-specs/planner.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/planner.md
rename to .claude/skills/team-lifecycle/role-specs/planner.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/reviewer.md b/.claude/skills/team-lifecycle/role-specs/reviewer.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/reviewer.md
rename to .claude/skills/team-lifecycle/role-specs/reviewer.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/tester.md b/.claude/skills/team-lifecycle/role-specs/tester.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/tester.md
rename to .claude/skills/team-lifecycle/role-specs/tester.md
diff --git a/.claude/skills/team-lifecycle-v5/role-specs/writer.md b/.claude/skills/team-lifecycle/role-specs/writer.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/role-specs/writer.md
rename to .claude/skills/team-lifecycle/role-specs/writer.md
diff --git a/.claude/skills/team-lifecycle-v5/roles/coordinator/commands/dispatch.md b/.claude/skills/team-lifecycle/roles/coordinator/commands/dispatch.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/roles/coordinator/commands/dispatch.md
rename to .claude/skills/team-lifecycle/roles/coordinator/commands/dispatch.md
diff --git a/.claude/skills/team-lifecycle-v5/roles/coordinator/commands/monitor.md b/.claude/skills/team-lifecycle/roles/coordinator/commands/monitor.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/roles/coordinator/commands/monitor.md
rename to .claude/skills/team-lifecycle/roles/coordinator/commands/monitor.md
diff --git a/.claude/skills/team-lifecycle-v5/roles/coordinator/role.md b/.claude/skills/team-lifecycle/roles/coordinator/role.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/roles/coordinator/role.md
rename to .claude/skills/team-lifecycle/roles/coordinator/role.md
diff --git a/.claude/skills/team-lifecycle-v5/specs/document-standards.md b/.claude/skills/team-lifecycle/specs/document-standards.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/specs/document-standards.md
rename to .claude/skills/team-lifecycle/specs/document-standards.md
diff --git a/.claude/skills/team-lifecycle-v5/specs/quality-gates.md b/.claude/skills/team-lifecycle/specs/quality-gates.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/specs/quality-gates.md
rename to .claude/skills/team-lifecycle/specs/quality-gates.md
diff --git a/.claude/skills/team-lifecycle-v5/specs/team-config.json b/.claude/skills/team-lifecycle/specs/team-config.json
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/specs/team-config.json
rename to .claude/skills/team-lifecycle/specs/team-config.json
diff --git a/.claude/skills/team-lifecycle-v5/subagents/discuss-subagent.md b/.claude/skills/team-lifecycle/subagents/discuss-subagent.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/subagents/discuss-subagent.md
rename to .claude/skills/team-lifecycle/subagents/discuss-subagent.md
diff --git a/.claude/skills/team-lifecycle-v5/subagents/doc-generation-subagent.md b/.claude/skills/team-lifecycle/subagents/doc-generation-subagent.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/subagents/doc-generation-subagent.md
rename to .claude/skills/team-lifecycle/subagents/doc-generation-subagent.md
diff --git a/.claude/skills/team-lifecycle-v5/subagents/explore-subagent.md b/.claude/skills/team-lifecycle/subagents/explore-subagent.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/subagents/explore-subagent.md
rename to .claude/skills/team-lifecycle/subagents/explore-subagent.md
diff --git a/.claude/skills/team-lifecycle-v5/templates/architecture-doc.md b/.claude/skills/team-lifecycle/templates/architecture-doc.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/templates/architecture-doc.md
rename to .claude/skills/team-lifecycle/templates/architecture-doc.md
diff --git a/.claude/skills/team-lifecycle-v5/templates/epics-template.md b/.claude/skills/team-lifecycle/templates/epics-template.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/templates/epics-template.md
rename to .claude/skills/team-lifecycle/templates/epics-template.md
diff --git a/.claude/skills/team-lifecycle-v5/templates/product-brief.md b/.claude/skills/team-lifecycle/templates/product-brief.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/templates/product-brief.md
rename to .claude/skills/team-lifecycle/templates/product-brief.md
diff --git a/.claude/skills/team-lifecycle-v5/templates/requirements-prd.md b/.claude/skills/team-lifecycle/templates/requirements-prd.md
similarity index 100%
rename from .claude/skills/team-lifecycle-v5/templates/requirements-prd.md
rename to .claude/skills/team-lifecycle/templates/requirements-prd.md
diff --git a/review b/review
new file mode 100644
index 00000000..e69de29b