diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a49b609e..ef9b6534e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -752,8 +752,8 @@ file( GLOB HEADER_FILES
 	g_inventory/*.h
 	intermission/*.h
 	menu/*.h
-	oplsynth/*.h
-	oplsynth/dosbox/*.h
+	sound/oplsynth/*.h
+	sound/oplsynth/dosbox/*.h
 	posix/*.h
 	posix/cocoa/*.h
 	posix/sdl/*.h
@@ -768,8 +768,8 @@ file( GLOB HEADER_FILES
 	scripting/decorate/*.h
 	scripting/zscript/*.h
 	scripting/vm/*.h
-	timidity/*.h
-	wildmidi/*.h
+	sound/timidity/*.h
+	sound/wildmidi/*.h
 	xlat/*.h
 	swrenderer/*.h
 	swrenderer/drawers/*.h
@@ -892,9 +892,7 @@ set( NOT_COMPILED_SOURCE_FILES
 set( FASTMATH_SOURCES
 	swrenderer/r_all.cpp
 	polyrenderer/poly_all.cpp
-	oplsynth/music_opldumper_mididevice.cpp
-	oplsynth/music_opl_mididevice.cpp
-	oplsynth/opl_mus_player.cpp
+	sound/oplsynth/opl_mus_player.cpp
 	sound/fmodsound.cpp
 	sound/i_music.cpp
 	sound/i_sound.cpp
@@ -908,19 +906,20 @@ set( FASTMATH_SOURCES
 	sound/music_xmi_midiout.cpp
 	sound/music_midistream.cpp
 	sound/music_midi_base.cpp
-	sound/music_midi_timidity.cpp
 	sound/music_mus_opl.cpp
 	sound/music_stream.cpp
-	sound/music_fluidsynth_mididevice.cpp
-	sound/music_softsynth_mididevice.cpp
-	sound/music_timidity_mididevice.cpp
-	sound/music_wildmidi_mididevice.cpp
-	sound/music_win_mididevice.cpp
-	sound/music_audiotoolbox_mididevice.cpp
 	sound/oalsound.cpp
 	sound/sndfile_decoder.cpp
-	sound/music_pseudo_mididevice.cpp
-	wildmidi/wildmidi_lib.cpp
+	sound/mididevices/music_opldumper_mididevice.cpp
+	sound/mididevices/music_opl_mididevice.cpp
+	sound/mididevices/music_pseudo_mididevice.cpp
+	sound/mididevices/music_fluidsynth_mididevice.cpp
+	sound/mididevices/music_softsynth_mididevice.cpp
+	sound/mididevices/music_timidity_mididevice.cpp
+	sound/mididevices/music_wildmidi_mididevice.cpp
+	sound/mididevices/music_win_mididevice.cpp
+	sound/mididevices/music_audiotoolbox_mididevice.cpp
+	sound/mididevices/music_midi_timidity.cpp
 	gl/data/gl_matrix.cpp
 	gl/dynlights/a_dynlight.cpp
 	gl/utility/gl_clock.cpp
@@ -1178,12 +1177,6 @@ set (PCH_SOURCES
 	menu/optionmenu.cpp
 	menu/playermenu.cpp
 	menu/videomenu.cpp
-	oplsynth/fmopl.cpp
-	oplsynth/mlopl.cpp
-	oplsynth/mlopl_io.cpp
-	oplsynth/dosbox/opl.cpp
-	oplsynth/OPL3.cpp
-	oplsynth/nukedopl3.cpp
 	resourcefiles/ancientzip.cpp
 	resourcefiles/file_7z.cpp
 	resourcefiles/file_grp.cpp
@@ -1252,19 +1245,26 @@ set (PCH_SOURCES
 	scripting/zscript/zcc_compile.cpp
 	scripting/zscript/zcc_parser.cpp
 	sfmt/SFMT.cpp
-	timidity/common.cpp
-	timidity/instrum.cpp
-	timidity/instrum_dls.cpp
-	timidity/instrum_font.cpp
-	timidity/instrum_sf2.cpp
-	timidity/mix.cpp
-	timidity/playmidi.cpp
-	timidity/resample.cpp
-	timidity/timidity.cpp
-	wildmidi/file_io.cpp
-	wildmidi/gus_pat.cpp
-	wildmidi/reverb.cpp
-	wildmidi/wm_error.cpp
+	sound/oplsynth/fmopl.cpp
+	sound/oplsynth/mlopl.cpp
+	sound/oplsynth/mlopl_io.cpp
+	sound/oplsynth/dosbox/opl.cpp
+	sound/oplsynth/OPL3.cpp
+	sound/oplsynth/nukedopl3.cpp
+	sound/timidity/common.cpp
+	sound/timidity/instrum.cpp
+	sound/timidity/instrum_dls.cpp
+	sound/timidity/instrum_font.cpp
+	sound/timidity/instrum_sf2.cpp
+	sound/timidity/mix.cpp
+	sound/timidity/playmidi.cpp
+	sound/timidity/resample.cpp
+	sound/timidity/timidity.cpp
+	sound/wildmidi/file_io.cpp
+	sound/wildmidi/gus_pat.cpp
+	sound/wildmidi/reverb.cpp
+	sound/wildmidi/wildmidi_lib.cpp
+	sound/wildmidi/wm_error.cpp
 	events.cpp
 	GuillotineBinPack.cpp
 	SkylineBinPack.cpp
@@ -1324,11 +1324,11 @@ include_directories( .
 	g_statusbar
 	g_shared
 	g_inventory
-	oplsynth
 	sound
 	textures
-	timidity
-	wildmidi
+	sound/oplsynth
+	sound/timidity
+	sound/wildmidi
 	xlat
 	scripting
 	scripting/vm
@@ -1440,12 +1440,11 @@ install(TARGETS zdoom
 		COMPONENT "Game executable")
 
 source_group("Audio Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/.+")
-source_group("Audio Files\\OPL Synth" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/oplsynth/.+")
-source_group("Audio Files\\OPL Synth\\DOSBox" FILES oplsynth/dosbox/opl.cpp oplsynth/dosbox/opl.h)
-source_group("Audio Files\\Timidity\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/timidity/.+\\.h$")
-source_group("Audio Files\\Timidity\\Source" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/timidity/.+\\.cpp$")
-source_group("Audio Files\\WildMidi\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/wildmidi/.+\\.h$")
-source_group("Audio Files\\WildMidi\\Source" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/wildmidi/.+\\.cpp$")
+source_group("Audio Files\\OPL Synth" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/oplsynth/.+")
+source_group("Audio Files\\OPL Synth\\DOSBox" FILES sound/oplsynth/dosbox/opl.cpp sound/oplsynth/dosbox/opl.h)
+source_group("Audio Files\\Timidity" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/timidity/.+")
+source_group("Audio Files\\WildMidi" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/wildmidi/.+")
+source_group("Audio Files\\MIDI Devices" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/mididevices/.+")
 source_group("External\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/math/.+")
 source_group("External\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/.+")
 source_group("External\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+")
diff --git a/src/sound/music_audiotoolbox_mididevice.cpp b/src/sound/mididevices/music_audiotoolbox_mididevice.cpp
similarity index 100%
rename from src/sound/music_audiotoolbox_mididevice.cpp
rename to src/sound/mididevices/music_audiotoolbox_mididevice.cpp
diff --git a/src/sound/music_fluidsynth_mididevice.cpp b/src/sound/mididevices/music_fluidsynth_mididevice.cpp
similarity index 100%
rename from src/sound/music_fluidsynth_mididevice.cpp
rename to src/sound/mididevices/music_fluidsynth_mididevice.cpp
diff --git a/src/sound/music_midi_timidity.cpp b/src/sound/mididevices/music_midi_timidity.cpp
similarity index 100%
rename from src/sound/music_midi_timidity.cpp
rename to src/sound/mididevices/music_midi_timidity.cpp
diff --git a/src/oplsynth/music_opl_mididevice.cpp b/src/sound/mididevices/music_opl_mididevice.cpp
similarity index 100%
rename from src/oplsynth/music_opl_mididevice.cpp
rename to src/sound/mididevices/music_opl_mididevice.cpp
diff --git a/src/oplsynth/music_opldumper_mididevice.cpp b/src/sound/mididevices/music_opldumper_mididevice.cpp
similarity index 100%
rename from src/oplsynth/music_opldumper_mididevice.cpp
rename to src/sound/mididevices/music_opldumper_mididevice.cpp
diff --git a/src/sound/music_pseudo_mididevice.cpp b/src/sound/mididevices/music_pseudo_mididevice.cpp
similarity index 100%
rename from src/sound/music_pseudo_mididevice.cpp
rename to src/sound/mididevices/music_pseudo_mididevice.cpp
diff --git a/src/sound/music_softsynth_mididevice.cpp b/src/sound/mididevices/music_softsynth_mididevice.cpp
similarity index 100%
rename from src/sound/music_softsynth_mididevice.cpp
rename to src/sound/mididevices/music_softsynth_mididevice.cpp
diff --git a/src/sound/music_timidity_mididevice.cpp b/src/sound/mididevices/music_timidity_mididevice.cpp
similarity index 100%
rename from src/sound/music_timidity_mididevice.cpp
rename to src/sound/mididevices/music_timidity_mididevice.cpp
diff --git a/src/sound/music_wildmidi_mididevice.cpp b/src/sound/mididevices/music_wildmidi_mididevice.cpp
similarity index 100%
rename from src/sound/music_wildmidi_mididevice.cpp
rename to src/sound/mididevices/music_wildmidi_mididevice.cpp
diff --git a/src/sound/music_win_mididevice.cpp b/src/sound/mididevices/music_win_mididevice.cpp
similarity index 100%
rename from src/sound/music_win_mididevice.cpp
rename to src/sound/mididevices/music_win_mididevice.cpp
diff --git a/src/oplsynth/OPL3.cpp b/src/sound/oplsynth/OPL3.cpp
similarity index 100%
rename from src/oplsynth/OPL3.cpp
rename to src/sound/oplsynth/OPL3.cpp
diff --git a/src/oplsynth/dosbox/opl.cpp b/src/sound/oplsynth/dosbox/opl.cpp
similarity index 100%
rename from src/oplsynth/dosbox/opl.cpp
rename to src/sound/oplsynth/dosbox/opl.cpp
diff --git a/src/oplsynth/dosbox/opl.h b/src/sound/oplsynth/dosbox/opl.h
similarity index 100%
rename from src/oplsynth/dosbox/opl.h
rename to src/sound/oplsynth/dosbox/opl.h
diff --git a/src/oplsynth/fmopl.cpp b/src/sound/oplsynth/fmopl.cpp
similarity index 100%
rename from src/oplsynth/fmopl.cpp
rename to src/sound/oplsynth/fmopl.cpp
diff --git a/src/oplsynth/mlopl.cpp b/src/sound/oplsynth/mlopl.cpp
similarity index 100%
rename from src/oplsynth/mlopl.cpp
rename to src/sound/oplsynth/mlopl.cpp
diff --git a/src/oplsynth/mlopl_io.cpp b/src/sound/oplsynth/mlopl_io.cpp
similarity index 100%
rename from src/oplsynth/mlopl_io.cpp
rename to src/sound/oplsynth/mlopl_io.cpp
diff --git a/src/oplsynth/muslib.h b/src/sound/oplsynth/muslib.h
similarity index 100%
rename from src/oplsynth/muslib.h
rename to src/sound/oplsynth/muslib.h
diff --git a/src/oplsynth/nukedopl3.cpp b/src/sound/oplsynth/nukedopl3.cpp
similarity index 100%
rename from src/oplsynth/nukedopl3.cpp
rename to src/sound/oplsynth/nukedopl3.cpp
diff --git a/src/oplsynth/nukedopl3.h b/src/sound/oplsynth/nukedopl3.h
similarity index 100%
rename from src/oplsynth/nukedopl3.h
rename to src/sound/oplsynth/nukedopl3.h
diff --git a/src/oplsynth/opl.h b/src/sound/oplsynth/opl.h
similarity index 100%
rename from src/oplsynth/opl.h
rename to src/sound/oplsynth/opl.h
diff --git a/src/oplsynth/opl_mus_player.cpp b/src/sound/oplsynth/opl_mus_player.cpp
similarity index 100%
rename from src/oplsynth/opl_mus_player.cpp
rename to src/sound/oplsynth/opl_mus_player.cpp
diff --git a/src/oplsynth/opl_mus_player.h b/src/sound/oplsynth/opl_mus_player.h
similarity index 100%
rename from src/oplsynth/opl_mus_player.h
rename to src/sound/oplsynth/opl_mus_player.h
diff --git a/src/timidity/CHANGES b/src/sound/timidity/CHANGES
similarity index 100%
rename from src/timidity/CHANGES
rename to src/sound/timidity/CHANGES
diff --git a/src/timidity/COPYING b/src/sound/timidity/COPYING
similarity index 100%
rename from src/timidity/COPYING
rename to src/sound/timidity/COPYING
diff --git a/src/timidity/FAQ b/src/sound/timidity/FAQ
similarity index 100%
rename from src/timidity/FAQ
rename to src/sound/timidity/FAQ
diff --git a/src/timidity/README b/src/sound/timidity/README
similarity index 100%
rename from src/timidity/README
rename to src/sound/timidity/README
diff --git a/src/timidity/common.cpp b/src/sound/timidity/common.cpp
similarity index 100%
rename from src/timidity/common.cpp
rename to src/sound/timidity/common.cpp
diff --git a/src/timidity/dls1.h b/src/sound/timidity/dls1.h
similarity index 100%
rename from src/timidity/dls1.h
rename to src/sound/timidity/dls1.h
diff --git a/src/timidity/dls2.h b/src/sound/timidity/dls2.h
similarity index 100%
rename from src/timidity/dls2.h
rename to src/sound/timidity/dls2.h
diff --git a/src/timidity/gf1patch.h b/src/sound/timidity/gf1patch.h
similarity index 100%
rename from src/timidity/gf1patch.h
rename to src/sound/timidity/gf1patch.h
diff --git a/src/timidity/instrum.cpp b/src/sound/timidity/instrum.cpp
similarity index 100%
rename from src/timidity/instrum.cpp
rename to src/sound/timidity/instrum.cpp
diff --git a/src/timidity/instrum.obj b/src/sound/timidity/instrum.obj
similarity index 100%
rename from src/timidity/instrum.obj
rename to src/sound/timidity/instrum.obj
diff --git a/src/timidity/instrum_dls.cpp b/src/sound/timidity/instrum_dls.cpp
similarity index 100%
rename from src/timidity/instrum_dls.cpp
rename to src/sound/timidity/instrum_dls.cpp
diff --git a/src/timidity/instrum_font.cpp b/src/sound/timidity/instrum_font.cpp
similarity index 100%
rename from src/timidity/instrum_font.cpp
rename to src/sound/timidity/instrum_font.cpp
diff --git a/src/timidity/instrum_sf2.cpp b/src/sound/timidity/instrum_sf2.cpp
similarity index 100%
rename from src/timidity/instrum_sf2.cpp
rename to src/sound/timidity/instrum_sf2.cpp
diff --git a/src/timidity/mix.cpp b/src/sound/timidity/mix.cpp
similarity index 100%
rename from src/timidity/mix.cpp
rename to src/sound/timidity/mix.cpp
diff --git a/src/timidity/playmidi.cpp b/src/sound/timidity/playmidi.cpp
similarity index 100%
rename from src/timidity/playmidi.cpp
rename to src/sound/timidity/playmidi.cpp
diff --git a/src/timidity/resample.cpp b/src/sound/timidity/resample.cpp
similarity index 100%
rename from src/timidity/resample.cpp
rename to src/sound/timidity/resample.cpp
diff --git a/src/timidity/sf2.h b/src/sound/timidity/sf2.h
similarity index 100%
rename from src/timidity/sf2.h
rename to src/sound/timidity/sf2.h
diff --git a/src/timidity/timidity.cpp b/src/sound/timidity/timidity.cpp
similarity index 100%
rename from src/timidity/timidity.cpp
rename to src/sound/timidity/timidity.cpp
diff --git a/src/timidity/timidity.h b/src/sound/timidity/timidity.h
similarity index 100%
rename from src/timidity/timidity.h
rename to src/sound/timidity/timidity.h
diff --git a/src/wildmidi/common.h b/src/sound/wildmidi/common.h
similarity index 100%
rename from src/wildmidi/common.h
rename to src/sound/wildmidi/common.h
diff --git a/src/wildmidi/file_io.cpp b/src/sound/wildmidi/file_io.cpp
similarity index 100%
rename from src/wildmidi/file_io.cpp
rename to src/sound/wildmidi/file_io.cpp
diff --git a/src/wildmidi/file_io.h b/src/sound/wildmidi/file_io.h
similarity index 100%
rename from src/wildmidi/file_io.h
rename to src/sound/wildmidi/file_io.h
diff --git a/src/wildmidi/gus_pat.cpp b/src/sound/wildmidi/gus_pat.cpp
similarity index 100%
rename from src/wildmidi/gus_pat.cpp
rename to src/sound/wildmidi/gus_pat.cpp
diff --git a/src/wildmidi/gus_pat.h b/src/sound/wildmidi/gus_pat.h
similarity index 100%
rename from src/wildmidi/gus_pat.h
rename to src/sound/wildmidi/gus_pat.h
diff --git a/src/wildmidi/reverb.cpp b/src/sound/wildmidi/reverb.cpp
similarity index 100%
rename from src/wildmidi/reverb.cpp
rename to src/sound/wildmidi/reverb.cpp
diff --git a/src/wildmidi/reverb.h b/src/sound/wildmidi/reverb.h
similarity index 100%
rename from src/wildmidi/reverb.h
rename to src/sound/wildmidi/reverb.h
diff --git a/src/wildmidi/wildmidi_lib.cpp b/src/sound/wildmidi/wildmidi_lib.cpp
similarity index 100%
rename from src/wildmidi/wildmidi_lib.cpp
rename to src/sound/wildmidi/wildmidi_lib.cpp
diff --git a/src/wildmidi/wildmidi_lib.h b/src/sound/wildmidi/wildmidi_lib.h
similarity index 100%
rename from src/wildmidi/wildmidi_lib.h
rename to src/sound/wildmidi/wildmidi_lib.h
diff --git a/src/wildmidi/wm_error.cpp b/src/sound/wildmidi/wm_error.cpp
similarity index 100%
rename from src/wildmidi/wm_error.cpp
rename to src/sound/wildmidi/wm_error.cpp
diff --git a/src/wildmidi/wm_error.h b/src/sound/wildmidi/wm_error.h
similarity index 100%
rename from src/wildmidi/wm_error.h
rename to src/sound/wildmidi/wm_error.h