diff --git a/Cargo.lock b/Cargo.lock
index 9b82330..f9ebd75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -262,11 +262,9 @@ dependencies = [
 name = "dagger-core"
 version = "0.2.8"
 dependencies = [
- "clap",
  "dirs",
  "eyre",
  "flate2",
- "genco",
  "graphql-introspection-query",
  "graphql_client",
  "hex",
@@ -292,7 +290,6 @@ dependencies = [
  "dirs",
  "eyre",
  "flate2",
- "genco",
  "graphql-introspection-query",
  "graphql_client",
  "hex",
diff --git a/Cargo.toml b/Cargo.toml
index bda4a53..51fc54a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,42 +1,20 @@
-[package]
-name = "dagger-rs"
-version = "0.2.10"
-edition = "2021"
-readme = "README.md"
-license-file = "LICENSE.MIT"
-description = "A dagger sdk for rust, written in rust"
-repository = "https://github.com/kjuulh/dagger-rs"
-publish = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [workspace]
 members = [
   "crates/dagger-codegen",
   "crates/dagger-sdk",
   "crates/dagger-core",
+  "crates/dagger-rs",
   "ci",
 ]
 
-[dependencies]
+[workspace.dependencies]
 dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.5" }
 dagger-core = { path = "crates/dagger-core", version = "^0.2.8" }
+dagger-rs = { path = "crates/dagger-rs", version = "^0.2.10" }
+dagger-sdk = { path = "crates/dagger-sdk", version = "^0.2.19" }
 
-clap = "4.1.6"
-dirs = "4.0.0"
 eyre = "0.6.8"
-flate2 = { version = "1.0.25", features = ["zlib"] }
-genco = "0.17.3"
-graphql-introspection-query = "0.2.0"
-graphql_client = { version = "0.12.0", features = ["reqwest"] }
-hex = "0.4.3"
-hex-literal = "0.3.4"
-platform-info = "1.0.2"
-reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
+color-eyre = "0.6.2"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
-sha2 = "0.10.6"
-tar = "0.4.38"
-tempfile = "3.3.0"
-color-eyre = "0.6.2"
 tokio = { version = "1.25.0", features = ["full"] }
diff --git a/crates/dagger-codegen/Cargo.toml b/crates/dagger-codegen/Cargo.toml
index 0d64a6a..a6ae7d0 100644
--- a/crates/dagger-codegen/Cargo.toml
+++ b/crates/dagger-codegen/Cargo.toml
@@ -10,12 +10,15 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-convert_case = "0.6.0"
-dagger-core = { path = "../dagger-core", version = "^0.2.8" }
+dagger-core = { workspace = true }
+
+eyre = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 
-eyre = "0.6.8"
 genco = "0.17.3"
+convert_case = "0.6.0"
 itertools = "0.10.5"
+
+[dev-dependencies]
 pretty_assertions = "1.3.0"
-serde = { version = "1.0.152", features = ["derive"] }
-serde_json = "1.0.93"
diff --git a/crates/dagger-core/Cargo.toml b/crates/dagger-core/Cargo.toml
index 930e025..7257d36 100644
--- a/crates/dagger-core/Cargo.toml
+++ b/crates/dagger-core/Cargo.toml
@@ -10,20 +10,19 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "4.1.6"
+eyre = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+
 dirs = "4.0.0"
-eyre = "0.6.8"
 flate2 = { version = "1.0.25", features = ["zlib"] }
-genco = "0.17.3"
 graphql-introspection-query = "0.2.0"
 graphql_client = { version = "0.12.0", features = ["reqwest"] }
 hex = "0.4.3"
 hex-literal = "0.3.4"
 platform-info = "1.0.2"
 reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
-serde = { version = "1.0.152", features = ["derive"] }
-serde_json = "1.0.93"
 sha2 = "0.10.6"
 tar = "0.4.38"
 tempfile = "3.3.0"
-tokio = { version = "1.25.0", features = ["full"] }
diff --git a/crates/dagger-rs/Cargo.toml b/crates/dagger-rs/Cargo.toml
new file mode 100644
index 0000000..788802c
--- /dev/null
+++ b/crates/dagger-rs/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "dagger-rs"
+version = "0.2.10"
+edition = "2021"
+readme = "README.md"
+license-file = "LICENSE.MIT"
+description = "A dagger sdk for rust, written in rust"
+repository = "https://github.com/kjuulh/dagger-rs"
+publish = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+dagger-core = { workspace = true }
+dagger-codegen = { workspace = true }
+
+eyre = { workspace = true }
+color-eyre = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+
+clap = "4.1.6"
+dirs = "4.0.0"
+flate2 = { version = "1.0.25", features = ["zlib"] }
+graphql-introspection-query = "0.2.0"
+graphql_client = { version = "0.12.0", features = ["reqwest"] }
+hex = "0.4.3"
+hex-literal = "0.3.4"
+platform-info = "1.0.2"
+reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
+sha2 = "0.10.6"
+tar = "0.4.38"
+tempfile = "3.3.0"
diff --git a/src/cli.rs b/crates/dagger-rs/src/cli.rs
similarity index 100%
rename from src/cli.rs
rename to crates/dagger-rs/src/cli.rs
diff --git a/src/cli_generate.rs b/crates/dagger-rs/src/cli_generate.rs
similarity index 100%
rename from src/cli_generate.rs
rename to crates/dagger-rs/src/cli_generate.rs
diff --git a/src/main.rs b/crates/dagger-rs/src/main.rs
similarity index 100%
rename from src/main.rs
rename to crates/dagger-rs/src/main.rs
diff --git a/crates/dagger-sdk/Cargo.toml b/crates/dagger-sdk/Cargo.toml
index 83199fa..19e9b31 100644
--- a/crates/dagger-sdk/Cargo.toml
+++ b/crates/dagger-sdk/Cargo.toml
@@ -11,15 +11,16 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dagger-core = { path = "../dagger-core", version = "^0.2.8" }
+dagger-core = { workspace = true }
+
+eyre = { workspace = true }
+tokio = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 
 base64 = "0.21.0"
-eyre = "0.6.8"
 futures = "0.3.27"
 gql_client = "1.0.7"
-serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.93", features = ["raw_value"] }
-tokio = { version = "1.25.0", features = ["full"] }
 derive_builder = "0.12.0"
 
 [dev-dependencies]