diff --git a/Cargo.toml b/Cargo.toml
index d601f9b..73701b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [workspace]
 members = [
-    "xenstore",
-    "xenevtchn",
-    "xencall",
-    "xenclient",
+    "xen/xenstore",
+    "xen/xenevtchn",
+    "xen/xencall",
+    "xen/xenclient",
     "hypha",
     "loopdev",
 ]
diff --git a/hypha/Cargo.toml b/hypha/Cargo.toml
index d0c479f..2d6477e 100644
--- a/hypha/Cargo.toml
+++ b/hypha/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 resolver = "2"
 
 [dependencies.xenclient]
-path = "../xenclient"
+path = "../xen/xenclient"
 
 [dependencies.loopdev]
 path = "../loopdev"
@@ -28,7 +28,7 @@ termion = "3.0.0"
 cli-tables = "0.2.1"
 
 [dependencies.xenstore]
-path = "../xenstore"
+path = "../xen/xenstore"
 
 [dependencies.clap]
 version = "4.4.18"
diff --git a/xencall/Cargo.toml b/xen/xencall/Cargo.toml
similarity index 100%
rename from xencall/Cargo.toml
rename to xen/xencall/Cargo.toml
diff --git a/xencall/examples/domain_create.rs b/xen/xencall/examples/domain_create.rs
similarity index 100%
rename from xencall/examples/domain_create.rs
rename to xen/xencall/examples/domain_create.rs
diff --git a/xencall/examples/domain_info.rs b/xen/xencall/examples/domain_info.rs
similarity index 100%
rename from xencall/examples/domain_info.rs
rename to xen/xencall/examples/domain_info.rs
diff --git a/xencall/examples/vcpu_context.rs b/xen/xencall/examples/vcpu_context.rs
similarity index 100%
rename from xencall/examples/vcpu_context.rs
rename to xen/xencall/examples/vcpu_context.rs
diff --git a/xencall/examples/version_capabilities.rs b/xen/xencall/examples/version_capabilities.rs
similarity index 100%
rename from xencall/examples/version_capabilities.rs
rename to xen/xencall/examples/version_capabilities.rs
diff --git a/xencall/src/lib.rs b/xen/xencall/src/lib.rs
similarity index 100%
rename from xencall/src/lib.rs
rename to xen/xencall/src/lib.rs
diff --git a/xencall/src/sys.rs b/xen/xencall/src/sys.rs
similarity index 100%
rename from xencall/src/sys.rs
rename to xen/xencall/src/sys.rs
diff --git a/xenclient/Cargo.toml b/xen/xenclient/Cargo.toml
similarity index 100%
rename from xenclient/Cargo.toml
rename to xen/xenclient/Cargo.toml
diff --git a/xenclient/examples/boot.rs b/xen/xenclient/examples/boot.rs
similarity index 100%
rename from xenclient/examples/boot.rs
rename to xen/xenclient/examples/boot.rs
diff --git a/xenclient/src/boot.rs b/xen/xenclient/src/boot.rs
similarity index 100%
rename from xenclient/src/boot.rs
rename to xen/xenclient/src/boot.rs
diff --git a/xenclient/src/elfloader.rs b/xen/xenclient/src/elfloader.rs
similarity index 100%
rename from xenclient/src/elfloader.rs
rename to xen/xenclient/src/elfloader.rs
diff --git a/xenclient/src/lib.rs b/xen/xenclient/src/lib.rs
similarity index 100%
rename from xenclient/src/lib.rs
rename to xen/xenclient/src/lib.rs
diff --git a/xenclient/src/mem.rs b/xen/xenclient/src/mem.rs
similarity index 100%
rename from xenclient/src/mem.rs
rename to xen/xenclient/src/mem.rs
diff --git a/xenclient/src/sys.rs b/xen/xenclient/src/sys.rs
similarity index 100%
rename from xenclient/src/sys.rs
rename to xen/xenclient/src/sys.rs
diff --git a/xenclient/src/x86.rs b/xen/xenclient/src/x86.rs
similarity index 100%
rename from xenclient/src/x86.rs
rename to xen/xenclient/src/x86.rs
diff --git a/xenevtchn/Cargo.toml b/xen/xenevtchn/Cargo.toml
similarity index 100%
rename from xenevtchn/Cargo.toml
rename to xen/xenevtchn/Cargo.toml
diff --git a/xenevtchn/examples/simple.rs b/xen/xenevtchn/examples/simple.rs
similarity index 100%
rename from xenevtchn/examples/simple.rs
rename to xen/xenevtchn/examples/simple.rs
diff --git a/xenevtchn/src/lib.rs b/xen/xenevtchn/src/lib.rs
similarity index 100%
rename from xenevtchn/src/lib.rs
rename to xen/xenevtchn/src/lib.rs
diff --git a/xenevtchn/src/sys.rs b/xen/xenevtchn/src/sys.rs
similarity index 100%
rename from xenevtchn/src/sys.rs
rename to xen/xenevtchn/src/sys.rs
diff --git a/xenstore/Cargo.toml b/xen/xenstore/Cargo.toml
similarity index 100%
rename from xenstore/Cargo.toml
rename to xen/xenstore/Cargo.toml
diff --git a/xenstore/examples/list.rs b/xen/xenstore/examples/list.rs
similarity index 100%
rename from xenstore/examples/list.rs
rename to xen/xenstore/examples/list.rs
diff --git a/xenstore/src/bus.rs b/xen/xenstore/src/bus.rs
similarity index 100%
rename from xenstore/src/bus.rs
rename to xen/xenstore/src/bus.rs
diff --git a/xenstore/src/client.rs b/xen/xenstore/src/client.rs
similarity index 100%
rename from xenstore/src/client.rs
rename to xen/xenstore/src/client.rs
diff --git a/xenstore/src/lib.rs b/xen/xenstore/src/lib.rs
similarity index 100%
rename from xenstore/src/lib.rs
rename to xen/xenstore/src/lib.rs
diff --git a/xenstore/src/sys.rs b/xen/xenstore/src/sys.rs
similarity index 100%
rename from xenstore/src/sys.rs
rename to xen/xenstore/src/sys.rs