diff --git a/Cargo.lock b/Cargo.lock
index df0d63b..fba52f5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,6 +11,17 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 [[package]]
 name = "trictrac"
 version = "0.1.0"
+
+[[package]]
+name = "trictrac-client"
+version = "0.1.0"
+dependencies = [
+ "pico-args",
+]
+
+[[package]]
+name = "trictrac-server"
+version = "0.1.0"
 dependencies = [
  "pico-args",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index af72503..809bf25 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,8 @@
-[package]
-name = "trictrac"
-version = "0.1.0"
-edition = "2021"
+[workspace]
+resolver="2"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-pico-args = "0.5.0"
+members = [
+  "client",
+  "server",
+  "store"
+]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 5514c9a..93e39bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 shell:
-	# devenv shell
-	nix develop
+	devenv shell
+	# nix develop
 startserver:
-	cargo run --bin=server
+	cargo run --bin=trictrac-server
 startclient1:
-	cargo run --bin=client Titi
+	cargo run --bin=trictrac-client Titi
 startclient2:
-	cargo run --bin=client Tutu
+	cargo run --bin=trictrac-client Tutu
diff --git a/client/Cargo.toml b/client/Cargo.toml
new file mode 100644
index 0000000..f994f66
--- /dev/null
+++ b/client/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "trictrac-client"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+pico-args = "0.5.0"
diff --git a/src/main.rs b/client/src/main.rs
similarity index 100%
rename from src/main.rs
rename to client/src/main.rs
diff --git a/server/Cargo.toml b/server/Cargo.toml
new file mode 100644
index 0000000..31a2837
--- /dev/null
+++ b/server/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "trictrac-server"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+pico-args = "0.5.0"
diff --git a/server/src/main.rs b/server/src/main.rs
new file mode 100644
index 0000000..e7a11a9
--- /dev/null
+++ b/server/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/store/Cargo.toml b/store/Cargo.toml
new file mode 100644
index 0000000..3d73498
--- /dev/null
+++ b/store/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "trictrac"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/store/src/lib.rs b/store/src/lib.rs
new file mode 100644
index 0000000..e69de29