diff --git a/reactos/drivers/usb/cromwell/hub/createclose.c b/reactos/drivers/usb/cromwell/usbhub/createclose.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/hub/createclose.c
rename to reactos/drivers/usb/cromwell/usbhub/createclose.c
diff --git a/reactos/drivers/usb/cromwell/hub/fdo.c b/reactos/drivers/usb/cromwell/usbhub/fdo.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/hub/fdo.c
rename to reactos/drivers/usb/cromwell/usbhub/fdo.c
diff --git a/reactos/drivers/usb/cromwell/hub/hub.xml b/reactos/drivers/usb/cromwell/usbhub/hub.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/hub/hub.xml
rename to reactos/drivers/usb/cromwell/usbhub/hub.xml
diff --git a/reactos/drivers/usb/cromwell/hub/misc.c b/reactos/drivers/usb/cromwell/usbhub/misc.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/hub/misc.c
rename to reactos/drivers/usb/cromwell/usbhub/misc.c
diff --git a/reactos/drivers/usb/cromwell/hub/pdo.c b/reactos/drivers/usb/cromwell/usbhub/pdo.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/hub/pdo.c
rename to reactos/drivers/usb/cromwell/usbhub/pdo.c
diff --git a/reactos/drivers/usb/cromwell/hub/usbhub.c b/reactos/drivers/usb/cromwell/usbhub/usbhub.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/hub/usbhub.c
rename to reactos/drivers/usb/cromwell/usbhub/usbhub.c
diff --git a/reactos/drivers/usb/cromwell/hub/usbhub.h b/reactos/drivers/usb/cromwell/usbhub/usbhub.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/hub/usbhub.h
rename to reactos/drivers/usb/cromwell/usbhub/usbhub.h
diff --git a/reactos/drivers/usb/cromwell/hub/usbhub.rc b/reactos/drivers/usb/cromwell/usbhub/usbhub.rc
similarity index 100%
rename from reactos/drivers/usb/cromwell/hub/usbhub.rc
rename to reactos/drivers/usb/cromwell/usbhub/usbhub.rc
diff --git a/reactos/drivers/usb/cromwell/host/host.xml b/reactos/drivers/usb/cromwell/usbohci/host.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/host.xml
rename to reactos/drivers/usb/cromwell/usbohci/host.xml
diff --git a/reactos/drivers/usb/cromwell/host/makefile.crom b/reactos/drivers/usb/cromwell/usbohci/makefile.crom
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/makefile.crom
rename to reactos/drivers/usb/cromwell/usbohci/makefile.crom
diff --git a/reactos/drivers/usb/cromwell/host/ohci-dbg.c b/reactos/drivers/usb/cromwell/usbohci/ohci-dbg.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci-dbg.c
rename to reactos/drivers/usb/cromwell/usbohci/ohci-dbg.c
diff --git a/reactos/drivers/usb/cromwell/host/ohci-hcd.c b/reactos/drivers/usb/cromwell/usbohci/ohci-hcd.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci-hcd.c
rename to reactos/drivers/usb/cromwell/usbohci/ohci-hcd.c
diff --git a/reactos/drivers/usb/cromwell/host/ohci-hub.c b/reactos/drivers/usb/cromwell/usbohci/ohci-hub.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci-hub.c
rename to reactos/drivers/usb/cromwell/usbohci/ohci-hub.c
diff --git a/reactos/drivers/usb/cromwell/host/ohci-mem.c b/reactos/drivers/usb/cromwell/usbohci/ohci-mem.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci-mem.c
rename to reactos/drivers/usb/cromwell/usbohci/ohci-mem.c
diff --git a/reactos/drivers/usb/cromwell/host/ohci-pci.c b/reactos/drivers/usb/cromwell/usbohci/ohci-pci.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci-pci.c
rename to reactos/drivers/usb/cromwell/usbohci/ohci-pci.c
diff --git a/reactos/drivers/usb/cromwell/host/ohci-q.c b/reactos/drivers/usb/cromwell/usbohci/ohci-q.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci-q.c
rename to reactos/drivers/usb/cromwell/usbohci/ohci-q.c
diff --git a/reactos/drivers/usb/cromwell/host/ohci.def b/reactos/drivers/usb/cromwell/usbohci/ohci.def
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci.def
rename to reactos/drivers/usb/cromwell/usbohci/ohci.def
diff --git a/reactos/drivers/usb/cromwell/host/ohci.h b/reactos/drivers/usb/cromwell/usbohci/ohci.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci.h
rename to reactos/drivers/usb/cromwell/usbohci/ohci.h
diff --git a/reactos/drivers/usb/cromwell/host/ohci.rc b/reactos/drivers/usb/cromwell/usbohci/ohci.rc
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci.rc
rename to reactos/drivers/usb/cromwell/usbohci/ohci.rc
diff --git a/reactos/drivers/usb/cromwell/host/ohci_config.h b/reactos/drivers/usb/cromwell/usbohci/ohci_config.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci_config.h
rename to reactos/drivers/usb/cromwell/usbohci/ohci_config.h
diff --git a/reactos/drivers/usb/cromwell/host/ohci_main.c b/reactos/drivers/usb/cromwell/usbohci/ohci_main.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci_main.c
rename to reactos/drivers/usb/cromwell/usbohci/ohci_main.c
diff --git a/reactos/drivers/usb/cromwell/host/ohci_main.h b/reactos/drivers/usb/cromwell/usbohci/ohci_main.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/host/ohci_main.h
rename to reactos/drivers/usb/cromwell/usbohci/ohci_main.h
diff --git a/reactos/drivers/usb/cromwell/core/buffer_simple.c b/reactos/drivers/usb/cromwell/usbport/buffer_simple.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/buffer_simple.c
rename to reactos/drivers/usb/cromwell/usbport/buffer_simple.c
diff --git a/reactos/drivers/usb/cromwell/core/config.c b/reactos/drivers/usb/cromwell/usbport/config.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/config.c
rename to reactos/drivers/usb/cromwell/usbport/config.c
diff --git a/reactos/drivers/usb/cromwell/core/core_drivers/usbkey.c b/reactos/drivers/usb/cromwell/usbport/core_drivers/usbkey.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/core_drivers/usbkey.c
rename to reactos/drivers/usb/cromwell/usbport/core_drivers/usbkey.c
diff --git a/reactos/drivers/usb/cromwell/core/core_drivers/usbmouse.c b/reactos/drivers/usb/cromwell/usbport/core_drivers/usbmouse.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/core_drivers/usbmouse.c
rename to reactos/drivers/usb/cromwell/usbport/core_drivers/usbmouse.c
diff --git a/reactos/drivers/usb/cromwell/core/hcd-pci.c b/reactos/drivers/usb/cromwell/usbport/hcd-pci.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/hcd-pci.c
rename to reactos/drivers/usb/cromwell/usbport/hcd-pci.c
diff --git a/reactos/drivers/usb/cromwell/core/hcd.c b/reactos/drivers/usb/cromwell/usbport/hcd.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/hcd.c
rename to reactos/drivers/usb/cromwell/usbport/hcd.c
diff --git a/reactos/drivers/usb/cromwell/core/hcd.h b/reactos/drivers/usb/cromwell/usbport/hcd.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/hcd.h
rename to reactos/drivers/usb/cromwell/usbport/hcd.h
diff --git a/reactos/drivers/usb/cromwell/core/hub.c b/reactos/drivers/usb/cromwell/usbport/hub.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/hub.c
rename to reactos/drivers/usb/cromwell/usbport/hub.c
diff --git a/reactos/drivers/usb/cromwell/core/hub.h b/reactos/drivers/usb/cromwell/usbport/hub.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/hub.h
rename to reactos/drivers/usb/cromwell/usbport/hub.h
diff --git a/reactos/drivers/usb/cromwell/core/makefile.crom b/reactos/drivers/usb/cromwell/usbport/makefile.crom
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/makefile.crom
rename to reactos/drivers/usb/cromwell/usbport/makefile.crom
diff --git a/reactos/drivers/usb/cromwell/core/message.c b/reactos/drivers/usb/cromwell/usbport/message.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/message.c
rename to reactos/drivers/usb/cromwell/usbport/message.c
diff --git a/reactos/drivers/usb/cromwell/core/urb.c b/reactos/drivers/usb/cromwell/usbport/urb.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/urb.c
rename to reactos/drivers/usb/cromwell/usbport/urb.c
diff --git a/reactos/drivers/usb/cromwell/core/usb-debug.c b/reactos/drivers/usb/cromwell/usbport/usb-debug.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/usb-debug.c
rename to reactos/drivers/usb/cromwell/usbport/usb-debug.c
diff --git a/reactos/drivers/usb/cromwell/core/usb.c b/reactos/drivers/usb/cromwell/usbport/usb.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/usb.c
rename to reactos/drivers/usb/cromwell/usbport/usb.c
diff --git a/reactos/drivers/usb/cromwell/core/usb.h b/reactos/drivers/usb/cromwell/usbport/usb.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/usb.h
rename to reactos/drivers/usb/cromwell/usbport/usb.h
diff --git a/reactos/drivers/usb/cromwell/core/usbcore.c b/reactos/drivers/usb/cromwell/usbport/usbcore.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/usbcore.c
rename to reactos/drivers/usb/cromwell/usbport/usbcore.c
diff --git a/reactos/drivers/usb/cromwell/core/usbcore.def b/reactos/drivers/usb/cromwell/usbport/usbcore.def
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/usbcore.def
rename to reactos/drivers/usb/cromwell/usbport/usbcore.def
diff --git a/reactos/drivers/usb/cromwell/core/usbcore.rc b/reactos/drivers/usb/cromwell/usbport/usbcore.rc
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/usbcore.rc
rename to reactos/drivers/usb/cromwell/usbport/usbcore.rc
diff --git a/reactos/drivers/usb/cromwell/core/usbcore.xml b/reactos/drivers/usb/cromwell/usbport/usbcore.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/core/usbcore.xml
rename to reactos/drivers/usb/cromwell/usbport/usbcore.xml
diff --git a/reactos/drivers/usb/cromwell/uhci/cleanup.c b/reactos/drivers/usb/cromwell/usbuhci/cleanup.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/cleanup.c
rename to reactos/drivers/usb/cromwell/usbuhci/cleanup.c
diff --git a/reactos/drivers/usb/cromwell/uhci/close.c b/reactos/drivers/usb/cromwell/usbuhci/close.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/close.c
rename to reactos/drivers/usb/cromwell/usbuhci/close.c
diff --git a/reactos/drivers/usb/cromwell/uhci/create.c b/reactos/drivers/usb/cromwell/usbuhci/create.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/create.c
rename to reactos/drivers/usb/cromwell/usbuhci/create.c
diff --git a/reactos/drivers/usb/cromwell/uhci/fdo.c b/reactos/drivers/usb/cromwell/usbuhci/fdo.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/fdo.c
rename to reactos/drivers/usb/cromwell/usbuhci/fdo.c
diff --git a/reactos/drivers/usb/cromwell/uhci/misc.c b/reactos/drivers/usb/cromwell/usbuhci/misc.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/misc.c
rename to reactos/drivers/usb/cromwell/usbuhci/misc.c
diff --git a/reactos/drivers/usb/cromwell/uhci/pdo.c b/reactos/drivers/usb/cromwell/usbuhci/pdo.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/pdo.c
rename to reactos/drivers/usb/cromwell/usbuhci/pdo.c
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci-debug.c b/reactos/drivers/usb/cromwell/usbuhci/uhci-debug.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci-debug.c
rename to reactos/drivers/usb/cromwell/usbuhci/uhci-debug.c
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c b/reactos/drivers/usb/cromwell/usbuhci/uhci-hcd.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci-hcd.c
rename to reactos/drivers/usb/cromwell/usbuhci/uhci-hcd.c
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci-hcd.h b/reactos/drivers/usb/cromwell/usbuhci/uhci-hcd.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci-hcd.h
rename to reactos/drivers/usb/cromwell/usbuhci/uhci-hcd.h
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci-hub.c b/reactos/drivers/usb/cromwell/usbuhci/uhci-hub.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci-hub.c
rename to reactos/drivers/usb/cromwell/usbuhci/uhci-hub.c
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci.c b/reactos/drivers/usb/cromwell/usbuhci/uhci.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci.c
rename to reactos/drivers/usb/cromwell/usbuhci/uhci.c
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci.h b/reactos/drivers/usb/cromwell/usbuhci/uhci.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci.h
rename to reactos/drivers/usb/cromwell/usbuhci/uhci.h
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci.rc b/reactos/drivers/usb/cromwell/usbuhci/uhci.rc
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci.rc
rename to reactos/drivers/usb/cromwell/usbuhci/uhci.rc
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci.xml b/reactos/drivers/usb/cromwell/usbuhci/uhci.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci.xml
rename to reactos/drivers/usb/cromwell/usbuhci/uhci.xml
diff --git a/reactos/drivers/usb/cromwell/uhci/uhci_config.h b/reactos/drivers/usb/cromwell/usbuhci/uhci_config.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/uhci/uhci_config.h
rename to reactos/drivers/usb/cromwell/usbuhci/uhci_config.h