diff --git a/src/bmm-skills/4-implementation/bmad-create-story/SKILL.md b/src/bmm-skills/v6-shims/bmad-create-story/SKILL.md
similarity index 100%
rename from src/bmm-skills/4-implementation/bmad-create-story/SKILL.md
rename to src/bmm-skills/v6-shims/bmad-create-story/SKILL.md
diff --git a/src/bmm-skills/4-implementation/bmad-create-story/checklist.md b/src/bmm-skills/v6-shims/bmad-create-story/checklist.md
similarity index 100%
rename from src/bmm-skills/4-implementation/bmad-create-story/checklist.md
rename to src/bmm-skills/v6-shims/bmad-create-story/checklist.md
diff --git a/src/bmm-skills/4-implementation/bmad-create-story/customize.toml b/src/bmm-skills/v6-shims/bmad-create-story/customize.toml
similarity index 100%
rename from src/bmm-skills/4-implementation/bmad-create-story/customize.toml
rename to src/bmm-skills/v6-shims/bmad-create-story/customize.toml
diff --git a/src/bmm-skills/4-implementation/bmad-create-story/discover-inputs.md b/src/bmm-skills/v6-shims/bmad-create-story/discover-inputs.md
similarity index 100%
rename from src/bmm-skills/4-implementation/bmad-create-story/discover-inputs.md
rename to src/bmm-skills/v6-shims/bmad-create-story/discover-inputs.md
diff --git a/src/bmm-skills/4-implementation/bmad-create-story/template.md b/src/bmm-skills/v6-shims/bmad-create-story/template.md
similarity index 100%
rename from src/bmm-skills/4-implementation/bmad-create-story/template.md
rename to src/bmm-skills/v6-shims/bmad-create-story/template.md
diff --git a/src/bmm-skills/4-implementation/bmad-dev-story/SKILL.md b/src/bmm-skills/v6-shims/bmad-dev-story/SKILL.md
similarity index 100%
rename from src/bmm-skills/4-implementation/bmad-dev-story/SKILL.md
rename to src/bmm-skills/v6-shims/bmad-dev-story/SKILL.md
diff --git a/src/bmm-skills/4-implementation/bmad-dev-story/checklist.md b/src/bmm-skills/v6-shims/bmad-dev-story/checklist.md
similarity index 100%
rename from src/bmm-skills/4-implementation/bmad-dev-story/checklist.md
rename to src/bmm-skills/v6-shims/bmad-dev-story/checklist.md
diff --git a/src/bmm-skills/4-implementation/bmad-dev-story/customize.toml b/src/bmm-skills/v6-shims/bmad-dev-story/customize.toml
similarity index 100%
rename from src/bmm-skills/4-implementation/bmad-dev-story/customize.toml
rename to src/bmm-skills/v6-shims/bmad-dev-story/customize.toml