diff --git a/src/bmm/agents/analyst.agent.yaml b/src/bmm/agents/analyst.agent.yaml
index 4767dadfa..552ffc2e4 100644
--- a/src/bmm/agents/analyst.agent.yaml
+++ b/src/bmm/agents/analyst.agent.yaml
@@ -23,7 +23,7 @@ agent:
       description: "[BP] Brainstorm Project: Expert Guided Facilitation through a single or multiple techniques with a final report"
 
     - trigger: MR or fuzzy match on market-research
-      exec: "{project-root}/_bmad/bmm/workflows/1-analysis/research/workflow-market-research.md"
+      exec: "{project-root}/_bmad/bmm/workflows/1-analysis/research/bmad-market-research/workflow.md"
       description: "[MR] Market Research: Market analysis, competitive landscape, customer needs and trends"
 
     - trigger: DR or fuzzy match on domain-research
diff --git a/src/bmm/module-help.csv b/src/bmm/module-help.csv
index 73482ae56..79c4e6b9b 100644
--- a/src/bmm/module-help.csv
+++ b/src/bmm/module-help.csv
@@ -11,7 +11,7 @@ bmm,anytime,Mermaid Generate,MG,,_bmad/bmm/agents/tech-writer/tech-writer.agent.
 bmm,anytime,Validate Document,VD,,_bmad/bmm/agents/tech-writer/tech-writer.agent.yaml,,false,tech-writer,,"Review the specified document against documentation standards and best practices. Returns specific actionable improvement suggestions organized by priority.",planning_artifacts,"validation report",
 bmm,anytime,Explain Concept,EC,,_bmad/bmm/agents/tech-writer/tech-writer.agent.yaml,,false,tech-writer,,"Create clear technical explanations with examples and diagrams for complex concepts. Breaks down into digestible sections using task-oriented approach.",project_knowledge,"explanation",
 bmm,1-analysis,Brainstorm Project,BP,10,_bmad/core/workflows/brainstorming/workflow.md,bmad-brainstorming,false,analyst,data=_bmad/bmm/data/project-context-template.md,"Expert Guided Facilitation through a single or multiple techniques",planning_artifacts,"brainstorming session",
-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,Market Research,MR,20,skill:bmad-market-research,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,_bmad/bmm/workflows/1-analysis/research/workflow-domain-research.md,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",
diff --git a/src/bmm/workflows/1-analysis/research/bmad-market-research/SKILL.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/SKILL.md
new file mode 100644
index 000000000..1e8c1190f
--- /dev/null
+++ b/src/bmm/workflows/1-analysis/research/bmad-market-research/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-market-research
+description: 'Conduct market research on competition and customers. Use when the user says "create a market research report about [business idea]".'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/bmm/workflows/1-analysis/research/bmad-market-research/bmad-skill-manifest.yaml b/src/bmm/workflows/1-analysis/research/bmad-market-research/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/bmm/workflows/1-analysis/research/bmad-market-research/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/bmm/workflows/1-analysis/research/market-steps/step-01-init.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-01-init.md
similarity index 94%
rename from src/bmm/workflows/1-analysis/research/market-steps/step-01-init.md
rename to src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-01-init.md
index ba7563b71..f4a1ef163 100644
--- a/src/bmm/workflows/1-analysis/research/market-steps/step-01-init.md
+++ b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-01-init.md
@@ -138,7 +138,7 @@ Show initial scope document and present continue option:
 
 - Update frontmatter: `stepsCompleted: [1]`
 - Add confirmation note to document: "Scope confirmed by user on {{date}}"
-- Load: `{project-root}/_bmad/bmm/workflows/1-analysis/research/market-steps/step-02-customer-behavior.md`
+- Load: `./market-steps/step-02-customer-behavior.md`
 
 #### If 'Modify':
 
@@ -177,6 +177,6 @@ This step ensures:
 
 ## NEXT STEP:
 
-After user confirmation and scope finalization, load `{project-root}/_bmad/bmm/workflows/1-analysis/research/market-steps/step-02-customer-behavior.md` to begin detailed market research with customer insights analysis.
+After user confirmation and scope finalization, load `./market-steps/step-02-customer-behavior.md` to begin detailed market research with customer insights analysis.
 
 Remember: Init steps confirm understanding and scope, not generate research content!
diff --git a/src/bmm/workflows/1-analysis/research/market-steps/step-02-customer-behavior.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-02-customer-behavior.md
similarity index 96%
rename from src/bmm/workflows/1-analysis/research/market-steps/step-02-customer-behavior.md
rename to src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-02-customer-behavior.md
index e5315e34e..6bff400f5 100644
--- a/src/bmm/workflows/1-analysis/research/market-steps/step-02-customer-behavior.md
+++ b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-02-customer-behavior.md
@@ -179,7 +179,7 @@ _Source: [URL]_
 
 - **CONTENT ALREADY WRITTEN TO DOCUMENT**
 - Update frontmatter: `stepsCompleted: [1, 2]`
-- Load: `{project-root}/_bmad/bmm/workflows/1-analysis/research/market-steps/step-03-customer-pain-points.md`
+- Load: `./market-steps/step-03-customer-pain-points.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -232,6 +232,6 @@ Content is already written to document when generated in step 4. No additional a
 
 ## NEXT STEP:
 
-After user selects 'C', load `{project-root}/_bmad/bmm/workflows/1-analysis/research/market-steps/step-03-customer-pain-points.md` to analyze customer pain points, challenges, and unmet needs for {{research_topic}}.
+After user selects 'C', load `./market-steps/step-03-customer-pain-points.md` to analyze customer pain points, challenges, and unmet needs for {{research_topic}}.
 
 Remember: Always write research content to document immediately and emphasize current customer data with rigorous source verification!
diff --git a/src/bmm/workflows/1-analysis/research/market-steps/step-03-customer-pain-points.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-03-customer-pain-points.md
similarity index 96%
rename from src/bmm/workflows/1-analysis/research/market-steps/step-03-customer-pain-points.md
rename to src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-03-customer-pain-points.md
index d740ae5e4..58974e761 100644
--- a/src/bmm/workflows/1-analysis/research/market-steps/step-03-customer-pain-points.md
+++ b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-03-customer-pain-points.md
@@ -190,7 +190,7 @@ _Source: [URL]_
 
 - **CONTENT ALREADY WRITTEN TO DOCUMENT**
 - Update frontmatter: `stepsCompleted: [1, 2, 3]`
-- Load: `{project-root}/_bmad/bmm/workflows/1-analysis/research/market-steps/step-04-customer-decisions.md`
+- Load: `./market-steps/step-04-customer-decisions.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -244,6 +244,6 @@ Content is already written to document when generated in step 4. No additional a
 
 ## NEXT STEP:
 
-After user selects 'C', load `{project-root}/_bmad/bmm/workflows/1-analysis/research/market-steps/step-04-customer-decisions.md` to analyze customer decision processes, journey mapping, and decision factors for {{research_topic}}.
+After user selects 'C', load `./market-steps/step-04-customer-decisions.md` to analyze customer decision processes, journey mapping, and decision factors for {{research_topic}}.
 
 Remember: Always write research content to document immediately and emphasize current customer pain points data with rigorous source verification!
diff --git a/src/bmm/workflows/1-analysis/research/market-steps/step-04-customer-decisions.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-04-customer-decisions.md
similarity index 96%
rename from src/bmm/workflows/1-analysis/research/market-steps/step-04-customer-decisions.md
rename to src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-04-customer-decisions.md
index 0f94f535b..76a28332f 100644
--- a/src/bmm/workflows/1-analysis/research/market-steps/step-04-customer-decisions.md
+++ b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-04-customer-decisions.md
@@ -200,7 +200,7 @@ _Source: [URL]_
 
 - **CONTENT ALREADY WRITTEN TO DOCUMENT**
 - Update frontmatter: `stepsCompleted: [1, 2, 3, 4]`
-- Load: `{project-root}/_bmad/bmm/workflows/1-analysis/research/market-steps/step-05-competitive-analysis.md`
+- Load: `./market-steps/step-05-competitive-analysis.md`
 
 ## APPEND TO DOCUMENT:
 
@@ -254,6 +254,6 @@ Content is already written to document when generated in step 4. No additional a
 
 ## NEXT STEP:
 
-After user selects 'C', load `{project-root}/_bmad/bmm/workflows/1-analysis/research/market-steps/step-05-competitive-analysis.md` to analyze competitive landscape, market positioning, and competitive strategies for {{research_topic}}.
+After user selects 'C', load `./market-steps/step-05-competitive-analysis.md` to analyze competitive landscape, market positioning, and competitive strategies for {{research_topic}}.
 
 Remember: Always write research content to document immediately and emphasize current customer decision data with rigorous source verification!
diff --git a/src/bmm/workflows/1-analysis/research/market-steps/step-05-competitive-analysis.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-05-competitive-analysis.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/research/market-steps/step-05-competitive-analysis.md
rename to src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-05-competitive-analysis.md
diff --git a/src/bmm/workflows/1-analysis/research/market-steps/step-06-research-completion.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-06-research-completion.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/research/market-steps/step-06-research-completion.md
rename to src/bmm/workflows/1-analysis/research/bmad-market-research/market-steps/step-06-research-completion.md
diff --git a/src/bmm/workflows/1-analysis/research/bmad-market-research/research.template.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/research.template.md
new file mode 100644
index 000000000..1d9952470
--- /dev/null
+++ b/src/bmm/workflows/1-analysis/research/bmad-market-research/research.template.md
@@ -0,0 +1,29 @@
+---
+stepsCompleted: []
+inputDocuments: []
+workflowType: 'research'
+lastStep: 1
+research_type: '{{research_type}}'
+research_topic: '{{research_topic}}'
+research_goals: '{{research_goals}}'
+user_name: '{{user_name}}'
+date: '{{date}}'
+web_research_enabled: true
+source_verification: true
+---
+
+# Research Report: {{research_type}}
+
+**Date:** {{date}}
+**Author:** {{user_name}}
+**Research Type:** {{research_type}}
+
+---
+
+## Research Overview
+
+[Research overview and methodology will be appended here]
+
+---
+
+<!-- Content will be appended sequentially through research workflow steps -->
diff --git a/src/bmm/workflows/1-analysis/research/workflow-market-research.md b/src/bmm/workflows/1-analysis/research/bmad-market-research/workflow.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/research/workflow-market-research.md
rename to src/bmm/workflows/1-analysis/research/bmad-market-research/workflow.md
index 8a77a67cd..c2bc7d665 100644
--- a/src/bmm/workflows/1-analysis/research/workflow-market-research.md
+++ b/src/bmm/workflows/1-analysis/research/bmad-market-research/workflow.md
@@ -1,5 +1,5 @@
 ---
-name: market-research
+name: bmad-market-research
 description: 'Conduct market research on competition and customers. Use when the user says "create a market research report about [business idea]".'
 ---
 
diff --git a/src/bmm/workflows/1-analysis/research/bmad-skill-manifest.yaml b/src/bmm/workflows/1-analysis/research/bmad-skill-manifest.yaml
index 02bf825e9..dca15831f 100644
--- a/src/bmm/workflows/1-analysis/research/bmad-skill-manifest.yaml
+++ b/src/bmm/workflows/1-analysis/research/bmad-skill-manifest.yaml
@@ -3,11 +3,6 @@ workflow-domain-research.md:
   type: workflow
   description: "Conduct domain and industry research. Use when the user says 'lets create a research report on [domain or industry]'"
 
-workflow-market-research.md:
-  canonicalId: bmad-market-research
-  type: workflow
-  description: "Conduct market research on competition and customers. Use when the user says 'create a market research report about [business idea]'"
-
 workflow-technical-research.md:
   canonicalId: bmad-technical-research
   type: workflow