diff --git a/reactos/drivers/usb/cromwell/linux/asm/bitops.h b/reactos/drivers/usb/miniport/linux/asm/bitops.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/asm/bitops.h
rename to reactos/drivers/usb/miniport/linux/asm/bitops.h
diff --git a/reactos/drivers/usb/cromwell/linux/bitops.h b/reactos/drivers/usb/miniport/linux/bitops.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/bitops.h
rename to reactos/drivers/usb/miniport/linux/bitops.h
diff --git a/reactos/drivers/usb/cromwell/linux/boot.h b/reactos/drivers/usb/miniport/linux/boot.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/boot.h
rename to reactos/drivers/usb/miniport/linux/boot.h
diff --git a/reactos/drivers/usb/cromwell/linux/consts.h b/reactos/drivers/usb/miniport/linux/consts.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/consts.h
rename to reactos/drivers/usb/miniport/linux/consts.h
diff --git a/reactos/drivers/usb/cromwell/linux/cromwell_types.h b/reactos/drivers/usb/miniport/linux/cromwell_types.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/cromwell_types.h
rename to reactos/drivers/usb/miniport/linux/cromwell_types.h
diff --git a/reactos/drivers/usb/cromwell/linux/errno.h b/reactos/drivers/usb/miniport/linux/errno.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/errno.h
rename to reactos/drivers/usb/miniport/linux/errno.h
diff --git a/reactos/drivers/usb/cromwell/linux/linux_wrapper.h b/reactos/drivers/usb/miniport/linux/linux_wrapper.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/linux_wrapper.h
rename to reactos/drivers/usb/miniport/linux/linux_wrapper.h
diff --git a/reactos/drivers/usb/cromwell/linux/list.h b/reactos/drivers/usb/miniport/linux/list.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/list.h
rename to reactos/drivers/usb/miniport/linux/list.h
diff --git a/reactos/drivers/usb/cromwell/linux/pci_hal.c b/reactos/drivers/usb/miniport/linux/pci_hal.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/pci_hal.c
rename to reactos/drivers/usb/miniport/linux/pci_hal.c
diff --git a/reactos/drivers/usb/cromwell/linux/pci_ids.h b/reactos/drivers/usb/miniport/linux/pci_ids.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/pci_ids.h
rename to reactos/drivers/usb/miniport/linux/pci_ids.h
diff --git a/reactos/drivers/usb/cromwell/linux/usb.h b/reactos/drivers/usb/miniport/linux/usb.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/usb.h
rename to reactos/drivers/usb/miniport/linux/usb.h
diff --git a/reactos/drivers/usb/cromwell/linux/usb_ch9.h b/reactos/drivers/usb/miniport/linux/usb_ch9.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/linux/usb_ch9.h
rename to reactos/drivers/usb/miniport/linux/usb_ch9.h
diff --git a/reactos/drivers/usb/cromwell/sys/BootUSB.c b/reactos/drivers/usb/miniport/sys/BootUSB.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/BootUSB.c
rename to reactos/drivers/usb/miniport/sys/BootUSB.c
diff --git a/reactos/drivers/usb/cromwell/sys/linuxwrapper.c b/reactos/drivers/usb/miniport/sys/linuxwrapper.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/linuxwrapper.c
rename to reactos/drivers/usb/miniport/sys/linuxwrapper.c
diff --git a/reactos/drivers/usb/cromwell/sys/risefall.c b/reactos/drivers/usb/miniport/sys/risefall.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/risefall.c
rename to reactos/drivers/usb/miniport/sys/risefall.c
diff --git a/reactos/drivers/usb/cromwell/sys/ros_wrapper.c b/reactos/drivers/usb/miniport/sys/ros_wrapper.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/ros_wrapper.c
rename to reactos/drivers/usb/miniport/sys/ros_wrapper.c
diff --git a/reactos/drivers/usb/cromwell/sys/sys.xml b/reactos/drivers/usb/miniport/sys/sys.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/sys.xml
rename to reactos/drivers/usb/miniport/sys/sys.xml
diff --git a/reactos/drivers/usb/cromwell/sys/usbkey.c b/reactos/drivers/usb/miniport/sys/usbkey.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/usbkey.c
rename to reactos/drivers/usb/miniport/sys/usbkey.c
diff --git a/reactos/drivers/usb/cromwell/sys/usbwrapper.c b/reactos/drivers/usb/miniport/sys/usbwrapper.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/usbwrapper.c
rename to reactos/drivers/usb/miniport/sys/usbwrapper.c
diff --git a/reactos/drivers/usb/cromwell/sys/xpad.c b/reactos/drivers/usb/miniport/sys/xpad.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/xpad.c
rename to reactos/drivers/usb/miniport/sys/xpad.c
diff --git a/reactos/drivers/usb/cromwell/sys/xremote.c b/reactos/drivers/usb/miniport/sys/xremote.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/sys/xremote.c
rename to reactos/drivers/usb/miniport/sys/xremote.c
diff --git a/reactos/drivers/usb/cromwell/usb_wrapper.h b/reactos/drivers/usb/miniport/usb_wrapper.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usb_wrapper.h
rename to reactos/drivers/usb/miniport/usb_wrapper.h
diff --git a/reactos/drivers/usb/cromwell/usbohci/host.xml b/reactos/drivers/usb/miniport/usbohci/host.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/host.xml
rename to reactos/drivers/usb/miniport/usbohci/host.xml
diff --git a/reactos/drivers/usb/cromwell/usbohci/makefile.crom b/reactos/drivers/usb/miniport/usbohci/makefile.crom
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/makefile.crom
rename to reactos/drivers/usb/miniport/usbohci/makefile.crom
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci-dbg.c b/reactos/drivers/usb/miniport/usbohci/ohci-dbg.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci-dbg.c
rename to reactos/drivers/usb/miniport/usbohci/ohci-dbg.c
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci-hcd.c b/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci-hcd.c
rename to reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci-hub.c b/reactos/drivers/usb/miniport/usbohci/ohci-hub.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci-hub.c
rename to reactos/drivers/usb/miniport/usbohci/ohci-hub.c
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci-mem.c b/reactos/drivers/usb/miniport/usbohci/ohci-mem.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci-mem.c
rename to reactos/drivers/usb/miniport/usbohci/ohci-mem.c
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci-pci.c b/reactos/drivers/usb/miniport/usbohci/ohci-pci.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci-pci.c
rename to reactos/drivers/usb/miniport/usbohci/ohci-pci.c
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci-q.c b/reactos/drivers/usb/miniport/usbohci/ohci-q.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci-q.c
rename to reactos/drivers/usb/miniport/usbohci/ohci-q.c
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci.def b/reactos/drivers/usb/miniport/usbohci/ohci.def
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci.def
rename to reactos/drivers/usb/miniport/usbohci/ohci.def
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci.h b/reactos/drivers/usb/miniport/usbohci/ohci.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci.h
rename to reactos/drivers/usb/miniport/usbohci/ohci.h
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci.rc b/reactos/drivers/usb/miniport/usbohci/ohci.rc
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci.rc
rename to reactos/drivers/usb/miniport/usbohci/ohci.rc
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci_config.h b/reactos/drivers/usb/miniport/usbohci/ohci_config.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci_config.h
rename to reactos/drivers/usb/miniport/usbohci/ohci_config.h
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci_main.c b/reactos/drivers/usb/miniport/usbohci/ohci_main.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci_main.c
rename to reactos/drivers/usb/miniport/usbohci/ohci_main.c
diff --git a/reactos/drivers/usb/cromwell/usbohci/ohci_main.h b/reactos/drivers/usb/miniport/usbohci/ohci_main.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbohci/ohci_main.h
rename to reactos/drivers/usb/miniport/usbohci/ohci_main.h
diff --git a/reactos/drivers/usb/cromwell/usbuhci/cleanup.c b/reactos/drivers/usb/miniport/usbuhci/cleanup.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/cleanup.c
rename to reactos/drivers/usb/miniport/usbuhci/cleanup.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/close.c b/reactos/drivers/usb/miniport/usbuhci/close.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/close.c
rename to reactos/drivers/usb/miniport/usbuhci/close.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/create.c b/reactos/drivers/usb/miniport/usbuhci/create.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/create.c
rename to reactos/drivers/usb/miniport/usbuhci/create.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/fdo.c b/reactos/drivers/usb/miniport/usbuhci/fdo.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/fdo.c
rename to reactos/drivers/usb/miniport/usbuhci/fdo.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/misc.c b/reactos/drivers/usb/miniport/usbuhci/misc.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/misc.c
rename to reactos/drivers/usb/miniport/usbuhci/misc.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/pdo.c b/reactos/drivers/usb/miniport/usbuhci/pdo.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/pdo.c
rename to reactos/drivers/usb/miniport/usbuhci/pdo.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci-debug.c b/reactos/drivers/usb/miniport/usbuhci/uhci-debug.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci-debug.c
rename to reactos/drivers/usb/miniport/usbuhci/uhci-debug.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci-hcd.c b/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci-hcd.c
rename to reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci-hcd.h b/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci-hcd.h
rename to reactos/drivers/usb/miniport/usbuhci/uhci-hcd.h
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci-hub.c b/reactos/drivers/usb/miniport/usbuhci/uhci-hub.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci-hub.c
rename to reactos/drivers/usb/miniport/usbuhci/uhci-hub.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci.c b/reactos/drivers/usb/miniport/usbuhci/uhci.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci.c
rename to reactos/drivers/usb/miniport/usbuhci/uhci.c
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci.h b/reactos/drivers/usb/miniport/usbuhci/uhci.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci.h
rename to reactos/drivers/usb/miniport/usbuhci/uhci.h
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci.rc b/reactos/drivers/usb/miniport/usbuhci/uhci.rc
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci.rc
rename to reactos/drivers/usb/miniport/usbuhci/uhci.rc
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci.xml b/reactos/drivers/usb/miniport/usbuhci/uhci.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci.xml
rename to reactos/drivers/usb/miniport/usbuhci/uhci.xml
diff --git a/reactos/drivers/usb/cromwell/usbuhci/uhci_config.h b/reactos/drivers/usb/miniport/usbuhci/uhci_config.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbuhci/uhci_config.h
rename to reactos/drivers/usb/miniport/usbuhci/uhci_config.h
diff --git a/reactos/drivers/usb/cromwell/usbhub/createclose.c b/reactos/drivers/usb/usbhub/createclose.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbhub/createclose.c
rename to reactos/drivers/usb/usbhub/createclose.c
diff --git a/reactos/drivers/usb/cromwell/usbhub/fdo.c b/reactos/drivers/usb/usbhub/fdo.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbhub/fdo.c
rename to reactos/drivers/usb/usbhub/fdo.c
diff --git a/reactos/drivers/usb/cromwell/usbhub/hub.xml b/reactos/drivers/usb/usbhub/hub.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbhub/hub.xml
rename to reactos/drivers/usb/usbhub/hub.xml
diff --git a/reactos/drivers/usb/cromwell/usbhub/misc.c b/reactos/drivers/usb/usbhub/misc.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbhub/misc.c
rename to reactos/drivers/usb/usbhub/misc.c
diff --git a/reactos/drivers/usb/cromwell/usbhub/pdo.c b/reactos/drivers/usb/usbhub/pdo.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbhub/pdo.c
rename to reactos/drivers/usb/usbhub/pdo.c
diff --git a/reactos/drivers/usb/cromwell/usbhub/usbhub.c b/reactos/drivers/usb/usbhub/usbhub.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbhub/usbhub.c
rename to reactos/drivers/usb/usbhub/usbhub.c
diff --git a/reactos/drivers/usb/cromwell/usbhub/usbhub.h b/reactos/drivers/usb/usbhub/usbhub.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbhub/usbhub.h
rename to reactos/drivers/usb/usbhub/usbhub.h
diff --git a/reactos/drivers/usb/cromwell/usbhub/usbhub.rc b/reactos/drivers/usb/usbhub/usbhub.rc
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbhub/usbhub.rc
rename to reactos/drivers/usb/usbhub/usbhub.rc
diff --git a/reactos/drivers/usb/cromwell/usbport/buffer_simple.c b/reactos/drivers/usb/usbport/buffer_simple.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/buffer_simple.c
rename to reactos/drivers/usb/usbport/buffer_simple.c
diff --git a/reactos/drivers/usb/cromwell/usbport/config.c b/reactos/drivers/usb/usbport/config.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/config.c
rename to reactos/drivers/usb/usbport/config.c
diff --git a/reactos/drivers/usb/cromwell/usbport/core_drivers/usbkey.c b/reactos/drivers/usb/usbport/core_drivers/usbkey.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/core_drivers/usbkey.c
rename to reactos/drivers/usb/usbport/core_drivers/usbkey.c
diff --git a/reactos/drivers/usb/cromwell/usbport/core_drivers/usbmouse.c b/reactos/drivers/usb/usbport/core_drivers/usbmouse.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/core_drivers/usbmouse.c
rename to reactos/drivers/usb/usbport/core_drivers/usbmouse.c
diff --git a/reactos/drivers/usb/cromwell/usbport/hcd-pci.c b/reactos/drivers/usb/usbport/hcd-pci.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/hcd-pci.c
rename to reactos/drivers/usb/usbport/hcd-pci.c
diff --git a/reactos/drivers/usb/cromwell/usbport/hcd.c b/reactos/drivers/usb/usbport/hcd.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/hcd.c
rename to reactos/drivers/usb/usbport/hcd.c
diff --git a/reactos/drivers/usb/cromwell/usbport/hcd.h b/reactos/drivers/usb/usbport/hcd.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/hcd.h
rename to reactos/drivers/usb/usbport/hcd.h
diff --git a/reactos/drivers/usb/cromwell/usbport/hub.c b/reactos/drivers/usb/usbport/hub.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/hub.c
rename to reactos/drivers/usb/usbport/hub.c
diff --git a/reactos/drivers/usb/cromwell/usbport/hub.h b/reactos/drivers/usb/usbport/hub.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/hub.h
rename to reactos/drivers/usb/usbport/hub.h
diff --git a/reactos/drivers/usb/cromwell/usbport/makefile.crom b/reactos/drivers/usb/usbport/makefile.crom
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/makefile.crom
rename to reactos/drivers/usb/usbport/makefile.crom
diff --git a/reactos/drivers/usb/cromwell/usbport/message.c b/reactos/drivers/usb/usbport/message.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/message.c
rename to reactos/drivers/usb/usbport/message.c
diff --git a/reactos/drivers/usb/cromwell/usbport/urb.c b/reactos/drivers/usb/usbport/urb.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/urb.c
rename to reactos/drivers/usb/usbport/urb.c
diff --git a/reactos/drivers/usb/cromwell/usbport/usb-debug.c b/reactos/drivers/usb/usbport/usb-debug.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/usb-debug.c
rename to reactos/drivers/usb/usbport/usb-debug.c
diff --git a/reactos/drivers/usb/cromwell/usbport/usb.c b/reactos/drivers/usb/usbport/usb.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/usb.c
rename to reactos/drivers/usb/usbport/usb.c
diff --git a/reactos/drivers/usb/cromwell/usbport/usb.h b/reactos/drivers/usb/usbport/usb.h
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/usb.h
rename to reactos/drivers/usb/usbport/usb.h
diff --git a/reactos/drivers/usb/cromwell/usbport/usbcore.c b/reactos/drivers/usb/usbport/usbcore.c
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/usbcore.c
rename to reactos/drivers/usb/usbport/usbcore.c
diff --git a/reactos/drivers/usb/cromwell/usbport/usbcore.def b/reactos/drivers/usb/usbport/usbcore.def
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/usbcore.def
rename to reactos/drivers/usb/usbport/usbcore.def
diff --git a/reactos/drivers/usb/cromwell/usbport/usbcore.rc b/reactos/drivers/usb/usbport/usbcore.rc
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/usbcore.rc
rename to reactos/drivers/usb/usbport/usbcore.rc
diff --git a/reactos/drivers/usb/cromwell/usbport/usbcore.xml b/reactos/drivers/usb/usbport/usbcore.xml
similarity index 100%
rename from reactos/drivers/usb/cromwell/usbport/usbcore.xml
rename to reactos/drivers/usb/usbport/usbcore.xml