diff --git a/reactos/drivers/drivers.rbuild b/reactos/drivers/drivers.rbuild
index 62c701ad06c..ac42fb663fc 100644
--- a/reactos/drivers/drivers.rbuild
+++ b/reactos/drivers/drivers.rbuild
@@ -20,9 +20,6 @@
 <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>
diff --git a/reactos/drivers/sound/directory.xml b/reactos/drivers/multimedia/audio/directory.xml
similarity index 100%
rename from reactos/drivers/sound/directory.xml
rename to reactos/drivers/multimedia/audio/directory.xml
diff --git a/reactos/drivers/sound/mpu401/mpu401.c b/reactos/drivers/multimedia/audio/mpu401/mpu401.c
similarity index 100%
rename from reactos/drivers/sound/mpu401/mpu401.c
rename to reactos/drivers/multimedia/audio/mpu401/mpu401.c
diff --git a/reactos/drivers/sound/mpu401/mpu401.h b/reactos/drivers/multimedia/audio/mpu401/mpu401.h
similarity index 100%
rename from reactos/drivers/sound/mpu401/mpu401.h
rename to reactos/drivers/multimedia/audio/mpu401/mpu401.h
diff --git a/reactos/drivers/sound/mpu401/mpu401.rc b/reactos/drivers/multimedia/audio/mpu401/mpu401.rc
similarity index 100%
rename from reactos/drivers/sound/mpu401/mpu401.rc
rename to reactos/drivers/multimedia/audio/mpu401/mpu401.rc
diff --git a/reactos/drivers/sound/mpu401/mpu401.xml b/reactos/drivers/multimedia/audio/mpu401/mpu401.xml
similarity index 100%
rename from reactos/drivers/sound/mpu401/mpu401.xml
rename to reactos/drivers/multimedia/audio/mpu401/mpu401.xml
diff --git a/reactos/drivers/sound/mpu401/portio.c b/reactos/drivers/multimedia/audio/mpu401/portio.c
similarity index 100%
rename from reactos/drivers/sound/mpu401/portio.c
rename to reactos/drivers/multimedia/audio/mpu401/portio.c
diff --git a/reactos/drivers/sound/mpu401/readme.txt b/reactos/drivers/multimedia/audio/mpu401/readme.txt
similarity index 100%
rename from reactos/drivers/sound/mpu401/readme.txt
rename to reactos/drivers/multimedia/audio/mpu401/readme.txt
diff --git a/reactos/drivers/sound/mpu401/sbdebug.h b/reactos/drivers/multimedia/audio/mpu401/sbdebug.h
similarity index 100%
rename from reactos/drivers/sound/mpu401/sbdebug.h
rename to reactos/drivers/multimedia/audio/mpu401/sbdebug.h
diff --git a/reactos/drivers/sound/mpu401/settings.c b/reactos/drivers/multimedia/audio/mpu401/settings.c
similarity index 100%
rename from reactos/drivers/sound/mpu401/settings.c
rename to reactos/drivers/multimedia/audio/mpu401/settings.c
diff --git a/reactos/drivers/sound/mpu401/test.c b/reactos/drivers/multimedia/audio/mpu401/test.c
similarity index 100%
rename from reactos/drivers/sound/mpu401/test.c
rename to reactos/drivers/multimedia/audio/mpu401/test.c
diff --git a/reactos/drivers/sound/sndblst/card.c b/reactos/drivers/multimedia/audio/sndblst/card.c
similarity index 100%
rename from reactos/drivers/sound/sndblst/card.c
rename to reactos/drivers/multimedia/audio/sndblst/card.c
diff --git a/reactos/drivers/sound/sndblst/dma.c b/reactos/drivers/multimedia/audio/sndblst/dma.c
similarity index 100%
rename from reactos/drivers/sound/sndblst/dma.c
rename to reactos/drivers/multimedia/audio/sndblst/dma.c
diff --git a/reactos/drivers/sound/sndblst/irq.c b/reactos/drivers/multimedia/audio/sndblst/irq.c
similarity index 100%
rename from reactos/drivers/sound/sndblst/irq.c
rename to reactos/drivers/multimedia/audio/sndblst/irq.c
diff --git a/reactos/drivers/sound/sndblst/portio.c b/reactos/drivers/multimedia/audio/sndblst/portio.c
similarity index 100%
rename from reactos/drivers/sound/sndblst/portio.c
rename to reactos/drivers/multimedia/audio/sndblst/portio.c
diff --git a/reactos/drivers/sound/sndblst/sbdebug.h b/reactos/drivers/multimedia/audio/sndblst/sbdebug.h
similarity index 100%
rename from reactos/drivers/sound/sndblst/sbdebug.h
rename to reactos/drivers/multimedia/audio/sndblst/sbdebug.h
diff --git a/reactos/drivers/sound/sndblst/settings.c b/reactos/drivers/multimedia/audio/sndblst/settings.c
similarity index 100%
rename from reactos/drivers/sound/sndblst/settings.c
rename to reactos/drivers/multimedia/audio/sndblst/settings.c
diff --git a/reactos/drivers/sound/sndblst/sndblst.c b/reactos/drivers/multimedia/audio/sndblst/sndblst.c
similarity index 100%
rename from reactos/drivers/sound/sndblst/sndblst.c
rename to reactos/drivers/multimedia/audio/sndblst/sndblst.c
diff --git a/reactos/drivers/sound/sndblst/sndblst.h b/reactos/drivers/multimedia/audio/sndblst/sndblst.h
similarity index 100%
rename from reactos/drivers/sound/sndblst/sndblst.h
rename to reactos/drivers/multimedia/audio/sndblst/sndblst.h
diff --git a/reactos/drivers/sound/sndblst/sndblst.rc b/reactos/drivers/multimedia/audio/sndblst/sndblst.rc
similarity index 100%
rename from reactos/drivers/sound/sndblst/sndblst.rc
rename to reactos/drivers/multimedia/audio/sndblst/sndblst.rc
diff --git a/reactos/drivers/sound/sndblst/sndblst.xml b/reactos/drivers/multimedia/audio/sndblst/sndblst.xml
similarity index 100%
rename from reactos/drivers/sound/sndblst/sndblst.xml
rename to reactos/drivers/multimedia/audio/sndblst/sndblst.xml
diff --git a/reactos/drivers/sound/sndblst/test.c b/reactos/drivers/multimedia/audio/sndblst/test.c
similarity index 100%
rename from reactos/drivers/sound/sndblst/test.c
rename to reactos/drivers/multimedia/audio/sndblst/test.c
diff --git a/reactos/drivers/sound/sndblst/test/sb.c b/reactos/drivers/multimedia/audio/sndblst/test/sb.c
similarity index 100%
rename from reactos/drivers/sound/sndblst/test/sb.c
rename to reactos/drivers/multimedia/audio/sndblst/test/sb.c
diff --git a/reactos/drivers/sound/sound/dsp.c b/reactos/drivers/multimedia/audio/sound/dsp.c
similarity index 100%
rename from reactos/drivers/sound/sound/dsp.c
rename to reactos/drivers/multimedia/audio/sound/dsp.c
diff --git a/reactos/drivers/sound/sound/dsp.h b/reactos/drivers/multimedia/audio/sound/dsp.h
similarity index 100%
rename from reactos/drivers/sound/sound/dsp.h
rename to reactos/drivers/multimedia/audio/sound/dsp.h
diff --git a/reactos/drivers/sound/sound/in.h b/reactos/drivers/multimedia/audio/sound/in.h
similarity index 100%
rename from reactos/drivers/sound/sound/in.h
rename to reactos/drivers/multimedia/audio/sound/in.h
diff --git a/reactos/drivers/sound/sound/include/devices.h b/reactos/drivers/multimedia/audio/sound/include/devices.h
similarity index 100%
rename from reactos/drivers/sound/sound/include/devices.h
rename to reactos/drivers/multimedia/audio/sound/include/devices.h
diff --git a/reactos/drivers/sound/sound/mixer.c b/reactos/drivers/multimedia/audio/sound/mixer.c
similarity index 100%
rename from reactos/drivers/sound/sound/mixer.c
rename to reactos/drivers/multimedia/audio/sound/mixer.c
diff --git a/reactos/drivers/sound/sound/mixer.h b/reactos/drivers/multimedia/audio/sound/mixer.h
similarity index 100%
rename from reactos/drivers/sound/sound/mixer.h
rename to reactos/drivers/multimedia/audio/sound/mixer.h
diff --git a/reactos/drivers/sound/sound/sb16.c b/reactos/drivers/multimedia/audio/sound/sb16.c
similarity index 100%
rename from reactos/drivers/sound/sound/sb16.c
rename to reactos/drivers/multimedia/audio/sound/sb16.c
diff --git a/reactos/drivers/sound/sound/sb16.h b/reactos/drivers/multimedia/audio/sound/sb16.h
similarity index 100%
rename from reactos/drivers/sound/sound/sb16.h
rename to reactos/drivers/multimedia/audio/sound/sb16.h
diff --git a/reactos/drivers/sound/sound/sb16.rc b/reactos/drivers/multimedia/audio/sound/sb16.rc
similarity index 100%
rename from reactos/drivers/sound/sound/sb16.rc
rename to reactos/drivers/multimedia/audio/sound/sb16.rc
diff --git a/reactos/drivers/sound/sound/sb_waveout.c b/reactos/drivers/multimedia/audio/sound/sb_waveout.c
similarity index 100%
rename from reactos/drivers/sound/sound/sb_waveout.c
rename to reactos/drivers/multimedia/audio/sound/sb_waveout.c
diff --git a/reactos/drivers/sound/sound/sound.c b/reactos/drivers/multimedia/audio/sound/sound.c
similarity index 100%
rename from reactos/drivers/sound/sound/sound.c
rename to reactos/drivers/multimedia/audio/sound/sound.c
diff --git a/reactos/drivers/sound/sound/sound.xml b/reactos/drivers/multimedia/audio/sound/sound.xml
similarity index 100%
rename from reactos/drivers/sound/sound/sound.xml
rename to reactos/drivers/multimedia/audio/sound/sound.xml
diff --git a/reactos/drivers/sound/sound/wave.c b/reactos/drivers/multimedia/audio/sound/wave.c
similarity index 100%
rename from reactos/drivers/sound/sound/wave.c
rename to reactos/drivers/multimedia/audio/sound/wave.c
diff --git a/reactos/drivers/sound/sound/wave.h b/reactos/drivers/multimedia/audio/sound/wave.h
similarity index 100%
rename from reactos/drivers/sound/sound/wave.h
rename to reactos/drivers/multimedia/audio/sound/wave.h
diff --git a/reactos/drivers/multimedia/directory.xml b/reactos/drivers/multimedia/directory.xml
index 44b1757b0f1..e0441c6f0b9 100755
--- a/reactos/drivers/multimedia/directory.xml
+++ b/reactos/drivers/multimedia/directory.xml
@@ -1,3 +1,7 @@
+<directory name="audio">
+	<xi:include href="audio/directory.xml" />
+</directory>
+
 <!--
     Kernel Streaming
 
diff --git a/reactos/drivers/sound/.gitignore b/reactos/drivers/sound/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000