diff --git a/src/bmm/agents/analyst.agent.yaml b/src/bmm/agents/analyst.agent.yaml
index 3bfb02d8a..f17597c2a 100644
--- a/src/bmm/agents/analyst.agent.yaml
+++ b/src/bmm/agents/analyst.agent.yaml
@@ -35,7 +35,7 @@ agent:
       description: "[TR] Technical Research: Technical feasibility, architecture options and implementation approaches"
 
     - trigger: CB or fuzzy match on product-brief
-      exec: "{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/workflow.md"
+      exec: "skill:bmad-create-product-brief"
       description: "[CB] Create Brief: A guided experience to nail down your product idea into an executive brief"
 
     - trigger: DP or fuzzy match on document-project
diff --git a/src/bmm/agents/dev.agent.yaml b/src/bmm/agents/dev.agent.yaml
index 6818dc968..d9da7446b 100644
--- a/src/bmm/agents/dev.agent.yaml
+++ b/src/bmm/agents/dev.agent.yaml
@@ -30,7 +30,7 @@ agent:
 
   menu:
     - trigger: DS or fuzzy match on dev-story
-      exec: "{project-root}/_bmad/bmm/workflows/4-implementation/dev-story/workflow.md"
+      exec: "skill:bmad-dev-story"
       description: "[DS] Dev Story: Write the next or specified stories tests and code."
 
     - trigger: CR or fuzzy match on code-review
diff --git a/src/bmm/agents/ux-designer.agent.yaml b/src/bmm/agents/ux-designer.agent.yaml
index 301a07fc6..64f8c3f5f 100644
--- a/src/bmm/agents/ux-designer.agent.yaml
+++ b/src/bmm/agents/ux-designer.agent.yaml
@@ -23,5 +23,5 @@ agent:
 
   menu:
     - trigger: CU or fuzzy match on ux-design
-      exec: "{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/workflow.md"
+      exec: "skill:bmad-create-ux-design"
       description: "[CU] Create UX: Guidance through realizing the plan for your UX to inform architecture and implementation. Provides more details than what was discovered in the PRD"
diff --git a/src/bmm/module-help.csv b/src/bmm/module-help.csv
index 7b253a574..d86faabff 100644
--- a/src/bmm/module-help.csv
+++ b/src/bmm/module-help.csv
@@ -14,11 +14,11 @@ bmm,1-analysis,Brainstorm Project,BP,10,skill:bmad-brainstorming,bmad-brainstorm
 bmm,1-analysis,Market Research,MR,20,_bmad/bmm/workflows/1-analysis/research/workflow-market-research.md,bmad-bmm-market-research,false,analyst,Create Mode,"Market analysis competitive landscape customer needs and trends","planning_artifacts|project-knowledge","research documents",
 bmm,1-analysis,Domain Research,DR,21,skill:bmad-domain-research,bmad-bmm-domain-research,false,analyst,Create Mode,"Industry domain deep dive subject matter expertise and terminology","planning_artifacts|project_knowledge","research documents",
 bmm,1-analysis,Technical Research,TR,22,_bmad/bmm/workflows/1-analysis/research/workflow-technical-research.md,bmad-bmm-technical-research,false,analyst,Create Mode,"Technical feasibility architecture options and implementation approaches","planning_artifacts|project_knowledge","research documents",
-bmm,1-analysis,Create Brief,CB,30,_bmad/bmm/workflows/1-analysis/create-product-brief/workflow.md,bmad-bmm-create-product-brief,false,analyst,Create Mode,"A guided experience to nail down your product idea",planning_artifacts,"product brief",
+bmm,1-analysis,Create Brief,CB,30,skill:bmad-create-product-brief,bmad-bmm-create-product-brief,false,analyst,Create Mode,"A guided experience to nail down your product idea",planning_artifacts,"product brief",
 bmm,2-planning,Create PRD,CP,10,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-create-prd.md,bmad-bmm-create-prd,true,pm,Create Mode,"Expert led facilitation to produce your Product Requirements Document",planning_artifacts,prd,
 bmm,2-planning,Validate PRD,VP,20,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-validate-prd.md,bmad-bmm-validate-prd,false,pm,Validate Mode,"Validate PRD is comprehensive lean well organized and cohesive",planning_artifacts,"prd validation report",
 bmm,2-planning,Edit PRD,EP,25,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-edit-prd.md,bmad-bmm-edit-prd,false,pm,Edit Mode,"Improve and enhance an existing PRD",planning_artifacts,"updated prd",
-bmm,2-planning,Create UX,CU,30,_bmad/bmm/workflows/2-plan-workflows/create-ux-design/workflow.md,bmad-bmm-create-ux-design,false,ux-designer,Create Mode,"Guidance through realizing the plan for your UX, strongly recommended if a UI is a primary piece of the proposed project",planning_artifacts,"ux design",
+bmm,2-planning,Create UX,CU,30,skill:bmad-create-ux-design,bmad-bmm-create-ux-design,false,ux-designer,Create Mode,"Guidance through realizing the plan for your UX, strongly recommended if a UI is a primary piece of the proposed project",planning_artifacts,"ux design",
 bmm,3-solutioning,Create Architecture,CA,10,_bmad/bmm/workflows/3-solutioning/create-architecture/workflow.md,bmad-bmm-create-architecture,true,architect,Create Mode,"Guided Workflow to document technical decisions",planning_artifacts,architecture,
 bmm,3-solutioning,Create Epics and Stories,CE,30,_bmad/bmm/workflows/3-solutioning/create-epics-and-stories/workflow.md,bmad-bmm-create-epics-and-stories,true,pm,Create Mode,"Create the Epics and Stories Listing",planning_artifacts,"epics and stories",
 bmm,3-solutioning,Check Implementation Readiness,IR,70,_bmad/bmm/workflows/3-solutioning/check-implementation-readiness/workflow.md,bmad-bmm-check-implementation-readiness,true,architect,Validate Mode,"Ensure PRD UX Architecture and Epics Stories are aligned",planning_artifacts,"readiness report",
@@ -26,7 +26,7 @@ bmm,4-implementation,Sprint Planning,SP,10,_bmad/bmm/workflows/4-implementation/
 bmm,4-implementation,Sprint Status,SS,20,_bmad/bmm/workflows/4-implementation/sprint-status/workflow.md,bmad-bmm-sprint-status,false,sm,Create Mode,"Anytime: Summarize sprint status and route to next workflow",,,
 bmm,4-implementation,Validate Story,VS,35,skill:bmad-create-story,bmad-bmm-create-story,false,sm,Validate Mode,"Validates story readiness and completeness before development work begins",implementation_artifacts,"story validation report",
 bmm,4-implementation,Create Story,CS,30,skill:bmad-create-story,bmad-bmm-create-story,true,sm,Create Mode,"Story cycle start: Prepare first found story in the sprint plan that is next, or if the command is run with a specific epic and story designation with context. Once complete, then VS then DS then CR then back to DS if needed or next CS or ER",implementation_artifacts,story,
-bmm,4-implementation,Dev Story,DS,40,_bmad/bmm/workflows/4-implementation/dev-story/workflow.md,bmad-bmm-dev-story,true,dev,Create Mode,"Story cycle: Execute story implementation tasks and tests then CR then back to DS if fixes needed",,,
+bmm,4-implementation,Dev Story,DS,40,skill:bmad-dev-story,bmad-bmm-dev-story,true,dev,Create Mode,"Story cycle: Execute story implementation tasks and tests then CR then back to DS if fixes needed",,,
 bmm,4-implementation,Code Review,CR,50,_bmad/bmm/workflows/4-implementation/code-review/workflow.md,bmad-bmm-code-review,false,dev,Create Mode,"Story cycle: If issues back to DS if approved then next CS or ER if epic complete",,,
 bmm,4-implementation,QA Automation Test,QA,45,_bmad/bmm/workflows/qa-generate-e2e-tests/workflow.md,bmad-bmm-qa-automate,false,qa,Create Mode,"Generate automated API and E2E tests for implemented code using the project's existing test framework (detects existing well known in use test frameworks). Use after implementation to add test coverage. NOT for code review or story validation - use CR for that.",implementation_artifacts,"test suite",
 bmm,4-implementation,Retrospective,ER,60,_bmad/bmm/workflows/4-implementation/retrospective/workflow.md,bmad-bmm-retrospective,false,sm,Create Mode,"Optional at epic end: Review completed work lessons learned and next epic or if major issues consider CC",implementation_artifacts,retrospective,
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/SKILL.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/SKILL.md
new file mode 100644
index 000000000..4ef96c650
--- /dev/null
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-create-product-brief
+description: 'Create product brief through collaborative discovery. Use when the user says "lets create a product brief" or "help me create a project brief"'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/bmad-skill-manifest.yaml b/src/bmm/workflows/1-analysis/bmad-create-product-brief/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/product-brief.template.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/product-brief.template.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/create-product-brief/product-brief.template.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/product-brief.template.md
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-01-init.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
similarity index 96%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-01-init.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
index 0046af0cc..496180933 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-01-init.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
@@ -3,7 +3,7 @@ name: 'step-01-init'
 description: 'Initialize the product brief workflow by detecting continuation state and setting up the document'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md'
+nextStepFile: './step-02-vision.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Template References
@@ -73,7 +73,7 @@ If the document exists and has frontmatter with `stepsCompleted`:
 
 **Continuation Protocol:**
 
-- **STOP immediately** and load `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-01b-continue.md`
+- **STOP immediately** and load `./step-01b-continue.md`
 - Do not proceed with any initialization tasks
 - Let step-01b handle all continuation logic
 - This is an auto-proceed situation - no user choice needed
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-01b-continue.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
similarity index 93%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-01b-continue.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
index bedcfc913..99b2495fe 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-01b-continue.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
@@ -95,9 +95,9 @@ Does this look right, or do you want to make any adjustments before we proceed?"
 **Next Step Logic:**
 Based on `lastStep` value, determine which step to load next:
 
-- If `lastStep = 1` → Load `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md`
-- If `lastStep = 2` → Load `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md`
-- If `lastStep = 3` → Load `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md`
+- If `lastStep = 1` → Load `./step-02-vision.md`
+- If `lastStep = 2` → Load `./step-03-users.md`
+- If `lastStep = 3` → Load `./step-04-metrics.md`
 - Continue this pattern for all steps
 - If `lastStep = 6` → Workflow already complete
 
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
index bcdb0d877..c9e60df19 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
@@ -3,7 +3,7 @@ name: 'step-02-vision'
 description: 'Discover and define the core product vision, problem statement, and unique value proposition'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md'
+nextStepFile: './step-03-users.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
index d2f68ea51..2a035eeb9 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
@@ -3,7 +3,7 @@ name: 'step-03-users'
 description: 'Define target users with rich personas and map their key interactions with the product'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md'
+nextStepFile: './step-04-metrics.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
index 8ad4bd46a..359bc0954 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
@@ -3,7 +3,7 @@ name: 'step-04-metrics'
 description: 'Define comprehensive success metrics that include user success, business objectives, and key performance indicators'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-05-scope.md'
+nextStepFile: './step-05-scope.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-05-scope.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-05-scope.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
index a8d70e76b..0d5b99613 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-05-scope.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
@@ -3,7 +3,7 @@ name: 'step-05-scope'
 description: 'Define MVP scope with clear boundaries and outline future vision while managing scope creep'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-06-complete.md'
+nextStepFile: './step-06-complete.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-06-complete.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-06-complete.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-06-complete.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-06-complete.md
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/workflow.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/workflow.md
similarity index 88%
rename from src/bmm/workflows/1-analysis/create-product-brief/workflow.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/workflow.md
index c50d325ef..267f8cce8 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/workflow.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/workflow.md
@@ -1,8 +1,3 @@
----
-name: create-product-brief
-description: 'Create product brief through collaborative discovery. Use when the user says "lets create a product brief" or "help me create a project brief"'
----
-
 # Product Brief Workflow
 
 **Goal:** Create comprehensive product briefs through collaborative step-by-step discovery as creative Business Analyst working with the user as peers.
@@ -54,4 +49,4 @@ Load and read full config from {project-root}/_bmad/bmm/config.yaml and resolve:
 
 ### 2. First Step EXECUTION
 
-Read fully and follow: `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-01-init.md` to begin the workflow.
+Read fully and follow: `./steps/step-01-init.md` to begin the workflow.
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/bmad-skill-manifest.yaml b/src/bmm/workflows/1-analysis/create-product-brief/bmad-skill-manifest.yaml
deleted file mode 100644
index cb3969a6e..000000000
--- a/src/bmm/workflows/1-analysis/create-product-brief/bmad-skill-manifest.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-canonicalId: bmad-create-product-brief
-type: workflow
-description: "Create product brief through collaborative discovery"
diff --git a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/SKILL.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/SKILL.md
new file mode 100644
index 000000000..d3d2c9af2
--- /dev/null
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-create-ux-design
+description: 'Plan UX patterns and design specifications. Use when the user says "lets create UX design" or "create UX specifications" or "help me plan the UX"'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/bmad-skill-manifest.yaml b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-01-init.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01-init.md
similarity index 95%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-01-init.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01-init.md
index 02b69c2d0..62969bafd 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-01-init.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01-init.md
@@ -44,7 +44,7 @@ First, check if the output document already exists:
 
 If the document exists and has frontmatter with `stepsCompleted`:
 
-- **STOP here** and load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-01b-continue.md` immediately
+- **STOP here** and load `./step-01b-continue.md` immediately
 - Do not proceed with any initialization tasks
 - Let step-01b handle the continuation logic
 
@@ -110,7 +110,7 @@ Do you have any other documents you'd like me to include, or shall we continue t
 
 ## NEXT STEP:
 
-After user selects [C] to continue, ensure the file `{planning_artifacts}/ux-design-specification.md` has been created and saved, and then load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-02-discovery.md` to begin the UX discovery phase.
+After user selects [C] to continue, ensure the file `{planning_artifacts}/ux-design-specification.md` has been created and saved, and then load `./step-02-discovery.md` to begin the UX discovery phase.
 
 Remember: Do NOT proceed to step-02 until output file has been updated and user explicitly selects [C] to continue!
 
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-01b-continue.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01b-continue.md
similarity index 92%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-01b-continue.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01b-continue.md
index 92fded6c3..3d0f647e2 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-01b-continue.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01b-continue.md
@@ -72,9 +72,9 @@ Does this look right, or do you want to make any adjustments before we proceed?"
 
 Based on `lastStep` value, determine which step to load next:
 
-- If `lastStep = 1` → Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-02-discovery.md`
-- If `lastStep = 2` → Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-03-core-experience.md`
-- If `lastStep = 3` → Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-04-emotional-response.md`
+- If `lastStep = 1` → Load `./step-02-discovery.md`
+- If `lastStep = 2` → Load `./step-03-core-experience.md`
+- If `lastStep = 3` → Load `./step-04-emotional-response.md`
 - Continue this pattern for all steps
 - If `lastStep` indicates final step → Workflow already complete
 
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-02-discovery.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-02-discovery.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-02-discovery.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-02-discovery.md
index ac32ed77f..d3efde627 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-02-discovery.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-02-discovery.md
@@ -155,11 +155,11 @@ Show the generated project understanding content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: `stepsCompleted: [1, 2]`
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-03-core-experience.md`
+- Load `./step-03-core-experience.md`
 
 ## APPEND TO DOCUMENT:
 
-When user selects 'C', append the content directly to the document. Only after the content is saved to document, read fully and follow: `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-03-core-experience.md`.
+When user selects 'C', append the content directly to the document. Only after the content is saved to document, read fully and follow: `./step-03-core-experience.md`.
 
 ## SUCCESS METRICS:
 
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-03-core-experience.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-03-core-experience.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-03-core-experience.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-03-core-experience.md
index 215cc36f3..551626170 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-03-core-experience.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-03-core-experience.md
@@ -179,7 +179,7 @@ Show the generated core experience content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-04-emotional-response.md`
+- Load `./step-04-emotional-response.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -211,6 +211,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-04-emotional-response.md` to define desired emotional responses.
+After user selects 'C' and content is saved to document, load `./step-04-emotional-response.md` to define desired emotional responses.
 
 Remember: Do NOT proceed to step-04 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-04-emotional-response.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-04-emotional-response.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-04-emotional-response.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-04-emotional-response.md
index 0c7d96fc7..6e4cc575a 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-04-emotional-response.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-04-emotional-response.md
@@ -182,7 +182,7 @@ Show the generated emotional response content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-05-inspiration.md`
+- Load `./step-05-inspiration.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -214,6 +214,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-05-inspiration.md` to analyze UX patterns from inspiring products.
+After user selects 'C' and content is saved to document, load `./step-05-inspiration.md` to analyze UX patterns from inspiring products.
 
 Remember: Do NOT proceed to step-05 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-05-inspiration.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-05-inspiration.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-05-inspiration.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-05-inspiration.md
index 5d94d3924..d0c3f02ea 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-05-inspiration.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-05-inspiration.md
@@ -197,7 +197,7 @@ Show the generated inspiration analysis content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Read fully and follow: `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-06-design-system.md`
+- Read fully and follow: `./step-06-design-system.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -229,6 +229,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-06-design-system.md` to choose the appropriate design system approach.
+After user selects 'C' and content is saved to document, load `./step-06-design-system.md` to choose the appropriate design system approach.
 
 Remember: Do NOT proceed to step-06 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-06-design-system.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-06-design-system.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-06-design-system.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-06-design-system.md
index ad24b7d46..f7ab78804 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-06-design-system.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-06-design-system.md
@@ -215,7 +215,7 @@ Show the generated design system content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-07-defining-experience.md`
+- Load `./step-07-defining-experience.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -247,6 +247,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-07-defining-experience.md` to define the core user interaction.
+After user selects 'C' and content is saved to document, load `./step-07-defining-experience.md` to define the core user interaction.
 
 Remember: Do NOT proceed to step-07 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-07-defining-experience.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-07-defining-experience.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-07-defining-experience.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-07-defining-experience.md
index be3dc0782..21ecbe618 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-07-defining-experience.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-07-defining-experience.md
@@ -217,7 +217,7 @@ Show the generated defining experience content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-08-visual-foundation.md`
+- Load `./step-08-visual-foundation.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -249,6 +249,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-08-visual-foundation.md` to establish visual design foundation.
+After user selects 'C' and content is saved to document, load `./step-08-visual-foundation.md` to establish visual design foundation.
 
 Remember: Do NOT proceed to step-08 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-08-visual-foundation.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-08-visual-foundation.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-08-visual-foundation.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-08-visual-foundation.md
index 501460f01..cdcbc65ff 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-08-visual-foundation.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-08-visual-foundation.md
@@ -187,7 +187,7 @@ Show the generated visual foundation content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-09-design-directions.md`
+- Load `./step-09-design-directions.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -219,6 +219,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-09-design-directions.md` to generate design direction mockups.
+After user selects 'C' and content is saved to document, load `./step-09-design-directions.md` to generate design direction mockups.
 
 Remember: Do NOT proceed to step-09 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-09-design-directions.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-09-design-directions.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-09-design-directions.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-09-design-directions.md
index 10b2b7d36..bcf16436c 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-09-design-directions.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-09-design-directions.md
@@ -187,7 +187,7 @@ Show the generated design direction content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-10-user-journeys.md`
+- Load `./step-10-user-journeys.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -219,6 +219,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-10-user-journeys.md` to design user journey flows.
+After user selects 'C' and content is saved to document, load `./step-10-user-journeys.md` to design user journey flows.
 
 Remember: Do NOT proceed to step-10 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-10-user-journeys.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-10-user-journeys.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-10-user-journeys.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-10-user-journeys.md
index bc1ad1213..942d31aa7 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-10-user-journeys.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-10-user-journeys.md
@@ -205,7 +205,7 @@ Show the generated user journey content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-11-component-strategy.md`
+- Load `./step-11-component-strategy.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -236,6 +236,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-11-component-strategy.md` to define component library strategy.
+After user selects 'C' and content is saved to document, load `./step-11-component-strategy.md` to define component library strategy.
 
 Remember: Do NOT proceed to step-11 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-11-component-strategy.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-11-component-strategy.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-11-component-strategy.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-11-component-strategy.md
index 2a661edf0..6b4c792d1 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-11-component-strategy.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-11-component-strategy.md
@@ -211,7 +211,7 @@ Show the generated component strategy content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-12-ux-patterns.md`
+- Load `./step-12-ux-patterns.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -243,6 +243,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-12-ux-patterns.md` to define UX consistency patterns.
+After user selects 'C' and content is saved to document, load `./step-12-ux-patterns.md` to define UX consistency patterns.
 
 Remember: Do NOT proceed to step-12 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-12-ux-patterns.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-12-ux-patterns.md
similarity index 95%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-12-ux-patterns.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-12-ux-patterns.md
index cde4a15c3..11661f1f5 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-12-ux-patterns.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-12-ux-patterns.md
@@ -200,7 +200,7 @@ Show the generated UX patterns content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-13-responsive-accessibility.md`
+- Load `./step-13-responsive-accessibility.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -232,6 +232,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-13-responsive-accessibility.md` to define responsive design and accessibility strategy.
+After user selects 'C' and content is saved to document, load `./step-13-responsive-accessibility.md` to define responsive design and accessibility strategy.
 
 Remember: Do NOT proceed to step-13 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-13-responsive-accessibility.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-13-responsive-accessibility.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-13-responsive-accessibility.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-13-responsive-accessibility.md
index 57becfded..af9b81761 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-13-responsive-accessibility.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-13-responsive-accessibility.md
@@ -227,7 +227,7 @@ Show the generated responsive and accessibility content and present choices:
 
 - Append the final content to `{planning_artifacts}/ux-design-specification.md`
 - Update frontmatter: append step to end of stepsCompleted array
-- Load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-14-complete.md`
+- Load `./step-14-complete.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -259,6 +259,6 @@ When user selects 'C', append the content directly to the document using the str
 
 ## NEXT STEP:
 
-After user selects 'C' and content is saved to document, load `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-14-complete.md` to finalize the UX design workflow.
+After user selects 'C' and content is saved to document, load `./step-14-complete.md` to finalize the UX design workflow.
 
 Remember: Do NOT proceed to step-14 until user explicitly selects 'C' from the A/P/C menu and content is saved!
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-14-complete.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-14-complete.md
similarity index 100%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-14-complete.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-14-complete.md
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/ux-design-template.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/ux-design-template.md
similarity index 100%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/ux-design-template.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/ux-design-template.md
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/workflow.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/workflow.md
similarity index 71%
rename from src/bmm/workflows/2-plan-workflows/create-ux-design/workflow.md
rename to src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/workflow.md
index 4dfdba9f1..51f9626c4 100644
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/workflow.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/workflow.md
@@ -1,8 +1,3 @@
----
-name: create-ux-design
-description: 'Plan UX patterns and design specifications. Use when the user says "lets create UX design" or "create UX specifications" or "help me plan the UX"'
----
-
 # Create UX Design Workflow
 
 **Goal:** Create comprehensive UX design specifications through collaborative visual exploration and informed decision-making where you act as a UX facilitator working with a product stakeholder.
@@ -32,11 +27,11 @@ Load config from `{project-root}/_bmad/bmm/config.yaml` and resolve:
 
 ### Paths
 
-- `installed_path` = `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design`
+- `installed_path` = `.`
 - `template_path` = `{installed_path}/ux-design-template.md`
 - `default_output_file` = `{planning_artifacts}/ux-design-specification.md`
 
 ## EXECUTION
 
 - ✅ YOU MUST ALWAYS SPEAK OUTPUT In your Agent communication style with the config `{communication_language}`
-- Read fully and follow: `{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-01-init.md` to begin the UX design workflow.
+- Read fully and follow: `./steps/step-01-init.md` to begin the UX design workflow.
diff --git a/src/bmm/workflows/2-plan-workflows/create-ux-design/bmad-skill-manifest.yaml b/src/bmm/workflows/2-plan-workflows/create-ux-design/bmad-skill-manifest.yaml
deleted file mode 100644
index f0b8a250f..000000000
--- a/src/bmm/workflows/2-plan-workflows/create-ux-design/bmad-skill-manifest.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-canonicalId: bmad-create-ux-design
-type: workflow
-description: "Plan UX patterns and design specifications"
diff --git a/src/bmm/workflows/4-implementation/bmad-dev-story/SKILL.md b/src/bmm/workflows/4-implementation/bmad-dev-story/SKILL.md
new file mode 100644
index 000000000..c7217863d
--- /dev/null
+++ b/src/bmm/workflows/4-implementation/bmad-dev-story/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-dev-story
+description: 'Execute story implementation following a context filled story spec file. Use when the user says "dev this story [story file]" or "implement the next story in the sprint plan"'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/bmm/workflows/4-implementation/bmad-dev-story/bmad-skill-manifest.yaml b/src/bmm/workflows/4-implementation/bmad-dev-story/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/bmm/workflows/4-implementation/bmad-dev-story/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/bmm/workflows/4-implementation/dev-story/checklist.md b/src/bmm/workflows/4-implementation/bmad-dev-story/checklist.md
similarity index 100%
rename from src/bmm/workflows/4-implementation/dev-story/checklist.md
rename to src/bmm/workflows/4-implementation/bmad-dev-story/checklist.md
diff --git a/src/bmm/workflows/4-implementation/dev-story/workflow.md b/src/bmm/workflows/4-implementation/bmad-dev-story/workflow.md
similarity index 98%
rename from src/bmm/workflows/4-implementation/dev-story/workflow.md
rename to src/bmm/workflows/4-implementation/bmad-dev-story/workflow.md
index c2200d398..1981276e2 100644
--- a/src/bmm/workflows/4-implementation/dev-story/workflow.md
+++ b/src/bmm/workflows/4-implementation/bmad-dev-story/workflow.md
@@ -1,8 +1,3 @@
----
-name: dev-story
-description: 'Execute story implementation following a context filled story spec file. Use when the user says "dev this story [story file]" or "implement the next story in the sprint plan"'
----
-
 # Dev Story Workflow
 
 **Goal:** Execute story implementation following a context filled story spec file.
@@ -32,8 +27,7 @@ Load config from `{project-root}/_bmad/bmm/config.yaml` and resolve:
 
 ### Paths
 
-- `installed_path` = `{project-root}/_bmad/bmm/workflows/4-implementation/dev-story`
-- `validation` = `{installed_path}/checklist.md`
+- `validation` = `./checklist.md`
 - `story_file` = `` (explicit story path; auto-discovered if empty)
 - `sprint_status` = `{implementation_artifacts}/sprint-status.yaml`
 
diff --git a/src/bmm/workflows/4-implementation/dev-story/bmad-skill-manifest.yaml b/src/bmm/workflows/4-implementation/dev-story/bmad-skill-manifest.yaml
deleted file mode 100644
index 2a79cef01..000000000
--- a/src/bmm/workflows/4-implementation/dev-story/bmad-skill-manifest.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-canonicalId: bmad-dev-story
-type: workflow
-description: "Execute story implementation following a context-filled story spec file"