diff --git a/Cargo.toml b/Cargo.toml
index d40ffc2..87fd074 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,5 @@
 [workspace]
-members = [
-    ".",
-    "cli",
-    "egui",
-    "macros/specctra_derive",
-]
+members = [".", "crates/*"]
 resolver = "2"
 
 [workspace.dependencies]
@@ -47,7 +42,7 @@ thiserror = "1.0"
 utf8-chars = "3.0.4"
 
 [dependencies.specctra_derive]
-path = "macros/specctra_derive"
+path = "crates/specctra_derive"
 
 [dev-dependencies]
 serde_json.workspace = true
diff --git a/macros/specctra_derive/Cargo.toml b/crates/specctra_derive/Cargo.toml
similarity index 100%
rename from macros/specctra_derive/Cargo.toml
rename to crates/specctra_derive/Cargo.toml
diff --git a/macros/specctra_derive/src/lib.rs b/crates/specctra_derive/src/lib.rs
similarity index 100%
rename from macros/specctra_derive/src/lib.rs
rename to crates/specctra_derive/src/lib.rs
diff --git a/macros/specctra_derive/src/read.rs b/crates/specctra_derive/src/read.rs
similarity index 100%
rename from macros/specctra_derive/src/read.rs
rename to crates/specctra_derive/src/read.rs
diff --git a/macros/specctra_derive/src/write.rs b/crates/specctra_derive/src/write.rs
similarity index 100%
rename from macros/specctra_derive/src/write.rs
rename to crates/specctra_derive/src/write.rs
diff --git a/cli/Cargo.toml b/crates/topola-cli/Cargo.toml
similarity index 87%
rename from cli/Cargo.toml
rename to crates/topola-cli/Cargo.toml
index 9a347c4..5c64577 100644
--- a/cli/Cargo.toml
+++ b/crates/topola-cli/Cargo.toml
@@ -17,7 +17,7 @@ serde.workspace = true
 serde_json.workspace = true
 
 [dependencies.topola]
-path = ".."
+path = "../.."
 default-features = false
 
 [dependencies.clap]
@@ -26,4 +26,7 @@ features = ["derive"]
 
 [build-dependencies]
 clap_mangen = "0.2.23"
-clap = {version="4.5.18", features = ["derive"] }
+
+[build-dependencies.clap]
+version = "4.5.18"
+features = ["derive"]
diff --git a/cli/build.rs b/crates/topola-cli/build.rs
similarity index 100%
rename from cli/build.rs
rename to crates/topola-cli/build.rs
diff --git a/cli/src/cli.rs b/crates/topola-cli/src/cli.rs
similarity index 100%
rename from cli/src/cli.rs
rename to crates/topola-cli/src/cli.rs
diff --git a/cli/src/main.rs b/crates/topola-cli/src/main.rs
similarity index 100%
rename from cli/src/main.rs
rename to crates/topola-cli/src/main.rs
diff --git a/egui/Cargo.toml b/crates/topola-egui/Cargo.toml
similarity index 98%
rename from egui/Cargo.toml
rename to crates/topola-egui/Cargo.toml
index 939da78..06a4b07 100644
--- a/egui/Cargo.toml
+++ b/crates/topola-egui/Cargo.toml
@@ -23,7 +23,7 @@ spade.workspace = true
 sys-locale = "0.3.1"
 
 [dependencies.topola]
-path = ".."
+path = "../.."
 default-features = false
 
 [dependencies.unic-langid]
diff --git a/egui/src/action.rs b/crates/topola-egui/src/action.rs
similarity index 100%
rename from egui/src/action.rs
rename to crates/topola-egui/src/action.rs
diff --git a/egui/src/actions.rs b/crates/topola-egui/src/actions.rs
similarity index 100%
rename from egui/src/actions.rs
rename to crates/topola-egui/src/actions.rs
diff --git a/egui/src/app.rs b/crates/topola-egui/src/app.rs
similarity index 100%
rename from egui/src/app.rs
rename to crates/topola-egui/src/app.rs
diff --git a/egui/src/config.rs b/crates/topola-egui/src/config.rs
similarity index 100%
rename from egui/src/config.rs
rename to crates/topola-egui/src/config.rs
diff --git a/egui/src/error_dialog.rs b/crates/topola-egui/src/error_dialog.rs
similarity index 100%
rename from egui/src/error_dialog.rs
rename to crates/topola-egui/src/error_dialog.rs
diff --git a/egui/src/layers.rs b/crates/topola-egui/src/layers.rs
similarity index 100%
rename from egui/src/layers.rs
rename to crates/topola-egui/src/layers.rs
diff --git a/egui/src/main.rs b/crates/topola-egui/src/main.rs
similarity index 100%
rename from egui/src/main.rs
rename to crates/topola-egui/src/main.rs
diff --git a/egui/src/menu_bar.rs b/crates/topola-egui/src/menu_bar.rs
similarity index 100%
rename from egui/src/menu_bar.rs
rename to crates/topola-egui/src/menu_bar.rs
diff --git a/egui/src/overlay.rs b/crates/topola-egui/src/overlay.rs
similarity index 100%
rename from egui/src/overlay.rs
rename to crates/topola-egui/src/overlay.rs
diff --git a/egui/src/painter.rs b/crates/topola-egui/src/painter.rs
similarity index 100%
rename from egui/src/painter.rs
rename to crates/topola-egui/src/painter.rs
diff --git a/egui/src/status_bar.rs b/crates/topola-egui/src/status_bar.rs
similarity index 100%
rename from egui/src/status_bar.rs
rename to crates/topola-egui/src/status_bar.rs
diff --git a/egui/src/translator.rs b/crates/topola-egui/src/translator.rs
similarity index 95%
rename from egui/src/translator.rs
rename to crates/topola-egui/src/translator.rs
index cfa4d9a..14007d1 100644
--- a/egui/src/translator.rs
+++ b/crates/topola-egui/src/translator.rs
@@ -5,7 +5,7 @@ use unic_langid::LanguageIdentifier;
 
 static_loader! {
     static LOCALES = {
-        locales: "../locales",
+        locales: "../../locales",
         fallback_language: "en-US",
     };
 }
diff --git a/egui/src/viewport.rs b/crates/topola-egui/src/viewport.rs
similarity index 100%
rename from egui/src/viewport.rs
rename to crates/topola-egui/src/viewport.rs
diff --git a/egui/src/workspace.rs b/crates/topola-egui/src/workspace.rs
similarity index 100%
rename from egui/src/workspace.rs
rename to crates/topola-egui/src/workspace.rs