diff --git a/Cargo.toml b/Cargo.toml
index 4fb623614e..067278f84d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,12 +9,14 @@ members = [
     "pcid-spawner",
     "rtcd",
     "vboxd",
-    "xhcid",
-    "usbctl",
-    "usbhubd",
     "inputd",
     "virtio-core",
 
+    "usb/xhcid",
+    "usb/usbctl",
+    "usb/usbhubd",
+
+
     "audio/ac97d",
     "audio/ihdad",
     "audio/sb16d",
diff --git a/input/usbhidd/Cargo.toml b/input/usbhidd/Cargo.toml
index 0a3df4d43c..0a98084810 100644
--- a/input/usbhidd/Cargo.toml
+++ b/input/usbhidd/Cargo.toml
@@ -13,7 +13,7 @@ log = "0.4"
 orbclient = "0.3.47"
 redox_syscall = "0.5"
 rehid = { git = "https://gitlab.redox-os.org/redox-os/rehid.git" }
-xhcid = { path = "../../xhcid" }
+xhcid = { path = "../../usb/xhcid" }
 
 common = { path = "../../common" }
 inputd = { path = "../../inputd" }
diff --git a/storage/usbscsid/Cargo.toml b/storage/usbscsid/Cargo.toml
index 5e862aa06c..d7b148ee47 100644
--- a/storage/usbscsid/Cargo.toml
+++ b/storage/usbscsid/Cargo.toml
@@ -16,4 +16,4 @@ redox-daemon = "0.1"
 redox_event = "0.4"
 redox_syscall = { version = "0.5", features = ["std"] }
 thiserror = "1"
-xhcid = { path = "../../xhcid" }
+xhcid = { path = "../../usb/xhcid" }