diff --git a/usbctl/.gitignore b/usb/usbctl/.gitignore
similarity index 100%
rename from usbctl/.gitignore
rename to usb/usbctl/.gitignore
diff --git a/usbctl/Cargo.toml b/usb/usbctl/Cargo.toml
similarity index 100%
rename from usbctl/Cargo.toml
rename to usb/usbctl/Cargo.toml
diff --git a/usbctl/src/main.rs b/usb/usbctl/src/main.rs
similarity index 100%
rename from usbctl/src/main.rs
rename to usb/usbctl/src/main.rs
diff --git a/usbhubd/.gitignore b/usb/usbhubd/.gitignore
similarity index 100%
rename from usbhubd/.gitignore
rename to usb/usbhubd/.gitignore
diff --git a/usbhubd/Cargo.toml b/usb/usbhubd/Cargo.toml
similarity index 100%
rename from usbhubd/Cargo.toml
rename to usb/usbhubd/Cargo.toml
diff --git a/usbhubd/src/main.rs b/usb/usbhubd/src/main.rs
similarity index 100%
rename from usbhubd/src/main.rs
rename to usb/usbhubd/src/main.rs
diff --git a/xhcid/.gitignore b/usb/xhcid/.gitignore
similarity index 100%
rename from xhcid/.gitignore
rename to usb/xhcid/.gitignore
diff --git a/xhcid/Cargo.toml b/usb/xhcid/Cargo.toml
similarity index 100%
rename from xhcid/Cargo.toml
rename to usb/xhcid/Cargo.toml
diff --git a/xhcid/config.toml b/usb/xhcid/config.toml
similarity index 100%
rename from xhcid/config.toml
rename to usb/xhcid/config.toml
diff --git a/xhcid/drivers.toml b/usb/xhcid/drivers.toml
similarity index 100%
rename from xhcid/drivers.toml
rename to usb/xhcid/drivers.toml
diff --git a/xhcid/src/driver_interface.rs b/usb/xhcid/src/driver_interface.rs
similarity index 100%
rename from xhcid/src/driver_interface.rs
rename to usb/xhcid/src/driver_interface.rs
diff --git a/xhcid/src/lib.rs b/usb/xhcid/src/lib.rs
similarity index 100%
rename from xhcid/src/lib.rs
rename to usb/xhcid/src/lib.rs
diff --git a/xhcid/src/main.rs b/usb/xhcid/src/main.rs
similarity index 100%
rename from xhcid/src/main.rs
rename to usb/xhcid/src/main.rs
diff --git a/xhcid/src/usb/bos.rs b/usb/xhcid/src/usb/bos.rs
similarity index 100%
rename from xhcid/src/usb/bos.rs
rename to usb/xhcid/src/usb/bos.rs
diff --git a/xhcid/src/usb/config.rs b/usb/xhcid/src/usb/config.rs
similarity index 100%
rename from xhcid/src/usb/config.rs
rename to usb/xhcid/src/usb/config.rs
diff --git a/xhcid/src/usb/device.rs b/usb/xhcid/src/usb/device.rs
similarity index 100%
rename from xhcid/src/usb/device.rs
rename to usb/xhcid/src/usb/device.rs
diff --git a/xhcid/src/usb/endpoint.rs b/usb/xhcid/src/usb/endpoint.rs
similarity index 100%
rename from xhcid/src/usb/endpoint.rs
rename to usb/xhcid/src/usb/endpoint.rs
diff --git a/xhcid/src/usb/hub.rs b/usb/xhcid/src/usb/hub.rs
similarity index 100%
rename from xhcid/src/usb/hub.rs
rename to usb/xhcid/src/usb/hub.rs
diff --git a/xhcid/src/usb/interface.rs b/usb/xhcid/src/usb/interface.rs
similarity index 100%
rename from xhcid/src/usb/interface.rs
rename to usb/xhcid/src/usb/interface.rs
diff --git a/xhcid/src/usb/mod.rs b/usb/xhcid/src/usb/mod.rs
similarity index 100%
rename from xhcid/src/usb/mod.rs
rename to usb/xhcid/src/usb/mod.rs
diff --git a/xhcid/src/usb/setup.rs b/usb/xhcid/src/usb/setup.rs
similarity index 100%
rename from xhcid/src/usb/setup.rs
rename to usb/xhcid/src/usb/setup.rs
diff --git a/xhcid/src/xhci/capability.rs b/usb/xhcid/src/xhci/capability.rs
similarity index 100%
rename from xhcid/src/xhci/capability.rs
rename to usb/xhcid/src/xhci/capability.rs
diff --git a/xhcid/src/xhci/context.rs b/usb/xhcid/src/xhci/context.rs
similarity index 100%
rename from xhcid/src/xhci/context.rs
rename to usb/xhcid/src/xhci/context.rs
diff --git a/xhcid/src/xhci/device_enumerator.rs b/usb/xhcid/src/xhci/device_enumerator.rs
similarity index 100%
rename from xhcid/src/xhci/device_enumerator.rs
rename to usb/xhcid/src/xhci/device_enumerator.rs
diff --git a/xhcid/src/xhci/doorbell.rs b/usb/xhcid/src/xhci/doorbell.rs
similarity index 100%
rename from xhcid/src/xhci/doorbell.rs
rename to usb/xhcid/src/xhci/doorbell.rs
diff --git a/xhcid/src/xhci/event.rs b/usb/xhcid/src/xhci/event.rs
similarity index 100%
rename from xhcid/src/xhci/event.rs
rename to usb/xhcid/src/xhci/event.rs
diff --git a/xhcid/src/xhci/extended.rs b/usb/xhcid/src/xhci/extended.rs
similarity index 100%
rename from xhcid/src/xhci/extended.rs
rename to usb/xhcid/src/xhci/extended.rs
diff --git a/xhcid/src/xhci/irq_reactor.rs b/usb/xhcid/src/xhci/irq_reactor.rs
similarity index 100%
rename from xhcid/src/xhci/irq_reactor.rs
rename to usb/xhcid/src/xhci/irq_reactor.rs
diff --git a/xhcid/src/xhci/mod.rs b/usb/xhcid/src/xhci/mod.rs
similarity index 100%
rename from xhcid/src/xhci/mod.rs
rename to usb/xhcid/src/xhci/mod.rs
diff --git a/xhcid/src/xhci/operational.rs b/usb/xhcid/src/xhci/operational.rs
similarity index 100%
rename from xhcid/src/xhci/operational.rs
rename to usb/xhcid/src/xhci/operational.rs
diff --git a/xhcid/src/xhci/port.rs b/usb/xhcid/src/xhci/port.rs
similarity index 100%
rename from xhcid/src/xhci/port.rs
rename to usb/xhcid/src/xhci/port.rs
diff --git a/xhcid/src/xhci/ring.rs b/usb/xhcid/src/xhci/ring.rs
similarity index 100%
rename from xhcid/src/xhci/ring.rs
rename to usb/xhcid/src/xhci/ring.rs
diff --git a/xhcid/src/xhci/runtime.rs b/usb/xhcid/src/xhci/runtime.rs
similarity index 100%
rename from xhcid/src/xhci/runtime.rs
rename to usb/xhcid/src/xhci/runtime.rs
diff --git a/xhcid/src/xhci/scheme.rs b/usb/xhcid/src/xhci/scheme.rs
similarity index 100%
rename from xhcid/src/xhci/scheme.rs
rename to usb/xhcid/src/xhci/scheme.rs
diff --git a/xhcid/src/xhci/trb.rs b/usb/xhcid/src/xhci/trb.rs
similarity index 100%
rename from xhcid/src/xhci/trb.rs
rename to usb/xhcid/src/xhci/trb.rs