diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 06a66bb..a13abeb 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -24,5 +24,10 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --verbose --release --all 
+          args: --verbose --release --all --tests
+      - name: Run tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --verbose --release --all
       
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index 4b0a909..1e7b3f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,21 +1,8 @@
-[package]
-name = "zecwallet-cli"
-version = "1.1.0"
-edition = "2018"
-
-[dependencies]
-rustyline = "5.0.2"
-clap = "2.33"
-log = "0.4"
-log4rs = "0.8.3"
-shellwords = "1.0.0"
-json = "0.12.0"
-http = "0.1"
-byteorder = "1"
-tiny-bip39 = "0.6.2"
-
-zecwalletlitelib = { path = "./lib/" }
-
+[workspace]
+members = [
+    "lib",
+    "cli",
+]
 
 [profile.release]
 debug = false
\ No newline at end of file
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
new file mode 100644
index 0000000..bb0e67c
--- /dev/null
+++ b/cli/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "zecwallet-cli"
+version = "1.1.0"
+edition = "2018"
+
+[dependencies]
+rustyline = "5.0.2"
+clap = "2.33"
+log = "0.4"
+log4rs = "0.8.3"
+shellwords = "1.0.0"
+json = "0.12.0"
+http = "0.1"
+byteorder = "1"
+tiny-bip39 = "0.6.2"
+
+zecwalletlitelib = { path = "../lib/" }
+
diff --git a/src/main.rs b/cli/src/main.rs
similarity index 100%
rename from src/main.rs
rename to cli/src/main.rs
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 459ff9e..c3c3688 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -72,6 +72,3 @@ tower-grpc-build = { git = "https://github.com/tower-rs/tower-grpc",  features =
 
 [dev-dependencies]
 tempdir = "0.3.7"
-
-[profile.release]
-debug = false
\ No newline at end of file