diff --git a/.gitignore b/.gitignore
index 9586308..e808a69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+### Custom
+AGENTS.md
+CLAUDE.md
+
 ### Rust template
 # Generated by Cargo
 # will have compiled files and executables
diff --git a/crates/cli/.gitignore b/crates/app/cli/.gitignore
similarity index 100%
rename from crates/cli/.gitignore
rename to crates/app/cli/.gitignore
diff --git a/crates/cli/Cargo.toml b/crates/app/cli/Cargo.toml
similarity index 77%
rename from crates/cli/Cargo.toml
rename to crates/app/cli/Cargo.toml
index 4c5cf9e..20447e8 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/app/cli/Cargo.toml
@@ -11,9 +11,9 @@ tokio = { version = "1.39", features = ["macros", "rt-multi-thread"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 color-eyre = "0.6"
-llm-ollama = { path = "../llm/ollama" }
-tools-fs = {path = "../tools/fs"}
-config-agent = { package = "config-agent", path = "../config" }
+llm-ollama = { path = "../../llm/ollama" }
+tools-fs = {path = "../../tools/fs" }
+config-agent = { package = "config-agent", path = "../../config" }
 futures-util = "0.3.31"
 
 [dev-dependencies]
diff --git a/crates/cli/src/main.rs b/crates/app/cli/src/main.rs
similarity index 100%
rename from crates/cli/src/main.rs
rename to crates/app/cli/src/main.rs
diff --git a/crates/cli/tests/chat_stream.rs b/crates/app/cli/tests/chat_stream.rs
similarity index 100%
rename from crates/cli/tests/chat_stream.rs
rename to crates/app/cli/tests/chat_stream.rs
diff --git a/crates/config/.gitignore b/crates/platform/config/.gitignore
similarity index 100%
rename from crates/config/.gitignore
rename to crates/platform/config/.gitignore
diff --git a/crates/config/Cargo.toml b/crates/platform/config/Cargo.toml
similarity index 100%
rename from crates/config/Cargo.toml
rename to crates/platform/config/Cargo.toml
diff --git a/crates/config/src/lib.rs b/crates/platform/config/src/lib.rs
similarity index 100%
rename from crates/config/src/lib.rs
rename to crates/platform/config/src/lib.rs
diff --git a/crates/config/tests/precedence.rs b/crates/platform/config/tests/precedence.rs
similarity index 100%
rename from crates/config/tests/precedence.rs
rename to crates/platform/config/tests/precedence.rs