diff --git a/Cargo.lock b/Cargo.lock
index 5f36375..b1eb2cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -345,7 +345,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "gedaechtnas"
+name = "gdn-cli"
 version = "0.0.0"
 dependencies = [
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 1880d95..0f343a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,18 @@
-[package]
-name = "gedaechtnas"
+[workspace]
+resolver = "2"
+members = ["gdn-cli"]
+
+[workspace.package]
 version = "0.0.0"
 edition = "2021"
 
-[dependencies]
+[workspace.dependencies]
 anyhow = "1.0.95"
 clap = { version = "4.5.26", features = ["derive", "deprecated"] }
 directories = "6.0.0"
 gix = "0.69.1"
 
-[lints]
+[workspace.lints]
 rust.unsafe_code = { level = "forbid", priority = 1 }
 # Lint groups
 rust.deprecated_safe = "warn"
diff --git a/gdn-cli/Cargo.toml b/gdn-cli/Cargo.toml
new file mode 100644
index 0000000..2d39b42
--- /dev/null
+++ b/gdn-cli/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "gdn-cli"
+version = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+anyhow = { workspace = true }
+clap = { workspace = true }
+directories = { workspace = true }
+gix = { workspace = true }
+
+[lints]
+workspace = true
diff --git a/src/commands.rs b/gdn-cli/src/commands.rs
similarity index 100%
rename from src/commands.rs
rename to gdn-cli/src/commands.rs
diff --git a/src/commands/init.rs b/gdn-cli/src/commands/init.rs
similarity index 100%
rename from src/commands/init.rs
rename to gdn-cli/src/commands/init.rs
diff --git a/src/main.rs b/gdn-cli/src/main.rs
similarity index 100%
rename from src/main.rs
rename to gdn-cli/src/main.rs