diff --git a/reactos/drivers/usb/cromwell/directory.xml b/reactos/drivers/usb/cromwell/directory.xml
deleted file mode 100644
index af5453d66b3..00000000000
--- a/reactos/drivers/usb/cromwell/directory.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<directory name="sys">
-	<xi:include href="sys/sys.xml" />
-</directory>
-<directory name="core">
-	<xi:include href="core/usbcore.xml" />
-</directory>
-<directory name="host">
-        <xi:include href="host/host.xml" />
-</directory>
-<directory name="hub">
-	<xi:include href="hub/hub.xml" />
-</directory>
-<directory name="uhci">
-        <xi:include href="uhci/uhci.xml" />
-</directory>
\ No newline at end of file
diff --git a/reactos/drivers/usb/directory.xml b/reactos/drivers/usb/directory.xml
index 73dfdb47c7d..cb1ec1c6392 100644
--- a/reactos/drivers/usb/directory.xml
+++ b/reactos/drivers/usb/directory.xml
@@ -1,15 +1,15 @@
-<directory name="cromwell">
-	<xi:include href="cromwell/directory.xml" />
-</directory>
-<!--directory name="miniport">
+<directory name="miniport">
 	<xi:include href="miniport/directory.xml" />
 </directory>
-<directory name="usbd">
+<!--directory name="usbd">
 	<xi:include href="usbd/usbd.xml" />
-</directory>
+</directory-->
 <directory name="usbhub">
 	<xi:include href="usbhub/usbhub.xml" />
 </directory>
 <directory name="usbport">
 	<xi:include href="usbport/usbport.xml" />
+</directory>
+<!--directory name="usbstor">
+	<xi:include href="usbstor/usbstor.xml" />
 </directory-->
diff --git a/reactos/drivers/usb/miniport/directory.xml b/reactos/drivers/usb/miniport/directory.xml
new file mode 100644
index 00000000000..2dc67f1c79e
--- /dev/null
+++ b/reactos/drivers/usb/miniport/directory.xml
@@ -0,0 +1,12 @@
+<directory name="sys">
+	<xi:include href="sys/sys.xml" />
+</directory>
+<!--directory name="usbehci">
+	<xi:include href="usbehci/usbehci.xml" />
+</directory-->
+<directory name="usbohci">
+	<xi:include href="usbohci/usbohci.xml" />
+</directory>
+<directory name="usbuhci">
+	<xi:include href="usbuhci/usbuhci.xml" />
+</directory>
diff --git a/reactos/drivers/usb/miniport/usbohci/host.xml b/reactos/drivers/usb/miniport/usbohci/usbohci.xml
similarity index 100%
rename from reactos/drivers/usb/miniport/usbohci/host.xml
rename to reactos/drivers/usb/miniport/usbohci/usbohci.xml
diff --git a/reactos/drivers/usb/miniport/usbuhci/uhci.xml b/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
similarity index 100%
rename from reactos/drivers/usb/miniport/usbuhci/uhci.xml
rename to reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
diff --git a/reactos/drivers/usb/usbhub/hub.xml b/reactos/drivers/usb/usbhub/usbhub.xml
similarity index 100%
rename from reactos/drivers/usb/usbhub/hub.xml
rename to reactos/drivers/usb/usbhub/usbhub.xml
diff --git a/reactos/drivers/usb/usbport/usbcore.xml b/reactos/drivers/usb/usbport/usbport.xml
similarity index 100%
rename from reactos/drivers/usb/usbport/usbcore.xml
rename to reactos/drivers/usb/usbport/usbport.xml