diff --git a/reactos/drivers/base/directory.rbuild b/reactos/drivers/base/directory.rbuild
index 9626276108a..e066ca57f0b 100644
--- a/reactos/drivers/base/directory.rbuild
+++ b/reactos/drivers/base/directory.rbuild
@@ -12,10 +12,4 @@
 </directory>
 <directory name="null">
 	<xi:include href="null/null.rbuild" />
-</directory>
-<directory name="parallel">
-	<xi:include href="parallel/parallel.rbuild" />
-</directory>
-<directory name="serial">
-	<xi:include href="serial/serial.rbuild" />
-</directory>
+</directory>
\ No newline at end of file
diff --git a/reactos/drivers/bus/directory.rbuild b/reactos/drivers/bus/directory.rbuild
index 70322bef513..fa8b93560ab 100644
--- a/reactos/drivers/bus/directory.rbuild
+++ b/reactos/drivers/bus/directory.rbuild
@@ -7,6 +7,3 @@
 <directory name="pci">
 	<xi:include href="pci/pci.rbuild" />
 </directory>
-<directory name="serenum">
-	<xi:include href="serenum/serenum.rbuild" />
-</directory>
diff --git a/reactos/drivers/drivers.rbuild b/reactos/drivers/drivers.rbuild
index 74b9d08460c..da13c97c8dd 100644
--- a/reactos/drivers/drivers.rbuild
+++ b/reactos/drivers/drivers.rbuild
@@ -17,6 +17,12 @@
 <directory name="network">
 	<xi:include href="network/directory.rbuild" />
 </directory>
+<directory name="parallel">
+	<xi:include href="parallel/directory.rbuild" />
+</directory>
+<directory name="serial">
+	<xi:include href="serial/directory.rbuild" />
+</directory>
 <directory name="storage">
 	<xi:include href="storage/directory.rbuild" />
 </directory>
diff --git a/reactos/drivers/parallel/directory.rbuild b/reactos/drivers/parallel/directory.rbuild
new file mode 100644
index 00000000000..cf8d7895c51
--- /dev/null
+++ b/reactos/drivers/parallel/directory.rbuild
@@ -0,0 +1,3 @@
+<directory name="parallel">
+	<xi:include href="parallel/parallel.rbuild" />
+</directory>
\ No newline at end of file
diff --git a/reactos/drivers/base/parallel/parallel.c b/reactos/drivers/parallel/parallel/parallel.c
similarity index 100%
rename from reactos/drivers/base/parallel/parallel.c
rename to reactos/drivers/parallel/parallel/parallel.c
diff --git a/reactos/drivers/base/parallel/parallel.h b/reactos/drivers/parallel/parallel/parallel.h
similarity index 100%
rename from reactos/drivers/base/parallel/parallel.h
rename to reactos/drivers/parallel/parallel/parallel.h
diff --git a/reactos/drivers/base/parallel/parallel.rbuild b/reactos/drivers/parallel/parallel/parallel.rbuild
similarity index 100%
rename from reactos/drivers/base/parallel/parallel.rbuild
rename to reactos/drivers/parallel/parallel/parallel.rbuild
diff --git a/reactos/drivers/base/parallel/parallel.rc b/reactos/drivers/parallel/parallel/parallel.rc
similarity index 100%
rename from reactos/drivers/base/parallel/parallel.rc
rename to reactos/drivers/parallel/parallel/parallel.rc
diff --git a/reactos/drivers/parallel/parclass/.gitignore b/reactos/drivers/parallel/parclass/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/reactos/drivers/parallel/parport/.gitignore b/reactos/drivers/parallel/parport/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/reactos/drivers/serial/directory.rbuild b/reactos/drivers/serial/directory.rbuild
new file mode 100644
index 00000000000..6d8309caed6
--- /dev/null
+++ b/reactos/drivers/serial/directory.rbuild
@@ -0,0 +1,6 @@
+<directory name="serial">
+	<xi:include href="serial/serial.rbuild" />
+</directory>
+<directory name="serenum">
+	<xi:include href="serenum/serenum.rbuild" />
+</directory>
\ No newline at end of file
diff --git a/reactos/drivers/bus/serenum/detect.c b/reactos/drivers/serial/serenum/detect.c
similarity index 100%
rename from reactos/drivers/bus/serenum/detect.c
rename to reactos/drivers/serial/serenum/detect.c
diff --git a/reactos/drivers/bus/serenum/fdo.c b/reactos/drivers/serial/serenum/fdo.c
similarity index 100%
rename from reactos/drivers/bus/serenum/fdo.c
rename to reactos/drivers/serial/serenum/fdo.c
diff --git a/reactos/drivers/bus/serenum/misc.c b/reactos/drivers/serial/serenum/misc.c
similarity index 100%
rename from reactos/drivers/bus/serenum/misc.c
rename to reactos/drivers/serial/serenum/misc.c
diff --git a/reactos/drivers/bus/serenum/pdo.c b/reactos/drivers/serial/serenum/pdo.c
similarity index 100%
rename from reactos/drivers/bus/serenum/pdo.c
rename to reactos/drivers/serial/serenum/pdo.c
diff --git a/reactos/drivers/bus/serenum/serenum.c b/reactos/drivers/serial/serenum/serenum.c
similarity index 100%
rename from reactos/drivers/bus/serenum/serenum.c
rename to reactos/drivers/serial/serenum/serenum.c
diff --git a/reactos/drivers/bus/serenum/serenum.h b/reactos/drivers/serial/serenum/serenum.h
similarity index 100%
rename from reactos/drivers/bus/serenum/serenum.h
rename to reactos/drivers/serial/serenum/serenum.h
diff --git a/reactos/drivers/bus/serenum/serenum.rbuild b/reactos/drivers/serial/serenum/serenum.rbuild
similarity index 100%
rename from reactos/drivers/bus/serenum/serenum.rbuild
rename to reactos/drivers/serial/serenum/serenum.rbuild
diff --git a/reactos/drivers/bus/serenum/serenum.rc b/reactos/drivers/serial/serenum/serenum.rc
similarity index 100%
rename from reactos/drivers/bus/serenum/serenum.rc
rename to reactos/drivers/serial/serenum/serenum.rc
diff --git a/reactos/drivers/base/serial/circularbuffer.c b/reactos/drivers/serial/serial/circularbuffer.c
similarity index 100%
rename from reactos/drivers/base/serial/circularbuffer.c
rename to reactos/drivers/serial/serial/circularbuffer.c
diff --git a/reactos/drivers/base/serial/cleanup.c b/reactos/drivers/serial/serial/cleanup.c
similarity index 100%
rename from reactos/drivers/base/serial/cleanup.c
rename to reactos/drivers/serial/serial/cleanup.c
diff --git a/reactos/drivers/base/serial/close.c b/reactos/drivers/serial/serial/close.c
similarity index 100%
rename from reactos/drivers/base/serial/close.c
rename to reactos/drivers/serial/serial/close.c
diff --git a/reactos/drivers/base/serial/create.c b/reactos/drivers/serial/serial/create.c
similarity index 100%
rename from reactos/drivers/base/serial/create.c
rename to reactos/drivers/serial/serial/create.c
diff --git a/reactos/drivers/base/serial/devctrl.c b/reactos/drivers/serial/serial/devctrl.c
similarity index 100%
rename from reactos/drivers/base/serial/devctrl.c
rename to reactos/drivers/serial/serial/devctrl.c
diff --git a/reactos/drivers/base/serial/info.c b/reactos/drivers/serial/serial/info.c
similarity index 100%
rename from reactos/drivers/base/serial/info.c
rename to reactos/drivers/serial/serial/info.c
diff --git a/reactos/drivers/base/serial/legacy.c b/reactos/drivers/serial/serial/legacy.c
similarity index 100%
rename from reactos/drivers/base/serial/legacy.c
rename to reactos/drivers/serial/serial/legacy.c
diff --git a/reactos/drivers/base/serial/misc.c b/reactos/drivers/serial/serial/misc.c
similarity index 100%
rename from reactos/drivers/base/serial/misc.c
rename to reactos/drivers/serial/serial/misc.c
diff --git a/reactos/drivers/base/serial/pnp.c b/reactos/drivers/serial/serial/pnp.c
similarity index 100%
rename from reactos/drivers/base/serial/pnp.c
rename to reactos/drivers/serial/serial/pnp.c
diff --git a/reactos/drivers/base/serial/power.c b/reactos/drivers/serial/serial/power.c
similarity index 100%
rename from reactos/drivers/base/serial/power.c
rename to reactos/drivers/serial/serial/power.c
diff --git a/reactos/drivers/base/serial/rw.c b/reactos/drivers/serial/serial/rw.c
similarity index 100%
rename from reactos/drivers/base/serial/rw.c
rename to reactos/drivers/serial/serial/rw.c
diff --git a/reactos/drivers/base/serial/serial.c b/reactos/drivers/serial/serial/serial.c
similarity index 100%
rename from reactos/drivers/base/serial/serial.c
rename to reactos/drivers/serial/serial/serial.c
diff --git a/reactos/drivers/base/serial/serial.h b/reactos/drivers/serial/serial/serial.h
similarity index 100%
rename from reactos/drivers/base/serial/serial.h
rename to reactos/drivers/serial/serial/serial.h
diff --git a/reactos/drivers/base/serial/serial.rbuild b/reactos/drivers/serial/serial/serial.rbuild
similarity index 100%
rename from reactos/drivers/base/serial/serial.rbuild
rename to reactos/drivers/serial/serial/serial.rbuild
diff --git a/reactos/drivers/base/serial/serial.rc b/reactos/drivers/serial/serial/serial.rc
similarity index 100%
rename from reactos/drivers/base/serial/serial.rc
rename to reactos/drivers/serial/serial/serial.rc
diff --git a/reactos/drivers/storage/class/directory.rbuild b/reactos/drivers/storage/class/directory.rbuild
new file mode 100644
index 00000000000..b4ae902fa95
--- /dev/null
+++ b/reactos/drivers/storage/class/directory.rbuild
@@ -0,0 +1,9 @@
+<directory name="cdrom">
+	<xi:include href="cdrom/cdrom.rbuild" />
+</directory>
+<directory name="class2">
+	<xi:include href="class2/class2.rbuild" />
+</directory>
+<directory name="disk">
+	<xi:include href="disk/disk.rbuild" />
+</directory>
\ No newline at end of file
diff --git a/reactos/drivers/storage/ide/directory.rbuild b/reactos/drivers/storage/ide/directory.rbuild
new file mode 100644
index 00000000000..645bd5fd423
--- /dev/null
+++ b/reactos/drivers/storage/ide/directory.rbuild
@@ -0,0 +1,9 @@
+<directory name="atapi">
+	<xi:include href="atapi/atapi.rbuild" />
+</directory>
+<directory name="pciide">
+	<xi:include href="pciide/pciide.rbuild" />
+</directory>
+<directory name="pciidex">
+	<xi:include href="pciidex/pciidex.rbuild" />
+</directory>
\ No newline at end of file
diff --git a/reactos/drivers/storage/port/directory.rbuild b/reactos/drivers/storage/port/directory.rbuild
new file mode 100644
index 00000000000..308e60013ce
--- /dev/null
+++ b/reactos/drivers/storage/port/directory.rbuild
@@ -0,0 +1,6 @@
+<directory name="buslogic">
+	<xi:include href="buslogic/buslogic.rbuild" />
+</directory>
+<directory name="diskdump">
+	<xi:include href="diskdump/diskdump.rbuild" />
+</directory>
\ No newline at end of file