diff --git a/Cargo.toml b/Cargo.toml
index 1f0fe13..7ea01c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,7 @@
 [workspace]
 members = [
-    "fakesshd",
-    "ssh",
-    "sshdos",
-    "ssh-connection",
-    "ssh-protocol",
-    "ssh-transport",
-    "ssh-agent-client", "ssh-agentctl",
+    "lib/*",
+    "bin/*"
 ]
 resolver = "2"
 
diff --git a/fakesshd/Cargo.toml b/bin/fakesshd/Cargo.toml
similarity index 85%
rename from fakesshd/Cargo.toml
rename to bin/fakesshd/Cargo.toml
index 90bfed5..d72795c 100644
--- a/fakesshd/Cargo.toml
+++ b/bin/fakesshd/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 eyre = "0.6.12"
 hex-literal = "0.4.1"
 rand = "0.8.5"
-ssh-protocol = { path = "../ssh-protocol" }
+ssh-protocol = { path = "../../lib/ssh-protocol" }
 
 tokio = { version = "1.39.2", features = ["full"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
diff --git a/fakesshd/README.md b/bin/fakesshd/README.md
similarity index 100%
rename from fakesshd/README.md
rename to bin/fakesshd/README.md
diff --git a/fakesshd/smoke-test.sh b/bin/fakesshd/smoke-test.sh
similarity index 100%
rename from fakesshd/smoke-test.sh
rename to bin/fakesshd/smoke-test.sh
diff --git a/fakesshd/src/main.rs b/bin/fakesshd/src/main.rs
similarity index 100%
rename from fakesshd/src/main.rs
rename to bin/fakesshd/src/main.rs
diff --git a/ssh-agentctl/Cargo.toml b/bin/ssh-agentctl/Cargo.toml
similarity index 74%
rename from ssh-agentctl/Cargo.toml
rename to bin/ssh-agentctl/Cargo.toml
index 4eab105..0902a43 100644
--- a/ssh-agentctl/Cargo.toml
+++ b/bin/ssh-agentctl/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ssh-agent-client = { path = "../ssh-agent-client" } 
-ssh-transport = { path = "../ssh-transport" } 
+ssh-agent-client = { path = "../../lib/ssh-agent-client" } 
+ssh-transport = { path = "../../lib/ssh-transport" } 
 
 clap = { version = "4.5.16", features = ["derive"] }
 eyre = "0.6.12"
diff --git a/ssh-agentctl/src/main.rs b/bin/ssh-agentctl/src/main.rs
similarity index 100%
rename from ssh-agentctl/src/main.rs
rename to bin/ssh-agentctl/src/main.rs
diff --git a/ssh/Cargo.toml b/bin/ssh/Cargo.toml
similarity index 67%
rename from ssh/Cargo.toml
rename to bin/ssh/Cargo.toml
index e21388b..c8fb676 100644
--- a/ssh/Cargo.toml
+++ b/bin/ssh/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ssh-protocol = { path = "../ssh-protocol" }
-ssh-transport = { path = "../ssh-transport" }
-ssh-agent-client = { path = "../ssh-agent-client" }
+ssh-protocol = { path = "../../lib/ssh-protocol" }
+ssh-transport = { path = "../../lib/ssh-transport" }
+ssh-agent-client = { path = "../../lib/ssh-agent-client" }
 
 clap = { version = "4.5.15", features = ["derive"] }
 eyre = "0.6.12"
diff --git a/ssh/README.md b/bin/ssh/README.md
similarity index 100%
rename from ssh/README.md
rename to bin/ssh/README.md
diff --git a/ssh/src/main.rs b/bin/ssh/src/main.rs
similarity index 100%
rename from ssh/src/main.rs
rename to bin/ssh/src/main.rs
diff --git a/sshdos/Cargo.toml b/bin/sshdos/Cargo.toml
similarity index 77%
rename from sshdos/Cargo.toml
rename to bin/sshdos/Cargo.toml
index 5a97a83..3b53f19 100644
--- a/sshdos/Cargo.toml
+++ b/bin/sshdos/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ssh-protocol = { path = "../ssh-protocol" }
-ssh-transport = { path = "../ssh-transport" }
+ssh-protocol = { path = "../../lib/ssh-protocol" }
+ssh-transport = { path = "../../lib/ssh-transport" }
 clap = { version = "4.5.15", features = ["derive"] }
 eyre = "0.6.12"
 rand = "0.8.5"
diff --git a/sshdos/README.md b/bin/sshdos/README.md
similarity index 100%
rename from sshdos/README.md
rename to bin/sshdos/README.md
diff --git a/sshdos/src/main.rs b/bin/sshdos/src/main.rs
similarity index 100%
rename from sshdos/src/main.rs
rename to bin/sshdos/src/main.rs
diff --git a/ssh-agent-client/Cargo.toml b/lib/ssh-agent-client/Cargo.toml
similarity index 100%
rename from ssh-agent-client/Cargo.toml
rename to lib/ssh-agent-client/Cargo.toml
diff --git a/ssh-agent-client/README.md b/lib/ssh-agent-client/README.md
similarity index 100%
rename from ssh-agent-client/README.md
rename to lib/ssh-agent-client/README.md
diff --git a/ssh-agent-client/src/lib.rs b/lib/ssh-agent-client/src/lib.rs
similarity index 100%
rename from ssh-agent-client/src/lib.rs
rename to lib/ssh-agent-client/src/lib.rs
diff --git a/ssh-connection/Cargo.toml b/lib/ssh-connection/Cargo.toml
similarity index 100%
rename from ssh-connection/Cargo.toml
rename to lib/ssh-connection/Cargo.toml
diff --git a/ssh-connection/README.md b/lib/ssh-connection/README.md
similarity index 100%
rename from ssh-connection/README.md
rename to lib/ssh-connection/README.md
diff --git a/ssh-connection/src/lib.rs b/lib/ssh-connection/src/lib.rs
similarity index 100%
rename from ssh-connection/src/lib.rs
rename to lib/ssh-connection/src/lib.rs
diff --git a/ssh-protocol/Cargo.toml b/lib/ssh-protocol/Cargo.toml
similarity index 100%
rename from ssh-protocol/Cargo.toml
rename to lib/ssh-protocol/Cargo.toml
diff --git a/ssh-protocol/README.md b/lib/ssh-protocol/README.md
similarity index 100%
rename from ssh-protocol/README.md
rename to lib/ssh-protocol/README.md
diff --git a/ssh-protocol/src/lib.rs b/lib/ssh-protocol/src/lib.rs
similarity index 100%
rename from ssh-protocol/src/lib.rs
rename to lib/ssh-protocol/src/lib.rs
diff --git a/ssh-transport/Cargo.toml b/lib/ssh-transport/Cargo.toml
similarity index 100%
rename from ssh-transport/Cargo.toml
rename to lib/ssh-transport/Cargo.toml
diff --git a/ssh-transport/README.md b/lib/ssh-transport/README.md
similarity index 100%
rename from ssh-transport/README.md
rename to lib/ssh-transport/README.md
diff --git a/ssh-transport/src/client.rs b/lib/ssh-transport/src/client.rs
similarity index 100%
rename from ssh-transport/src/client.rs
rename to lib/ssh-transport/src/client.rs
diff --git a/ssh-transport/src/crypto.rs b/lib/ssh-transport/src/crypto.rs
similarity index 100%
rename from ssh-transport/src/crypto.rs
rename to lib/ssh-transport/src/crypto.rs
diff --git a/ssh-transport/src/crypto/encrypt.rs b/lib/ssh-transport/src/crypto/encrypt.rs
similarity index 100%
rename from ssh-transport/src/crypto/encrypt.rs
rename to lib/ssh-transport/src/crypto/encrypt.rs
diff --git a/ssh-transport/src/key.rs b/lib/ssh-transport/src/key.rs
similarity index 100%
rename from ssh-transport/src/key.rs
rename to lib/ssh-transport/src/key.rs
diff --git a/ssh-transport/src/lib.rs b/lib/ssh-transport/src/lib.rs
similarity index 100%
rename from ssh-transport/src/lib.rs
rename to lib/ssh-transport/src/lib.rs
diff --git a/ssh-transport/src/numbers.rs b/lib/ssh-transport/src/numbers.rs
similarity index 100%
rename from ssh-transport/src/numbers.rs
rename to lib/ssh-transport/src/numbers.rs
diff --git a/ssh-transport/src/packet.rs b/lib/ssh-transport/src/packet.rs
similarity index 100%
rename from ssh-transport/src/packet.rs
rename to lib/ssh-transport/src/packet.rs
diff --git a/ssh-transport/src/packet/ctors.rs b/lib/ssh-transport/src/packet/ctors.rs
similarity index 100%
rename from ssh-transport/src/packet/ctors.rs
rename to lib/ssh-transport/src/packet/ctors.rs
diff --git a/ssh-transport/src/parse.rs b/lib/ssh-transport/src/parse.rs
similarity index 100%
rename from ssh-transport/src/parse.rs
rename to lib/ssh-transport/src/parse.rs
diff --git a/ssh-transport/src/server.rs b/lib/ssh-transport/src/server.rs
similarity index 100%
rename from ssh-transport/src/server.rs
rename to lib/ssh-transport/src/server.rs