diff --git a/reactos/drivers/base/directory.xml b/reactos/drivers/base/directory.xml
index 42b614ee2f7..131556bea77 100644
--- a/reactos/drivers/base/directory.xml
+++ b/reactos/drivers/base/directory.xml
@@ -13,9 +13,6 @@
 <directory name="debugout">
 	<xi:include href="debugout/debugout.xml" />
 </directory>
-<directory name="mpu401">
-	<xi:include href="mpu401/mpu401.xml" />
-</directory>
 <directory name="null">
 	<xi:include href="null/null.xml" />
 </directory>
@@ -28,9 +25,3 @@
 <directory name="serial">
 	<xi:include href="serial/serial.xml" />
 </directory>
-<directory name="sndblst">
-	<xi:include href="sndblst/sndblst.xml" />
-</directory>
-<directory name="sound">
-	<xi:include href="sound/sound.xml" />
-</directory>
diff --git a/reactos/drivers/directory.xml b/reactos/drivers/drivers.rbuild
similarity index 67%
rename from reactos/drivers/directory.xml
rename to reactos/drivers/drivers.rbuild
index 2240390bb9f..62c701ad06c 100644
--- a/reactos/drivers/directory.xml
+++ b/reactos/drivers/drivers.rbuild
@@ -1,12 +1,12 @@
 <group>
+<directory name="base">
+	<xi:include href="base/directory.xml" />
+</directory>
 <directory name="bus">
 	<xi:include href="bus/directory.xml" />
 </directory>
-<directory name="dd">
-	<xi:include href="dd/directory.xml" />
-</directory>
-<directory name="fs">
-	<xi:include href="fs/directory.xml" />
+<directory name="filesystems">
+	<xi:include href="filesystems/directory.xml" />
 </directory>
 <directory name="input">
 	<xi:include href="input/directory.xml" />
@@ -14,19 +14,22 @@
 <directory name="lib">
 	<xi:include href="lib/directory.xml" />
 </directory>
-<directory name="net">
-	<xi:include href="net/directory.xml" />
+<directory name="multimedia">
+	<xi:include href="multimedia/directory.xml" />
+</directory>
+<directory name="network">
+	<xi:include href="network/directory.xml" />
+</directory>
+<directory name="sound">
+	<xi:include href="sound/directory.xml" />
 </directory>
 <directory name="storage">
 	<xi:include href="storage/directory.xml" />
 </directory>
-<directory name="video">
-	<xi:include href="video/directory.xml" />
-</directory>
 <directory name="usb">
 	<xi:include href="usb/directory.xml" />
 </directory>
-<directory name="multimedia">
-	<xi:include href="multimedia/directory.xml" />
+<directory name="video">
+	<xi:include href="video/directory.xml" />
 </directory>
 </group>
diff --git a/reactos/drivers/lib/directory.xml b/reactos/drivers/lib/directory.xml
index 01435c19552..c1900d7e246 100644
--- a/reactos/drivers/lib/directory.xml
+++ b/reactos/drivers/lib/directory.xml
@@ -1,6 +1,3 @@
-<directory name="bzip2">
-	<xi:include href="bzip2/bzip2.xml" />
-</directory>
 <directory name="csq">
 	<xi:include href="csq/csq.xml" />
 </directory>
diff --git a/reactos/drivers/sound/directory.xml b/reactos/drivers/sound/directory.xml
new file mode 100644
index 00000000000..b2513e3383c
--- /dev/null
+++ b/reactos/drivers/sound/directory.xml
@@ -0,0 +1,9 @@
+<directory name="mpu401">
+	<xi:include href="mpu401/mpu401.xml" />
+</directory>
+<directory name="sndblst">
+	<xi:include href="sndblst/sndblst.xml" />
+</directory>
+<directory name="sound">
+	<xi:include href="sound/sound.xml" />
+</directory>