diff --git a/src/orchestrator-skills/4-implementation/bmad-orchestrator/SKILL.md b/src/bmm-skills/4-implementation/bmad-orchestrator/SKILL.md
similarity index 99%
rename from src/orchestrator-skills/4-implementation/bmad-orchestrator/SKILL.md
rename to src/bmm-skills/4-implementation/bmad-orchestrator/SKILL.md
index 1886f4062..a885eafed 100644
--- a/src/orchestrator-skills/4-implementation/bmad-orchestrator/SKILL.md
+++ b/src/bmm-skills/4-implementation/bmad-orchestrator/SKILL.md
@@ -183,4 +183,4 @@ Sur demande de support, fournir de manière structurée :
 
 ## Capabilities
 
-L'orchestrateur ne possède pas de capabilities propres — il route vers les skills existants.
+L'orchestrateur ne possède pas de capabilities propres — il route vers les skills existants.
\ No newline at end of file
diff --git a/src/orchestrator-skills/4-implementation/bmad-orchestrator/customize.toml b/src/bmm-skills/4-implementation/bmad-orchestrator/customize.toml
similarity index 95%
rename from src/orchestrator-skills/4-implementation/bmad-orchestrator/customize.toml
rename to src/bmm-skills/4-implementation/bmad-orchestrator/customize.toml
index b758922af..e8e1626e7 100644
--- a/src/orchestrator-skills/4-implementation/bmad-orchestrator/customize.toml
+++ b/src/bmm-skills/4-implementation/bmad-orchestrator/customize.toml
@@ -26,4 +26,4 @@ principles = [
 [[agent.menu]]
 code = "OR"
 description = "Router une intention utilisateur vers le bon skill ou agent BMAD"
-prompt = "Analyse l'intention utilisateur, identifie le workflow BMAD ou l'agent approprié, vérifie les préconditions si nécessaire, puis poursuis avec ce skill ou cette réponse."
+prompt = "Analyse l'intention utilisateur, identifie le workflow BMAD ou l'agent approprié, vérifie les préconditions si nécessaire, puis poursuis avec ce skill ou cette réponse."
\ No newline at end of file
diff --git a/src/bmm-skills/module.yaml b/src/bmm-skills/module.yaml
index 490de183c..848f5910b 100644
--- a/src/bmm-skills/module.yaml
+++ b/src/bmm-skills/module.yaml
@@ -93,3 +93,10 @@ agents:
     icon: "💻"
     team: software-development
     description: "Test-first discipline (red, green, refactor), 100% pass before review, no fluff all precision. Speaks like a terminal prompt: exact file paths, AC IDs, and commit-message brevity — every statement citable."
+
+  - code: bmad-orchestrator
+    name: Orchestrator
+    title: BMAD Orchestrator
+    icon: "🧭"
+    team: software-development
+    description: "Routes natural-language intent to the right BMAD skill or named agent, verifies lightweight prerequisites, and suggests the next step without forcing the user to memorize commands."
diff --git a/src/orchestrator-skills/module-help.csv b/src/orchestrator-skills/module-help.csv
deleted file mode 100644
index b46c1293b..000000000
--- a/src/orchestrator-skills/module-help.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-module,skill,display-name,menu-code,description,action,args,phase,preceded-by,followed-by,required,output-location,outputs
-BMAD Orchestrator,bmad-orchestrator,Orchestrator,OR,Routes user intent to the right BMAD skill or agent without memorization.,,,,anytime,,,false,,
diff --git a/src/orchestrator-skills/module.yaml b/src/orchestrator-skills/module.yaml
deleted file mode 100644
index a38475139..000000000
--- a/src/orchestrator-skills/module.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-code: bmo
-name: "BMAD Orchestrator"
-description: "Dedicated orchestrator module for intelligent workflow routing and agent coordination"
-default_selected: false
-
-# No user-facing configuration for orchestrator module
-
-directories: []
-
-# Agent roster — orchestrator agent
-agents:
-  - code: bmad-orchestrator
-    name: Orchestrator
-    title: BMAD Orchestrator
-    icon: "🧭"
-    team: orchestration
-    description: "Routes natural-language intent to the right BMAD skill or named agent, verifies lightweight prerequisites, and suggests the next step without forcing the user to memorize commands."