diff --git a/.git-hooks/prepare-commit-msg b/.git-hooks/prepare-commit-msg
index e55efe1..56c219f 100755
--- a/.git-hooks/prepare-commit-msg
+++ b/.git-hooks/prepare-commit-msg
@@ -1,4 +1,4 @@
 #!/bin/sh
 # cc-cli as a commit hook
-exec < /dev/tty
-cargo bin cc-cli "$@"
+exec </dev/tty
+cc-cli "$@"
diff --git a/Cargo.toml b/Cargo.toml
index d94bb98..e535c0b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,16 +1,14 @@
-[package]
-name = "git-next"
-version = "0.3.0"
-edition = "2021"
+[workspace]
+resolver = "2"
+members = ["crates/cli"]
 
-[features]
-default = ["forgejo"]
-forgejo = []
-github = []
+[workspace.lints.clippy]
+nursery = { level = "warn", priority = -1 }
+# pedantic = "warn"
+unwrap_used = "warn"
+expect_used = "warn"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
+[workspace.dependencies]
 # CLI parsing
 clap = { version = "4.5", features = ["cargo", "derive"] }
 
@@ -66,19 +64,8 @@ actix = "0.13"
 actix-rt = "2.9"
 tokio = { version = "1.37", features = ["full"] }
 
-[dev-dependencies]
 # Testing
 assert2 = "0.3"
 pretty_assertions = "1.4"
 test-log = { version = "0.2", features = ["env_logger", "trace"] }
 anyhow = "1.0"
-
-[package.metadata.bin]
-# Conventional commits githook
-cc-cli = { version = "0.1" }
-
-[lints.clippy]
-nursery = { level = "warn", priority = -1 }
-# pedantic = "warn"
-unwrap_used = "warn"
-expect_used = "warn"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
new file mode 100644
index 0000000..6ad8779
--- /dev/null
+++ b/crates/cli/Cargo.toml
@@ -0,0 +1,73 @@
+[package]
+name = "git-next"
+version = "0.3.0"
+edition = "2021"
+
+[features]
+default = ["forgejo"]
+forgejo = []
+github = []
+
+[dependencies]
+# CLI parsing
+clap = { workspace = true }
+
+# logging
+console-subscriber = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+
+# base64 decoding
+base64 = { workspace = true }
+
+# git
+# gix = { workspace = true }
+gix = { workspace = true }
+async-trait = { workspace = true }
+
+# fs/network
+kxio = { workspace = true }
+
+# fs
+tempfile = { workspace = true }
+
+# TOML parsing
+serde = { workspace = true }
+serde_json = { workspace = true }
+toml = { workspace = true }
+
+# Secrets and Password
+secrecy = { workspace = true }
+
+# Conventional Commit check
+git-conventional = { workspace = true }
+
+# Webhooks
+bytes = { workspace = true }
+ulid = { workspace = true }
+warp = { workspace = true }
+
+# error handling
+derive_more = { workspace = true }
+terrors = { workspace = true }
+
+# file watcher
+inotify = { workspace = true }
+
+# Actors
+actix = { workspace = true }
+actix-rt = { workspace = true }
+tokio = { workspace = true }
+
+[dev-dependencies]
+# Testing
+assert2 = { workspace = true }
+pretty_assertions = { workspace = true }
+test-log = { workspace = true }
+anyhow = { workspace = true }
+
+[lints.clippy]
+nursery = { level = "warn", priority = -1 }
+# pedantic = "warn"
+unwrap_used = "warn"
+expect_used = "warn"
diff --git a/src/init.rs b/crates/cli/src/init.rs
similarity index 90%
rename from src/init.rs
rename to crates/cli/src/init.rs
index 1eda7c6..c36deb0 100644
--- a/src/init.rs
+++ b/crates/cli/src/init.rs
@@ -15,7 +15,7 @@ pub fn run(fs: FileSystem) {
             file_name
         );
     } else {
-        match fs.file_write(&pathbuf, include_str!("../default.toml")) {
+        match fs.file_write(&pathbuf, include_str!("../../../default.toml")) {
             Ok(_) => {
                 println!("Created a default configuration file at {}", file_name);
             }
diff --git a/src/main.rs b/crates/cli/src/main.rs
similarity index 100%
rename from src/main.rs
rename to crates/cli/src/main.rs
diff --git a/src/server/actors/file_watcher.rs b/crates/cli/src/server/actors/file_watcher.rs
similarity index 100%
rename from src/server/actors/file_watcher.rs
rename to crates/cli/src/server/actors/file_watcher.rs
diff --git a/src/server/actors/mod.rs b/crates/cli/src/server/actors/mod.rs
similarity index 100%
rename from src/server/actors/mod.rs
rename to crates/cli/src/server/actors/mod.rs
diff --git a/src/server/actors/repo/branch.rs b/crates/cli/src/server/actors/repo/branch.rs
similarity index 100%
rename from src/server/actors/repo/branch.rs
rename to crates/cli/src/server/actors/repo/branch.rs
diff --git a/src/server/actors/repo/config.rs b/crates/cli/src/server/actors/repo/config.rs
similarity index 100%
rename from src/server/actors/repo/config.rs
rename to crates/cli/src/server/actors/repo/config.rs
diff --git a/src/server/actors/repo/mod.rs b/crates/cli/src/server/actors/repo/mod.rs
similarity index 100%
rename from src/server/actors/repo/mod.rs
rename to crates/cli/src/server/actors/repo/mod.rs
diff --git a/src/server/actors/repo/status.rs b/crates/cli/src/server/actors/repo/status.rs
similarity index 100%
rename from src/server/actors/repo/status.rs
rename to crates/cli/src/server/actors/repo/status.rs
diff --git a/src/server/actors/repo/webhook.rs b/crates/cli/src/server/actors/repo/webhook.rs
similarity index 100%
rename from src/server/actors/repo/webhook.rs
rename to crates/cli/src/server/actors/repo/webhook.rs
diff --git a/src/server/actors/server.rs b/crates/cli/src/server/actors/server.rs
similarity index 100%
rename from src/server/actors/server.rs
rename to crates/cli/src/server/actors/server.rs
diff --git a/src/server/actors/webhook/message.rs b/crates/cli/src/server/actors/webhook/message.rs
similarity index 100%
rename from src/server/actors/webhook/message.rs
rename to crates/cli/src/server/actors/webhook/message.rs
diff --git a/src/server/actors/webhook/mod.rs b/crates/cli/src/server/actors/webhook/mod.rs
similarity index 100%
rename from src/server/actors/webhook/mod.rs
rename to crates/cli/src/server/actors/webhook/mod.rs
diff --git a/src/server/actors/webhook/router.rs b/crates/cli/src/server/actors/webhook/router.rs
similarity index 100%
rename from src/server/actors/webhook/router.rs
rename to crates/cli/src/server/actors/webhook/router.rs
diff --git a/src/server/actors/webhook/server.rs b/crates/cli/src/server/actors/webhook/server.rs
similarity index 100%
rename from src/server/actors/webhook/server.rs
rename to crates/cli/src/server/actors/webhook/server.rs
diff --git a/src/server/config/load.rs b/crates/cli/src/server/config/load.rs
similarity index 100%
rename from src/server/config/load.rs
rename to crates/cli/src/server/config/load.rs
diff --git a/src/server/config/mod.rs b/crates/cli/src/server/config/mod.rs
similarity index 100%
rename from src/server/config/mod.rs
rename to crates/cli/src/server/config/mod.rs
diff --git a/src/server/config/tests.rs b/crates/cli/src/server/config/tests.rs
similarity index 91%
rename from src/server/config/tests.rs
rename to crates/cli/src/server/config/tests.rs
index 36b0b7f..4dbe9ca 100644
--- a/src/server/config/tests.rs
+++ b/crates/cli/src/server/config/tests.rs
@@ -163,13 +163,14 @@ fn gitdir_should_display_as_pathbuf() {
 // git.kemitix.net:kemitix/git-next
 // If the default push remote is something else, then this test will fail
 fn repo_details_find_default_push_remote_finds_correct_remote() -> Result<()> {
-    let cwd = std::env::current_dir().map_err(RepoValidationError::Io)?;
+    let cli_crate_dir = std::env::current_dir().map_err(RepoValidationError::Io)?;
+    let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent()));
     let mut repo_details = common::repo_details(
         1,
         ServerGeneration::new(),
         common::forge_details(1, ForgeType::MockForge),
         None,
-        GitDir::new(&cwd), // Server GitDir - should be ignored
+        GitDir::new(&root), // Server GitDir - should be ignored
     );
     repo_details.forge.hostname = Hostname("git.kemitix.net".to_string());
     repo_details.repo_path = RepoPath("kemitix/git-next".to_string());
@@ -188,13 +189,14 @@ fn repo_details_find_default_push_remote_finds_correct_remote() -> Result<()> {
 
 #[test]
 fn gitdir_validate_should_pass_a_valid_git_repo() -> Result<()> {
-    let cwd = std::env::current_dir().map_err(RepoValidationError::Io)?;
+    let cli_crate_dir = std::env::current_dir().map_err(RepoValidationError::Io)?;
+    let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent()));
     let mut repo_details = common::repo_details(
         1,
         ServerGeneration::new(),
         common::forge_details(1, ForgeType::MockForge),
         None,
-        GitDir::new(&cwd), // Server GitDir - should be ignored
+        GitDir::new(&root), // Server GitDir - should be ignored
     );
     repo_details.forge.hostname = Hostname("git.kemitix.net".to_string());
     repo_details.repo_path = RepoPath("kemitix/git-next".to_string());
@@ -207,13 +209,14 @@ fn gitdir_validate_should_pass_a_valid_git_repo() -> Result<()> {
 
 #[test]
 fn gitdir_validate_should_fail_a_git_repo_with_wrong_remote() -> Result<()> {
-    let_assert!(Ok(cwd) = std::env::current_dir().map_err(RepoValidationError::Io));
+    let_assert!(Ok(cli_crate_dir) = std::env::current_dir().map_err(RepoValidationError::Io));
+    let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent()));
     let mut repo_details = common::repo_details(
         1,
         ServerGeneration::new(),
         common::forge_details(1, ForgeType::MockForge),
         None,
-        GitDir::new(&cwd), // Server GitDir - should be ignored
+        GitDir::new(&root), // Server GitDir - should be ignored
     );
     repo_details.forge.hostname = Hostname("localhost".to_string());
     repo_details.repo_path = RepoPath("hello/world".to_string());
diff --git a/src/server/git/mod.rs b/crates/cli/src/server/git/mod.rs
similarity index 100%
rename from src/server/git/mod.rs
rename to crates/cli/src/server/git/mod.rs
diff --git a/src/server/git/reset.rs b/crates/cli/src/server/git/reset.rs
similarity index 100%
rename from src/server/git/reset.rs
rename to crates/cli/src/server/git/reset.rs
diff --git a/src/server/gitforge/errors.rs b/crates/cli/src/server/gitforge/errors.rs
similarity index 100%
rename from src/server/gitforge/errors.rs
rename to crates/cli/src/server/gitforge/errors.rs
diff --git a/src/server/gitforge/forgejo/branch/fetch.rs b/crates/cli/src/server/gitforge/forgejo/branch/fetch.rs
similarity index 100%
rename from src/server/gitforge/forgejo/branch/fetch.rs
rename to crates/cli/src/server/gitforge/forgejo/branch/fetch.rs
diff --git a/src/server/gitforge/forgejo/branch/get_all.rs b/crates/cli/src/server/gitforge/forgejo/branch/get_all.rs
similarity index 100%
rename from src/server/gitforge/forgejo/branch/get_all.rs
rename to crates/cli/src/server/gitforge/forgejo/branch/get_all.rs
diff --git a/src/server/gitforge/forgejo/branch/mod.rs b/crates/cli/src/server/gitforge/forgejo/branch/mod.rs
similarity index 100%
rename from src/server/gitforge/forgejo/branch/mod.rs
rename to crates/cli/src/server/gitforge/forgejo/branch/mod.rs
diff --git a/src/server/gitforge/forgejo/branch/validate_positions.rs b/crates/cli/src/server/gitforge/forgejo/branch/validate_positions.rs
similarity index 100%
rename from src/server/gitforge/forgejo/branch/validate_positions.rs
rename to crates/cli/src/server/gitforge/forgejo/branch/validate_positions.rs
diff --git a/src/server/gitforge/forgejo/file/mod.rs b/crates/cli/src/server/gitforge/forgejo/file/mod.rs
similarity index 100%
rename from src/server/gitforge/forgejo/file/mod.rs
rename to crates/cli/src/server/gitforge/forgejo/file/mod.rs
diff --git a/src/server/gitforge/forgejo/mod.rs b/crates/cli/src/server/gitforge/forgejo/mod.rs
similarity index 100%
rename from src/server/gitforge/forgejo/mod.rs
rename to crates/cli/src/server/gitforge/forgejo/mod.rs
diff --git a/src/server/gitforge/github.rs b/crates/cli/src/server/gitforge/github.rs
similarity index 100%
rename from src/server/gitforge/github.rs
rename to crates/cli/src/server/gitforge/github.rs
diff --git a/src/server/gitforge/mock_forge.rs b/crates/cli/src/server/gitforge/mock_forge.rs
similarity index 100%
rename from src/server/gitforge/mock_forge.rs
rename to crates/cli/src/server/gitforge/mock_forge.rs
diff --git a/src/server/gitforge/mod.rs b/crates/cli/src/server/gitforge/mod.rs
similarity index 100%
rename from src/server/gitforge/mod.rs
rename to crates/cli/src/server/gitforge/mod.rs
diff --git a/src/server/gitforge/tests/common.rs b/crates/cli/src/server/gitforge/tests/common.rs
similarity index 100%
rename from src/server/gitforge/tests/common.rs
rename to crates/cli/src/server/gitforge/tests/common.rs
diff --git a/src/server/gitforge/tests/data-forgejo-branches-get.json b/crates/cli/src/server/gitforge/tests/data-forgejo-branches-get.json
similarity index 100%
rename from src/server/gitforge/tests/data-forgejo-branches-get.json
rename to crates/cli/src/server/gitforge/tests/data-forgejo-branches-get.json
diff --git a/src/server/gitforge/tests/forgejo.rs b/crates/cli/src/server/gitforge/tests/forgejo.rs
similarity index 100%
rename from src/server/gitforge/tests/forgejo.rs
rename to crates/cli/src/server/gitforge/tests/forgejo.rs
diff --git a/src/server/gitforge/tests/github.rs b/crates/cli/src/server/gitforge/tests/github.rs
similarity index 100%
rename from src/server/gitforge/tests/github.rs
rename to crates/cli/src/server/gitforge/tests/github.rs
diff --git a/src/server/gitforge/tests/mod.rs b/crates/cli/src/server/gitforge/tests/mod.rs
similarity index 100%
rename from src/server/gitforge/tests/mod.rs
rename to crates/cli/src/server/gitforge/tests/mod.rs
diff --git a/src/server/gitforge/types.rs b/crates/cli/src/server/gitforge/types.rs
similarity index 100%
rename from src/server/gitforge/types.rs
rename to crates/cli/src/server/gitforge/types.rs
diff --git a/src/server/mod.rs b/crates/cli/src/server/mod.rs
similarity index 95%
rename from src/server/mod.rs
rename to crates/cli/src/server/mod.rs
index 1208f62..f829a20 100644
--- a/src/server/mod.rs
+++ b/crates/cli/src/server/mod.rs
@@ -33,7 +33,7 @@ pub fn init(fs: FileSystem) {
             file_name
         );
     } else {
-        match fs.file_write(&pathbuf, include_str!("../../server-default.toml")) {
+        match fs.file_write(&pathbuf, include_str!("../../../../server-default.toml")) {
             Ok(_) => println!("Created a default configuration file at {}", file_name),
             Err(e) => {
                 eprintln!("Failed to write to the configuration file: {}", e)
diff --git a/src/server/types.rs b/crates/cli/src/server/types.rs
similarity index 100%
rename from src/server/types.rs
rename to crates/cli/src/server/types.rs
diff --git a/justfile b/justfile
index 3d38cee..e9556ab 100644
--- a/justfile
+++ b/justfile
@@ -1,5 +1,6 @@
 install-hooks:
   @echo "Installing git hooks"
+  cargo install cc-cli
   git config core.hooksPath .git-hooks
 
 validate-dev-branch: