39 files changed, 58 insertions, 58 deletions
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
index a377ad3dc4..3c0671043e 100644
--- a/engines/scumm/module.mk
+++ b/engines/scumm/module.mk
@@ -35,23 +35,23 @@ MODULE_OBJS := \
 	midiparser_ro.o \
 	object.o \
 	palette.o \
-	player_ad.o \
-	player_apple2.o \
-	player_mac.o \
-	player_mod.o \
-	player_nes.o \
-	player_pce.o \
-	player_sid.o \
-	player_towns.o \
-	player_v1.o \
-	player_v2.o \
-	player_v2a.o \
-	player_v2base.o \
-	player_v2cms.o \
-	player_v3a.o \
-	player_v3m.o \
-	player_v4a.o \
-	player_v5m.o \
+	player/ad.o \
+	player/apple2.o \
+	player/mac.o \
+	player/mod.o \
+	player/nes.o \
+	player/pce.o \
+	player/sid.o \
+	player/towns.o \
+	player/v1.o \
+	player/v2.o \
+	player/v2a.o \
+	player/v2base.o \
+	player/v2cms.o \
+	player/v3a.o \
+	player/v3m.o \
+	player/v4a.o \
+	player/v5m.o \
 	resource_v2.o \
 	resource_v3.o \
 	resource_v4.o \
diff --git a/engines/scumm/player_ad.cpp b/engines/scumm/player/ad.cpp
index ed368afbf6..d3cd0483b6 100644
--- a/engines/scumm/player_ad.cpp
+++ b/engines/scumm/player/ad.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "scumm/player_ad.h"
+#include "scumm/player/ad.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/scumm.h"
 #include "scumm/resource.h"
diff --git a/engines/scumm/player_ad.h b/engines/scumm/player/ad.h
index da6c7177ef..da6c7177ef 100644
--- a/engines/scumm/player_ad.h
+++ b/engines/scumm/player/ad.h
diff --git a/engines/scumm/player_apple2.cpp b/engines/scumm/player/apple2.cpp
index 58e4f78a94..671cbf9580 100644
--- a/engines/scumm/player_apple2.cpp
+++ b/engines/scumm/player/apple2.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "engines/engine.h"
-#include "scumm/player_apple2.h"
+#include "scumm/player/apple2.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {
diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player/apple2.h
index e1ec9d8946..e1ec9d8946 100644
--- a/engines/scumm/player_apple2.h
+++ b/engines/scumm/player/apple2.h
diff --git a/engines/scumm/player_mac.cpp b/engines/scumm/player/mac.cpp
index a60736df5e..1fba266311 100644
--- a/engines/scumm/player_mac.cpp
+++ b/engines/scumm/player/mac.cpp
@@ -24,7 +24,7 @@
 #include "common/translation.h"
 #include "engines/engine.h"
 #include "gui/message.h"
-#include "scumm/player_mac.h"
+#include "scumm/player/mac.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
 #include "scumm/imuse/imuse.h"
diff --git a/engines/scumm/player_mac.h b/engines/scumm/player/mac.h
index 09307b4e57..09307b4e57 100644
--- a/engines/scumm/player_mac.h
+++ b/engines/scumm/player/mac.h
diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player/mod.cpp
index 6411f0a17a..afa8967343 100644
--- a/engines/scumm/player_mod.cpp
+++ b/engines/scumm/player/mod.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "scumm/player_mod.h"
+#include "scumm/player/mod.h"
 #include "audio/mixer.h"
 #include "audio/rate.h"
 #include "audio/decoders/raw.h"
diff --git a/engines/scumm/player_mod.h b/engines/scumm/player/mod.h
index 619d83541d..619d83541d 100644
--- a/engines/scumm/player_mod.h
+++ b/engines/scumm/player/mod.h
diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player/nes.cpp
index a6ffc9ed86..072f46dd5a 100644
--- a/engines/scumm/player_nes.cpp
+++ b/engines/scumm/player/nes.cpp
@@ -23,7 +23,7 @@
 #ifndef DISABLE_NES_APU
 
 #include "engines/engine.h"
-#include "scumm/player_nes.h"
+#include "scumm/player/nes.h"
 #include "scumm/scumm.h"
 #include "audio/mixer.h"
 
diff --git a/engines/scumm/player_nes.h b/engines/scumm/player/nes.h
index be1617e0f6..be1617e0f6 100644
--- a/engines/scumm/player_nes.h
+++ b/engines/scumm/player/nes.h
diff --git a/engines/scumm/player_pce.cpp b/engines/scumm/player/pce.cpp
index 8d886ee008..0a9cbaa315 100644
--- a/engines/scumm/player_pce.cpp
+++ b/engines/scumm/player/pce.cpp
@@ -29,7 +29,7 @@
  */
 
 #include <math.h>
-#include "player_pce.h"
+#include "scumm/player/pce.h"
 #include "common/endian.h"
 
 // PCE sound engine is only used by Loom, which requires 16bit color support
diff --git a/engines/scumm/player_pce.h b/engines/scumm/player/pce.h
index 427fb1ace6..427fb1ace6 100644
--- a/engines/scumm/player_pce.h
+++ b/engines/scumm/player/pce.h
diff --git a/engines/scumm/player_sid.cpp b/engines/scumm/player/sid.cpp
index 7a609364e5..ae5346f18f 100644
--- a/engines/scumm/player_sid.cpp
+++ b/engines/scumm/player/sid.cpp
@@ -23,7 +23,7 @@
 #ifndef DISABLE_SID
 
 #include "engines/engine.h"
-#include "scumm/player_sid.h"
+#include "scumm/player/sid.h"
 #include "scumm/scumm.h"
 #include "audio/mixer.h"
 
diff --git a/engines/scumm/player_sid.h b/engines/scumm/player/sid.h
index 12e3573575..12e3573575 100644
--- a/engines/scumm/player_sid.h
+++ b/engines/scumm/player/sid.h
diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player/towns.cpp
index 33e3e40e39..4adb11b5a3 100644
--- a/engines/scumm/player_towns.cpp
+++ b/engines/scumm/player/towns.cpp
@@ -22,7 +22,7 @@
 
 
 #include "scumm/sound.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_towns.h b/engines/scumm/player/towns.h
index 5c76d7c6c7..5c76d7c6c7 100644
--- a/engines/scumm/player_towns.h
+++ b/engines/scumm/player/towns.h
diff --git a/engines/scumm/player_v1.cpp b/engines/scumm/player/v1.cpp
index 8e784e9866..25f42f143c 100644
--- a/engines/scumm/player_v1.cpp
+++ b/engines/scumm/player/v1.cpp
@@ -22,7 +22,7 @@
 
 
 #include "engines/engine.h"
-#include "scumm/player_v1.h"
+#include "scumm/player/v1.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {
diff --git a/engines/scumm/player_v1.h b/engines/scumm/player/v1.h
index 9e6063adc9..d6e08bd7ab 100644
--- a/engines/scumm/player_v1.h
+++ b/engines/scumm/player/v1.h
@@ -23,7 +23,7 @@
 #ifndef SCUMM_PLAYER_V1_H
 #define SCUMM_PLAYER_V1_H
 
-#include "scumm/player_v2.h"
+#include "scumm/player/v2.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_v2.cpp b/engines/scumm/player/v2.cpp
index 6910f5e0db..e3b3c978dd 100644
--- a/engines/scumm/player_v2.cpp
+++ b/engines/scumm/player/v2.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "scumm/player_v2.h"
+#include "scumm/player/v2.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {
diff --git a/engines/scumm/player_v2.h b/engines/scumm/player/v2.h
index d932585b8e..e23f74cb31 100644
--- a/engines/scumm/player_v2.h
+++ b/engines/scumm/player/v2.h
@@ -23,7 +23,7 @@
 #ifndef SCUMM_PLAYER_V2_H
 #define SCUMM_PLAYER_V2_H
 
-#include "scumm/player_v2base.h"
+#include "scumm/player/v2base.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player/v2a.cpp
index 07fc77b301..2350d7e048 100644
--- a/engines/scumm/player_v2a.cpp
+++ b/engines/scumm/player/v2a.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "engines/engine.h"
-#include "scumm/player_v2a.h"
+#include "scumm/player/v2a.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {
diff --git a/engines/scumm/player_v2a.h b/engines/scumm/player/v2a.h
index fe20b43846..cc2f4a7362 100644
--- a/engines/scumm/player_v2a.h
+++ b/engines/scumm/player/v2a.h
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 #include "scumm/music.h"
-#include "scumm/player_mod.h"
+#include "scumm/player/mod.h"
 
 class Mixer;
 
diff --git a/engines/scumm/player_v2base.cpp b/engines/scumm/player/v2base.cpp
index 0d3ad4b1b3..4b20cfc910 100644
--- a/engines/scumm/player_v2base.cpp
+++ b/engines/scumm/player/v2base.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "scumm/player_v2base.h"
+#include "scumm/player/v2base.h"
 #include "scumm/scumm.h"
 
 #define FREQ_HZ 236 // Don't change!
diff --git a/engines/scumm/player_v2base.h b/engines/scumm/player/v2base.h
index eb9ed941ca..eb9ed941ca 100644
--- a/engines/scumm/player_v2base.h
+++ b/engines/scumm/player/v2base.h
diff --git a/engines/scumm/player_v2cms.cpp b/engines/scumm/player/v2cms.cpp
index c1242e0645..30ca238860 100644
--- a/engines/scumm/player_v2cms.cpp
+++ b/engines/scumm/player/v2cms.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "scumm/player_v2cms.h"
+#include "scumm/player/v2cms.h"
 #include "scumm/scumm.h"
 #include "audio/mididrv.h"
 #include "audio/mixer.h"
diff --git a/engines/scumm/player_v2cms.h b/engines/scumm/player/v2cms.h
index 905c7c141e..d022a64a5f 100644
--- a/engines/scumm/player_v2cms.h
+++ b/engines/scumm/player/v2cms.h
@@ -23,7 +23,7 @@
 #ifndef SCUMM_PLAYER_V2CMS_H
 #define SCUMM_PLAYER_V2CMS_H
 
-#include "scumm/player_v2base.h"	// for channel_data
+#include "scumm/player/v2base.h"	// for channel_data
 
 class CMSEmulator;
 
diff --git a/engines/scumm/player_v3a.cpp b/engines/scumm/player/v3a.cpp
index 472cd1252b..b91bd49e6e 100644
--- a/engines/scumm/player_v3a.cpp
+++ b/engines/scumm/player/v3a.cpp
@@ -22,7 +22,7 @@
 
 
 #include "engines/engine.h"
-#include "scumm/player_v3a.h"
+#include "scumm/player/v3a.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {
diff --git a/engines/scumm/player_v3a.h b/engines/scumm/player/v3a.h
index 9449664e9b..0869c3398c 100644
--- a/engines/scumm/player_v3a.h
+++ b/engines/scumm/player/v3a.h
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 #include "scumm/music.h"
-#include "scumm/player_mod.h"
+#include "scumm/player/mod.h"
 
 class Mixer;
 
diff --git a/engines/scumm/player_v3m.cpp b/engines/scumm/player/v3m.cpp
index bf65ec797f..b910b36a18 100644
--- a/engines/scumm/player_v3m.cpp
+++ b/engines/scumm/player/v3m.cpp
@@ -91,7 +91,7 @@
 #include "common/translation.h"
 #include "engines/engine.h"
 #include "gui/message.h"
-#include "scumm/player_v3m.h"
+#include "scumm/player/v3m.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {
diff --git a/engines/scumm/player_v3m.h b/engines/scumm/player/v3m.h
index 359bab32a9..609ab8a9d7 100644
--- a/engines/scumm/player_v3m.h
+++ b/engines/scumm/player/v3m.h
@@ -27,7 +27,7 @@
 #include "common/util.h"
 #include "common/mutex.h"
 #include "scumm/music.h"
-#include "scumm/player_mac.h"
+#include "scumm/player/mac.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 
diff --git a/engines/scumm/player_v4a.cpp b/engines/scumm/player/v4a.cpp
index e791736f0e..de1301ee4c 100644
--- a/engines/scumm/player_v4a.cpp
+++ b/engines/scumm/player/v4a.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "engines/engine.h"
-#include "scumm/player_v4a.h"
+#include "scumm/player/v4a.h"
 #include "scumm/scumm.h"
 
 #include "common/file.h"
diff --git a/engines/scumm/player_v4a.h b/engines/scumm/player/v4a.h
index d01c70f295..d01c70f295 100644
--- a/engines/scumm/player_v4a.h
+++ b/engines/scumm/player/v4a.h
diff --git a/engines/scumm/player_v5m.cpp b/engines/scumm/player/v5m.cpp
index 500f3bbc40..8a2b7f6814 100644
--- a/engines/scumm/player_v5m.cpp
+++ b/engines/scumm/player/v5m.cpp
@@ -76,7 +76,7 @@
 #include "common/translation.h"
 #include "engines/engine.h"
 #include "gui/message.h"
-#include "scumm/player_v5m.h"
+#include "scumm/player/v5m.h"
 #include "scumm/scumm.h"
 
 namespace Scumm {
diff --git a/engines/scumm/player_v5m.h b/engines/scumm/player/v5m.h
index b2079ee331..ed51943226 100644
--- a/engines/scumm/player_v5m.h
+++ b/engines/scumm/player/v5m.h
@@ -27,7 +27,7 @@
 #include "common/util.h"
 #include "common/mutex.h"
 #include "scumm/music.h"
-#include "scumm/player_mac.h"
+#include "scumm/player/mac.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 3453e53a18..8081afd317 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -30,7 +30,7 @@
 #include "scumm/charset.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/imuse/imuse.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 2d4c326b68..8a15656b4b 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -27,7 +27,7 @@
 #include "scumm/scumm_v3.h"
 #include "scumm/scumm_v5.h"
 #include "scumm/sound.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 #include "scumm/util.h"
 #include "scumm/verbs.h"
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index d1a3de94b8..84d74032b8 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -45,26 +45,26 @@
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/smush/smush_mixer.h"
 #include "scumm/smush/smush_player.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 #include "scumm/insane/insane.h"
 #include "scumm/he/animation_he.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/he/logic_he.h"
 #include "scumm/he/sound_he.h"
 #include "scumm/object.h"
-#include "scumm/player_ad.h"
-#include "scumm/player_nes.h"
-#include "scumm/player_sid.h"
-#include "scumm/player_pce.h"
-#include "scumm/player_apple2.h"
-#include "scumm/player_v1.h"
-#include "scumm/player_v2.h"
-#include "scumm/player_v2cms.h"
-#include "scumm/player_v2a.h"
-#include "scumm/player_v3a.h"
-#include "scumm/player_v3m.h"
-#include "scumm/player_v4a.h"
-#include "scumm/player_v5m.h"
+#include "scumm/player/ad.h"
+#include "scumm/player/nes.h"
+#include "scumm/player/sid.h"
+#include "scumm/player/pce.h"
+#include "scumm/player/apple2.h"
+#include "scumm/player/v1.h"
+#include "scumm/player/v2.h"
+#include "scumm/player/v2cms.h"
+#include "scumm/player/v2a.h"
+#include "scumm/player/v3a.h"
+#include "scumm/player/v3m.h"
+#include "scumm/player/v4a.h"
+#include "scumm/player/v5m.h"
 #include "scumm/resource.h"
 #include "scumm/he/resource_he.h"
 #include "scumm/scumm_v0.h"
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index aaf7f90aca..ad4625e28c 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -30,7 +30,7 @@
 #include "scumm/file.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
-#include "scumm/player_towns.h"
+#include "scumm/player/towns.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"