diff --git a/Cargo.lock b/Cargo.lock
index 75e4888..41be304 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -89,7 +89,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
-name = "archivr"
+name = "archivr-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 5b0d0aa..f6902f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,14 @@
-[package]
-name = "archivr"
+[workspace]
+members = [
+    "crates/archivr-cli",
+]
+resolver = "2"
+
+[workspace.package]
 version = "0.1.0"
 edition = "2024"
 
-[dependencies]
+[workspace.dependencies]
 anyhow = "1.0.100"
 chrono = "0.4.42"
 clap = { version = "4.5.48", features = ["derive"] }
diff --git a/crates/archivr-cli/Cargo.toml b/crates/archivr-cli/Cargo.toml
new file mode 100644
index 0000000..5f70d01
--- /dev/null
+++ b/crates/archivr-cli/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "archivr-cli"
+version.workspace = true
+edition.workspace = true
+
+[[bin]]
+name = "archivr"
+path = "src/main.rs"
+
+[dependencies]
+anyhow.workspace = true
+chrono.workspace = true
+clap.workspace = true
+hex.workspace = true
+regex.workspace = true
+rusqlite.workspace = true
+serde_json.workspace = true
+sha3.workspace = true
+uuid.workspace = true
diff --git a/src/database.rs b/crates/archivr-cli/src/database.rs
similarity index 100%
rename from src/database.rs
rename to crates/archivr-cli/src/database.rs
diff --git a/src/downloader/local.rs b/crates/archivr-cli/src/downloader/local.rs
similarity index 100%
rename from src/downloader/local.rs
rename to crates/archivr-cli/src/downloader/local.rs
diff --git a/src/downloader/mod.rs b/crates/archivr-cli/src/downloader/mod.rs
similarity index 100%
rename from src/downloader/mod.rs
rename to crates/archivr-cli/src/downloader/mod.rs
diff --git a/src/downloader/store.rs b/crates/archivr-cli/src/downloader/store.rs
similarity index 100%
rename from src/downloader/store.rs
rename to crates/archivr-cli/src/downloader/store.rs
diff --git a/src/downloader/tweets.rs b/crates/archivr-cli/src/downloader/tweets.rs
similarity index 100%
rename from src/downloader/tweets.rs
rename to crates/archivr-cli/src/downloader/tweets.rs
diff --git a/src/downloader/ytdlp.rs b/crates/archivr-cli/src/downloader/ytdlp.rs
similarity index 100%
rename from src/downloader/ytdlp.rs
rename to crates/archivr-cli/src/downloader/ytdlp.rs
diff --git a/src/hash.rs b/crates/archivr-cli/src/hash.rs
similarity index 100%
rename from src/hash.rs
rename to crates/archivr-cli/src/hash.rs
diff --git a/src/main.rs b/crates/archivr-cli/src/main.rs
similarity index 100%
rename from src/main.rs
rename to crates/archivr-cli/src/main.rs
diff --git a/src/twitter.rs b/crates/archivr-cli/src/twitter.rs
similarity index 100%
rename from src/twitter.rs
rename to crates/archivr-cli/src/twitter.rs