diff --git a/Cargo.toml b/Cargo.toml
index 006298f..ad75879 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,11 +5,11 @@ members = [
     "crates/owlen-tui",
     "crates/owlen-cli",
     "crates/owlen-providers",
-    "crates/owlen-mcp-server",
-    "crates/owlen-mcp-llm-server",
-    "crates/owlen-mcp-client",
-    "crates/owlen-mcp-code-server",
-    "crates/owlen-mcp-prompt-server",
+    "crates/mcp/server",
+    "crates/mcp/llm-server",
+    "crates/mcp/client",
+    "crates/mcp/code-server",
+    "crates/mcp/prompt-server",
     "crates/owlen-markdown",
 ]
 exclude = []
diff --git a/crates/owlen-mcp-client/Cargo.toml b/crates/mcp/client/Cargo.toml
similarity index 84%
rename from crates/owlen-mcp-client/Cargo.toml
rename to crates/mcp/client/Cargo.toml
index 28eabfe..657bdd6 100644
--- a/crates/owlen-mcp-client/Cargo.toml
+++ b/crates/mcp/client/Cargo.toml
@@ -6,7 +6,7 @@ description = "Dedicated MCP client library for Owlen, exposing remote MCP serve
 license = "AGPL-3.0"
 
 [dependencies]
-owlen-core = { path = "../owlen-core" }
+owlen-core = { path = "../../owlen-core" }
 
 [features]
 default = []
diff --git a/crates/owlen-mcp-client/src/lib.rs b/crates/mcp/client/src/lib.rs
similarity index 100%
rename from crates/owlen-mcp-client/src/lib.rs
rename to crates/mcp/client/src/lib.rs
diff --git a/crates/owlen-mcp-code-server/Cargo.toml b/crates/mcp/code-server/Cargo.toml
similarity index 92%
rename from crates/owlen-mcp-code-server/Cargo.toml
rename to crates/mcp/code-server/Cargo.toml
index a96a9ef..b595a83 100644
--- a/crates/owlen-mcp-code-server/Cargo.toml
+++ b/crates/mcp/code-server/Cargo.toml
@@ -6,7 +6,7 @@ description = "MCP server exposing safe code execution tools for Owlen"
 license = "AGPL-3.0"
 
 [dependencies]
-owlen-core = { path = "../owlen-core" }
+owlen-core = { path = "../../owlen-core" }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true }
diff --git a/crates/owlen-mcp-code-server/src/lib.rs b/crates/mcp/code-server/src/lib.rs
similarity index 100%
rename from crates/owlen-mcp-code-server/src/lib.rs
rename to crates/mcp/code-server/src/lib.rs
diff --git a/crates/owlen-mcp-code-server/src/sandbox.rs b/crates/mcp/code-server/src/sandbox.rs
similarity index 100%
rename from crates/owlen-mcp-code-server/src/sandbox.rs
rename to crates/mcp/code-server/src/sandbox.rs
diff --git a/crates/owlen-mcp-code-server/src/tools.rs b/crates/mcp/code-server/src/tools.rs
similarity index 100%
rename from crates/owlen-mcp-code-server/src/tools.rs
rename to crates/mcp/code-server/src/tools.rs
diff --git a/crates/owlen-mcp-llm-server/Cargo.toml b/crates/mcp/llm-server/Cargo.toml
similarity index 88%
rename from crates/owlen-mcp-llm-server/Cargo.toml
rename to crates/mcp/llm-server/Cargo.toml
index b2e63e7..d788153 100644
--- a/crates/owlen-mcp-llm-server/Cargo.toml
+++ b/crates/mcp/llm-server/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition.workspace = true
 
 [dependencies]
-owlen-core = { path = "../owlen-core" }
+owlen-core = { path = "../../owlen-core" }
 tokio = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/crates/owlen-mcp-llm-server/src/main.rs b/crates/mcp/llm-server/src/main.rs
similarity index 100%
rename from crates/owlen-mcp-llm-server/src/main.rs
rename to crates/mcp/llm-server/src/main.rs
diff --git a/crates/owlen-mcp-prompt-server/Cargo.toml b/crates/mcp/prompt-server/Cargo.toml
similarity index 92%
rename from crates/owlen-mcp-prompt-server/Cargo.toml
rename to crates/mcp/prompt-server/Cargo.toml
index 4440cac..7f6ef85 100644
--- a/crates/owlen-mcp-prompt-server/Cargo.toml
+++ b/crates/mcp/prompt-server/Cargo.toml
@@ -6,7 +6,7 @@ description = "MCP server that renders prompt templates (YAML) for Owlen"
 license = "AGPL-3.0"
 
 [dependencies]
-owlen-core = { path = "../owlen-core" }
+owlen-core = { path = "../../owlen-core" }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
diff --git a/crates/owlen-mcp-prompt-server/src/lib.rs b/crates/mcp/prompt-server/src/lib.rs
similarity index 100%
rename from crates/owlen-mcp-prompt-server/src/lib.rs
rename to crates/mcp/prompt-server/src/lib.rs
diff --git a/crates/owlen-mcp-prompt-server/templates/example.yaml b/crates/mcp/prompt-server/templates/example.yaml
similarity index 100%
rename from crates/owlen-mcp-prompt-server/templates/example.yaml
rename to crates/mcp/prompt-server/templates/example.yaml
diff --git a/crates/owlen-mcp-server/Cargo.toml b/crates/mcp/server/Cargo.toml
similarity index 84%
rename from crates/owlen-mcp-server/Cargo.toml
rename to crates/mcp/server/Cargo.toml
index b15a081..dfb0e35 100644
--- a/crates/owlen-mcp-server/Cargo.toml
+++ b/crates/mcp/server/Cargo.toml
@@ -9,4 +9,4 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 anyhow = { workspace = true }
 path-clean = "1.0"
-owlen-core = { path = "../owlen-core" }
+owlen-core = { path = "../../owlen-core" }
diff --git a/crates/owlen-mcp-server/src/main.rs b/crates/mcp/server/src/main.rs
similarity index 100%
rename from crates/owlen-mcp-server/src/main.rs
rename to crates/mcp/server/src/main.rs