diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index e5bfd292add..4f70c63299d 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -235,4 +235,3 @@ SaveStateDescriptor NeverhoodMetaEngine::querySaveMetaInfos(const char *target,
 #else
 	REGISTER_PLUGIN_STATIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngine);
 #endif
-
diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
index 99aea5d9381..49682b0d29c 100644
--- a/engines/neverhood/gamemodule.cpp
+++ b/engines/neverhood/gamemodule.cpp
@@ -24,27 +24,27 @@
 
 #include "neverhood/graphics.h"
 #include "neverhood/menumodule.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1100.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module1300.h"
-#include "neverhood/module1400.h"
-#include "neverhood/module1500.h"
-#include "neverhood/module1600.h"
-#include "neverhood/module1700.h"
-#include "neverhood/module1800.h"
-#include "neverhood/module1900.h"
-#include "neverhood/module2000.h"
-#include "neverhood/module2100.h"
-#include "neverhood/module2200.h"
-#include "neverhood/module2300.h"
-#include "neverhood/module2400.h"
-#include "neverhood/module2500.h"
-#include "neverhood/module2600.h"
-#include "neverhood/module2700.h"
-#include "neverhood/module2800.h"
-#include "neverhood/module2900.h"
-#include "neverhood/module3000.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1100.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module1300.h"
+#include "neverhood/modules/module1400.h"
+#include "neverhood/modules/module1500.h"
+#include "neverhood/modules/module1600.h"
+#include "neverhood/modules/module1700.h"
+#include "neverhood/modules/module1800.h"
+#include "neverhood/modules/module1900.h"
+#include "neverhood/modules/module2000.h"
+#include "neverhood/modules/module2100.h"
+#include "neverhood/modules/module2200.h"
+#include "neverhood/modules/module2300.h"
+#include "neverhood/modules/module2400.h"
+#include "neverhood/modules/module2500.h"
+#include "neverhood/modules/module2600.h"
+#include "neverhood/modules/module2700.h"
+#include "neverhood/modules/module2800.h"
+#include "neverhood/modules/module2900.h"
+#include "neverhood/modules/module3000.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module.cpp b/engines/neverhood/module.cpp
index 93b4134f6b2..e384b5a4d24 100644
--- a/engines/neverhood/module.cpp
+++ b/engines/neverhood/module.cpp
@@ -23,8 +23,8 @@
 #include "neverhood/module.h"
 #include "neverhood/navigationscene.h"
 #include "neverhood/smackerscene.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1500.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1500.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module.mk b/engines/neverhood/module.mk
index 59effb593cd..c7bfbb64608 100644
--- a/engines/neverhood/module.mk
+++ b/engines/neverhood/module.mk
@@ -13,27 +13,27 @@ MODULE_OBJS = \
 	menumodule.o \
 	microtiles.o \
 	module.o \
-	module1000.o \
-	module1100.o \
-	module1200.o \
-	module1300.o \
-	module1400.o \
-	module1500.o \
-	module1600.o \
-	module1700.o \
-	module1800.o \
-	module1900.o \
-	module2000.o \
-	module2100.o \
-	module2200.o \
-	module2300.o \
-	module2400.o \
-	module2500.o \
-	module2600.o \
-	module2700.o \
-	module2800.o \
-	module2900.o \
-	module3000.o \
+	modules/module1000.o \
+	modules/module1100.o \
+	modules/module1200.o \
+	modules/module1300.o \
+	modules/module1400.o \
+	modules/module1500.o \
+	modules/module1600.o \
+	modules/module1700.o \
+	modules/module1800.o \
+	modules/module1900.o \
+	modules/module2000.o \
+	modules/module2100.o \
+	modules/module2200.o \
+	modules/module2300.o \
+	modules/module2400.o \
+	modules/module2500.o \
+	modules/module2600.o \
+	modules/module2700.o \
+	modules/module2800.o \
+	modules/module2900.o \
+	modules/module3000.o \
 	mouse.o \
 	navigationscene.o \
 	neverhood.o \
diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/modules/module1000.cpp
similarity index 99%
rename from engines/neverhood/module1000.cpp
rename to engines/neverhood/modules/module1000.cpp
index 096072b7b6f..ef2872ba2e9 100644
--- a/engines/neverhood/module1000.cpp
+++ b/engines/neverhood/modules/module1000.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1000.h"
+#include "neverhood/modules/module1000.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module1000.h b/engines/neverhood/modules/module1000.h
similarity index 98%
rename from engines/neverhood/module1000.h
rename to engines/neverhood/modules/module1000.h
index 897d0264702..9977590a6a2 100644
--- a/engines/neverhood/module1000.h
+++ b/engines/neverhood/modules/module1000.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1000_H
-#define NEVERHOOD_MODULE1000_H
+#ifndef NEVERHOOD_MODULES_MODULE1000_H
+#define NEVERHOOD_MODULES_MODULE1000_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -297,4 +297,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1000_H */
+#endif /* NEVERHOOD_MODULES_MODULE1000_H */
diff --git a/engines/neverhood/module1100.cpp b/engines/neverhood/modules/module1100.cpp
similarity index 99%
rename from engines/neverhood/module1100.cpp
rename to engines/neverhood/modules/module1100.cpp
index 067018dea06..5a5e52e5b07 100644
--- a/engines/neverhood/module1100.cpp
+++ b/engines/neverhood/modules/module1100.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1100.h"
+#include "neverhood/modules/module1100.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/navigationscene.h"
 
diff --git a/engines/neverhood/module1100.h b/engines/neverhood/modules/module1100.h
similarity index 96%
rename from engines/neverhood/module1100.h
rename to engines/neverhood/modules/module1100.h
index e3fb7cba10a..373f6b703f8 100644
--- a/engines/neverhood/module1100.h
+++ b/engines/neverhood/modules/module1100.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1100_H
-#define NEVERHOOD_MODULE1100_H
+#ifndef NEVERHOOD_MODULES_MODULE1100_H
+#define NEVERHOOD_MODULES_MODULE1100_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -127,4 +127,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1100_H */
+#endif /* NEVERHOOD_MODULES_MODULE1100_H */
diff --git a/engines/neverhood/module1200.cpp b/engines/neverhood/modules/module1200.cpp
similarity index 99%
rename from engines/neverhood/module1200.cpp
rename to engines/neverhood/modules/module1200.cpp
index 1536114df89..3be3635645c 100644
--- a/engines/neverhood/module1200.cpp
+++ b/engines/neverhood/modules/module1200.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module1200.h b/engines/neverhood/modules/module1200.h
similarity index 98%
rename from engines/neverhood/module1200.h
rename to engines/neverhood/modules/module1200.h
index f6f97b4131f..c97dc989867 100644
--- a/engines/neverhood/module1200.h
+++ b/engines/neverhood/modules/module1200.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1200_H
-#define NEVERHOOD_MODULE1200_H
+#ifndef NEVERHOOD_MODULES_MODULE1200_H
+#define NEVERHOOD_MODULES_MODULE1200_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -213,4 +213,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1200_H */
+#endif /* NEVERHOOD_MODULES_MODULE1200_H */
diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/modules/module1300.cpp
similarity index 99%
rename from engines/neverhood/module1300.cpp
rename to engines/neverhood/modules/module1300.cpp
index 162d710f465..8dbfcf616c2 100644
--- a/engines/neverhood/module1300.cpp
+++ b/engines/neverhood/modules/module1300.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "neverhood/module1300.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module1400.h"
-#include "neverhood/module2200.h"
+#include "neverhood/modules/module1300.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module1400.h"
+#include "neverhood/modules/module2200.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/diskplayerscene.h"
 #include "neverhood/menumodule.h"
diff --git a/engines/neverhood/module1300.h b/engines/neverhood/modules/module1300.h
similarity index 98%
rename from engines/neverhood/module1300.h
rename to engines/neverhood/modules/module1300.h
index 147bfd06451..501f76304fb 100644
--- a/engines/neverhood/module1300.h
+++ b/engines/neverhood/modules/module1300.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1300_H
-#define NEVERHOOD_MODULE1300_H
+#ifndef NEVERHOOD_MODULES_MODULE1300_H
+#define NEVERHOOD_MODULES_MODULE1300_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -292,4 +292,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1300_H */
+#endif /* NEVERHOOD_MODULES_MODULE1300_H */
diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/modules/module1400.cpp
similarity index 99%
rename from engines/neverhood/module1400.cpp
rename to engines/neverhood/modules/module1400.cpp
index 8aa0632e908..4f69637ee0f 100644
--- a/engines/neverhood/module1400.cpp
+++ b/engines/neverhood/modules/module1400.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "neverhood/module1400.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module2100.h"
-#include "neverhood/module2200.h"
+#include "neverhood/modules/module1400.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module2100.h"
+#include "neverhood/modules/module2200.h"
 #include "neverhood/diskplayerscene.h"
 #include "neverhood/gamemodule.h"
 
diff --git a/engines/neverhood/module1400.h b/engines/neverhood/modules/module1400.h
similarity index 97%
rename from engines/neverhood/module1400.h
rename to engines/neverhood/modules/module1400.h
index 14857062c19..9a592c29527 100644
--- a/engines/neverhood/module1400.h
+++ b/engines/neverhood/modules/module1400.h
@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1400_H
-#define NEVERHOOD_MODULE1400_H
+#ifndef NEVERHOOD_MODULES_MODULE1400_H
+#define NEVERHOOD_MODULES_MODULE1400_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
@@ -278,4 +278,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1400_H */
+#endif /* NEVERHOOD_MODULES_MODULE1400_H */
diff --git a/engines/neverhood/module1500.cpp b/engines/neverhood/modules/module1500.cpp
similarity index 98%
rename from engines/neverhood/module1500.cpp
rename to engines/neverhood/modules/module1500.cpp
index c49e968dca5..2a9597b1fdb 100644
--- a/engines/neverhood/module1500.cpp
+++ b/engines/neverhood/modules/module1500.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1500.h"
+#include "neverhood/modules/module1500.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module1500.h b/engines/neverhood/modules/module1500.h
similarity index 93%
rename from engines/neverhood/module1500.h
rename to engines/neverhood/modules/module1500.h
index c17cb4516c3..f2449489182 100644
--- a/engines/neverhood/module1500.h
+++ b/engines/neverhood/modules/module1500.h
@@ -22,8 +22,8 @@
 
 // TODO: I couldn't come up with a better name than 'Module' so far
 
-#ifndef NEVERHOOD_MODULE1500_H
-#define NEVERHOOD_MODULE1500_H
+#ifndef NEVERHOOD_MODULES_MODULE1500_H
+#define NEVERHOOD_MODULES_MODULE1500_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -55,4 +55,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1500_H */
+#endif /* NEVERHOOD_MODULES_MODULE1500_H */
diff --git a/engines/neverhood/module1600.cpp b/engines/neverhood/modules/module1600.cpp
similarity index 99%
rename from engines/neverhood/module1600.cpp
rename to engines/neverhood/modules/module1600.cpp
index cc1aa2c3dee..f7e3c37d849 100644
--- a/engines/neverhood/module1600.cpp
+++ b/engines/neverhood/modules/module1600.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "neverhood/module1600.h"
+#include "neverhood/modules/module1600.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module2200.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module2200.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module1600.h b/engines/neverhood/modules/module1600.h
similarity index 96%
rename from engines/neverhood/module1600.h
rename to engines/neverhood/modules/module1600.h
index 0743767244d..0bf44ff7b83 100644
--- a/engines/neverhood/module1600.h
+++ b/engines/neverhood/modules/module1600.h
@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1600_H
-#define NEVERHOOD_MODULE1600_H
+#ifndef NEVERHOOD_MODULES_MODULE1600_H
+#define NEVERHOOD_MODULES_MODULE1600_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module3000.h"
+#include "neverhood/modules/module3000.h"
 
 namespace Neverhood {
 
@@ -180,4 +180,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1600_H */
+#endif /* NEVERHOOD_MODULES_MODULE1600_H */
diff --git a/engines/neverhood/module1700.cpp b/engines/neverhood/modules/module1700.cpp
similarity index 99%
rename from engines/neverhood/module1700.cpp
rename to engines/neverhood/modules/module1700.cpp
index 183b0b8e758..3a6d1f80cb4 100644
--- a/engines/neverhood/module1700.cpp
+++ b/engines/neverhood/modules/module1700.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1700.h"
+#include "neverhood/modules/module1700.h"
 #include "neverhood/gamemodule.h"
 
 namespace Neverhood {
diff --git a/engines/neverhood/module1700.h b/engines/neverhood/modules/module1700.h
similarity index 94%
rename from engines/neverhood/module1700.h
rename to engines/neverhood/modules/module1700.h
index 26e1a5e0b01..f57c411a186 100644
--- a/engines/neverhood/module1700.h
+++ b/engines/neverhood/modules/module1700.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1700_H
-#define NEVERHOOD_MODULE1700_H
+#ifndef NEVERHOOD_MODULES_MODULE1700_H
+#define NEVERHOOD_MODULES_MODULE1700_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -69,4 +69,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1700_H */
+#endif /* NEVERHOOD_MODULES_MODULE1700_H */
diff --git a/engines/neverhood/module1800.cpp b/engines/neverhood/modules/module1800.cpp
similarity index 99%
rename from engines/neverhood/module1800.cpp
rename to engines/neverhood/modules/module1800.cpp
index 99b51295b75..2a6057f9c80 100644
--- a/engines/neverhood/module1800.cpp
+++ b/engines/neverhood/modules/module1800.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1800.h"
+#include "neverhood/modules/module1800.h"
 #include "neverhood/navigationscene.h"
 #include "neverhood/menumodule.h"
 
diff --git a/engines/neverhood/module1800.h b/engines/neverhood/modules/module1800.h
similarity index 91%
rename from engines/neverhood/module1800.h
rename to engines/neverhood/modules/module1800.h
index 3c1d02e09c2..d3f3a635c30 100644
--- a/engines/neverhood/module1800.h
+++ b/engines/neverhood/modules/module1800.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1800_H
-#define NEVERHOOD_MODULE1800_H
+#ifndef NEVERHOOD_MODULES_MODULE1800_H
+#define NEVERHOOD_MODULES_MODULE1800_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -43,4 +43,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1800_H */
+#endif /* NEVERHOOD_MODULES_MODULE1800_H */
diff --git a/engines/neverhood/module1900.cpp b/engines/neverhood/modules/module1900.cpp
similarity index 99%
rename from engines/neverhood/module1900.cpp
rename to engines/neverhood/modules/module1900.cpp
index 348306f39bb..1a9ffa127b0 100644
--- a/engines/neverhood/module1900.cpp
+++ b/engines/neverhood/modules/module1900.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module1900.h"
+#include "neverhood/modules/module1900.h"
 #include "neverhood/gamemodule.h"
 
 namespace Neverhood {
diff --git a/engines/neverhood/module1900.h b/engines/neverhood/modules/module1900.h
similarity index 96%
rename from engines/neverhood/module1900.h
rename to engines/neverhood/modules/module1900.h
index 72dbf63a51f..abb5eb1d877 100644
--- a/engines/neverhood/module1900.h
+++ b/engines/neverhood/modules/module1900.h
@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE1900_H
-#define NEVERHOOD_MODULE1900_H
+#ifndef NEVERHOOD_MODULES_MODULE1900_H
+#define NEVERHOOD_MODULES_MODULE1900_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
@@ -140,4 +140,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE1900_H */
+#endif /* NEVERHOOD_MODULES_MODULE1900_H */
diff --git a/engines/neverhood/module2000.cpp b/engines/neverhood/modules/module2000.cpp
similarity index 99%
rename from engines/neverhood/module2000.cpp
rename to engines/neverhood/modules/module2000.cpp
index 71bcdc7e583..5039da1b01d 100644
--- a/engines/neverhood/module2000.cpp
+++ b/engines/neverhood/modules/module2000.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module2000.h"
+#include "neverhood/modules/module2000.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/navigationscene.h"
 
diff --git a/engines/neverhood/module2000.h b/engines/neverhood/modules/module2000.h
similarity index 90%
rename from engines/neverhood/module2000.h
rename to engines/neverhood/modules/module2000.h
index 9859c730067..fa62f9a70e2 100644
--- a/engines/neverhood/module2000.h
+++ b/engines/neverhood/modules/module2000.h
@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2000_H
-#define NEVERHOOD_MODULE2000_H
+#ifndef NEVERHOOD_MODULES_MODULE2000_H
+#define NEVERHOOD_MODULES_MODULE2000_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
@@ -52,4 +52,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2000_H */
+#endif /* NEVERHOOD_MODULES_MODULE2000_H */
diff --git a/engines/neverhood/module2100.cpp b/engines/neverhood/modules/module2100.cpp
similarity index 99%
rename from engines/neverhood/module2100.cpp
rename to engines/neverhood/modules/module2100.cpp
index cd7a3d5e245..0d7f3dd22ac 100644
--- a/engines/neverhood/module2100.cpp
+++ b/engines/neverhood/modules/module2100.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "neverhood/module2100.h"
+#include "neverhood/modules/module2100.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module2100.h b/engines/neverhood/modules/module2100.h
similarity index 95%
rename from engines/neverhood/module2100.h
rename to engines/neverhood/modules/module2100.h
index c2e7d09ff4b..369f5ac0cc4 100644
--- a/engines/neverhood/module2100.h
+++ b/engines/neverhood/modules/module2100.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2100_H
-#define NEVERHOOD_MODULE2100_H
+#ifndef NEVERHOOD_MODULES_MODULE2100_H
+#define NEVERHOOD_MODULES_MODULE2100_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -89,4 +89,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2100_H */
+#endif /* NEVERHOOD_MODULES_MODULE2100_H */
diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/modules/module2200.cpp
similarity index 99%
rename from engines/neverhood/module2200.cpp
rename to engines/neverhood/modules/module2200.cpp
index ddcfb3685c2..b8da0f64ff1 100644
--- a/engines/neverhood/module2200.cpp
+++ b/engines/neverhood/modules/module2200.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "neverhood/module2200.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module2200.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1200.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/diskplayerscene.h"
 
diff --git a/engines/neverhood/module2200.h b/engines/neverhood/modules/module2200.h
similarity index 98%
rename from engines/neverhood/module2200.h
rename to engines/neverhood/modules/module2200.h
index f1988716130..af7171dd53f 100644
--- a/engines/neverhood/module2200.h
+++ b/engines/neverhood/modules/module2200.h
@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2200_H
-#define NEVERHOOD_MODULE2200_H
+#ifndef NEVERHOOD_MODULES_MODULE2200_H
+#define NEVERHOOD_MODULES_MODULE2200_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1000.h"
+#include "neverhood/modules/module1000.h"
 #include "neverhood/graphics.h"
 
 namespace Neverhood {
@@ -372,4 +372,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2200_H */
+#endif /* NEVERHOOD_MODULES_MODULE2200_H */
diff --git a/engines/neverhood/module2300.cpp b/engines/neverhood/modules/module2300.cpp
similarity index 99%
rename from engines/neverhood/module2300.cpp
rename to engines/neverhood/modules/module2300.cpp
index bf0e866b2f0..34eca14beae 100644
--- a/engines/neverhood/module2300.cpp
+++ b/engines/neverhood/modules/module2300.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module2300.h"
+#include "neverhood/modules/module2300.h"
 #include "neverhood/navigationscene.h"
 
 namespace Neverhood {
diff --git a/engines/neverhood/module2300.h b/engines/neverhood/modules/module2300.h
similarity index 91%
rename from engines/neverhood/module2300.h
rename to engines/neverhood/modules/module2300.h
index 64f6c6d9375..0a1e1d57a48 100644
--- a/engines/neverhood/module2300.h
+++ b/engines/neverhood/modules/module2300.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2300_H
-#define NEVERHOOD_MODULE2300_H
+#ifndef NEVERHOOD_MODULES_MODULE2300_H
+#define NEVERHOOD_MODULES_MODULE2300_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -45,4 +45,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2300_H */
+#endif /* NEVERHOOD_MODULES_MODULE2300_H */
diff --git a/engines/neverhood/module2400.cpp b/engines/neverhood/modules/module2400.cpp
similarity index 99%
rename from engines/neverhood/module2400.cpp
rename to engines/neverhood/modules/module2400.cpp
index 369132187d0..450812a5f3d 100644
--- a/engines/neverhood/module2400.cpp
+++ b/engines/neverhood/modules/module2400.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module2400.h"
+#include "neverhood/modules/module2400.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module2400.h b/engines/neverhood/modules/module2400.h
similarity index 92%
rename from engines/neverhood/module2400.h
rename to engines/neverhood/modules/module2400.h
index 38664658ce0..b50fff91c4c 100644
--- a/engines/neverhood/module2400.h
+++ b/engines/neverhood/modules/module2400.h
@@ -20,19 +20,19 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2400_H
-#define NEVERHOOD_MODULE2400_H
+#ifndef NEVERHOOD_MODULES_MODULE2400_H
+#define NEVERHOOD_MODULES_MODULE2400_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1100.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module2100.h"
-#include "neverhood/module2200.h"
-#include "neverhood/module2800.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1100.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module2100.h"
+#include "neverhood/modules/module2200.h"
+#include "neverhood/modules/module2800.h"
 #include "neverhood/diskplayerscene.h"
 
 namespace Neverhood {
@@ -179,4 +179,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2400_H */
+#endif /* NEVERHOOD_MODULES_MODULE2400_H */
diff --git a/engines/neverhood/module2500.cpp b/engines/neverhood/modules/module2500.cpp
similarity index 99%
rename from engines/neverhood/module2500.cpp
rename to engines/neverhood/modules/module2500.cpp
index 1623e4ca90d..a997b5aab15 100644
--- a/engines/neverhood/module2500.cpp
+++ b/engines/neverhood/modules/module2500.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "neverhood/module2500.h"
-#include "neverhood/module1600.h"
+#include "neverhood/modules/module2500.h"
+#include "neverhood/modules/module1600.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module2500.h b/engines/neverhood/modules/module2500.h
similarity index 92%
rename from engines/neverhood/module2500.h
rename to engines/neverhood/modules/module2500.h
index 10301b089dc..07db7907d54 100644
--- a/engines/neverhood/module2500.h
+++ b/engines/neverhood/modules/module2500.h
@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2500_H
-#define NEVERHOOD_MODULE2500_H
+#ifndef NEVERHOOD_MODULES_MODULE2500_H
+#define NEVERHOOD_MODULES_MODULE2500_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1600.h"
-#include "neverhood/module2700.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1600.h"
+#include "neverhood/modules/module2700.h"
 
 namespace Neverhood {
 
@@ -98,4 +98,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2500_H */
+#endif /* NEVERHOOD_MODULES_MODULE2500_H */
diff --git a/engines/neverhood/module2600.cpp b/engines/neverhood/modules/module2600.cpp
similarity index 99%
rename from engines/neverhood/module2600.cpp
rename to engines/neverhood/modules/module2600.cpp
index 04a91475a16..b8dbf7bff11 100644
--- a/engines/neverhood/module2600.cpp
+++ b/engines/neverhood/modules/module2600.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module2600.h"
+#include "neverhood/modules/module2600.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module2600.h b/engines/neverhood/modules/module2600.h
similarity index 94%
rename from engines/neverhood/module2600.h
rename to engines/neverhood/modules/module2600.h
index 8f2f3779fec..d972e0fb0d5 100644
--- a/engines/neverhood/module2600.h
+++ b/engines/neverhood/modules/module2600.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2600_H
-#define NEVERHOOD_MODULE2600_H
+#ifndef NEVERHOOD_MODULES_MODULE2600_H
+#define NEVERHOOD_MODULES_MODULE2600_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -71,4 +71,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2600_H */
+#endif /* NEVERHOOD_MODULES_MODULE2600_H */
diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/modules/module2700.cpp
similarity index 99%
rename from engines/neverhood/module2700.cpp
rename to engines/neverhood/modules/module2700.cpp
index 53e73af1798..8b69bc050e8 100644
--- a/engines/neverhood/module2700.cpp
+++ b/engines/neverhood/modules/module2700.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "neverhood/module2700.h"
+#include "neverhood/modules/module2700.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1000.h"
+#include "neverhood/modules/module1000.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module2700.h b/engines/neverhood/modules/module2700.h
similarity index 96%
rename from engines/neverhood/module2700.h
rename to engines/neverhood/modules/module2700.h
index 5861c2e4b58..003666bb7ff 100644
--- a/engines/neverhood/module2700.h
+++ b/engines/neverhood/modules/module2700.h
@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2700_H
-#define NEVERHOOD_MODULE2700_H
+#ifndef NEVERHOOD_MODULES_MODULE2700_H
+#define NEVERHOOD_MODULES_MODULE2700_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1600.h"
+#include "neverhood/modules/module1600.h"
 
 namespace Neverhood {
 
@@ -179,4 +179,4 @@ public:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2700_H */
+#endif /* NEVERHOOD_MODULES_MODULE2700_H */
diff --git a/engines/neverhood/module2800.cpp b/engines/neverhood/modules/module2800.cpp
similarity index 99%
rename from engines/neverhood/module2800.cpp
rename to engines/neverhood/modules/module2800.cpp
index d81445cf506..183de8e6b27 100644
--- a/engines/neverhood/module2800.cpp
+++ b/engines/neverhood/modules/module2800.cpp
@@ -20,12 +20,12 @@
  *
  */
 
-#include "neverhood/module2800.h"
+#include "neverhood/modules/module2800.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1000.h"
-#include "neverhood/module1200.h"
-#include "neverhood/module1700.h"
-#include "neverhood/module2200.h"
+#include "neverhood/modules/module1000.h"
+#include "neverhood/modules/module1200.h"
+#include "neverhood/modules/module1700.h"
+#include "neverhood/modules/module2200.h"
 #include "neverhood/diskplayerscene.h"
 
 namespace Neverhood {
diff --git a/engines/neverhood/module2800.h b/engines/neverhood/modules/module2800.h
similarity index 99%
rename from engines/neverhood/module2800.h
rename to engines/neverhood/modules/module2800.h
index 970de3cbdfc..fe62f113079 100644
--- a/engines/neverhood/module2800.h
+++ b/engines/neverhood/modules/module2800.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2800_H
-#define NEVERHOOD_MODULE2800_H
+#ifndef NEVERHOOD_MODULES_MODULE2800_H
+#define NEVERHOOD_MODULES_MODULE2800_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -502,4 +502,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2800_H */
+#endif /* NEVERHOOD_MODULES_MODULE2800_H */
diff --git a/engines/neverhood/module2900.cpp b/engines/neverhood/modules/module2900.cpp
similarity index 97%
rename from engines/neverhood/module2900.cpp
rename to engines/neverhood/modules/module2900.cpp
index 1e14d37fd57..bd95b82f4c6 100644
--- a/engines/neverhood/module2900.cpp
+++ b/engines/neverhood/modules/module2900.cpp
@@ -20,14 +20,14 @@
  *
  */
 
-#include "neverhood/module2900.h"
+#include "neverhood/modules/module2900.h"
 #include "neverhood/gamemodule.h"
-#include "neverhood/module1100.h"
-#include "neverhood/module1300.h"
-#include "neverhood/module1700.h"
-#include "neverhood/module2000.h"
-#include "neverhood/module2100.h"
-#include "neverhood/module2800.h"
+#include "neverhood/modules/module1100.h"
+#include "neverhood/modules/module1300.h"
+#include "neverhood/modules/module1700.h"
+#include "neverhood/modules/module2000.h"
+#include "neverhood/modules/module2100.h"
+#include "neverhood/modules/module2800.h"
 
 namespace Neverhood {
 
diff --git a/engines/neverhood/module2900.h b/engines/neverhood/modules/module2900.h
similarity index 95%
rename from engines/neverhood/module2900.h
rename to engines/neverhood/modules/module2900.h
index 19514399e50..75b29567f69 100644
--- a/engines/neverhood/module2900.h
+++ b/engines/neverhood/modules/module2900.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE2900_H
-#define NEVERHOOD_MODULE2900_H
+#ifndef NEVERHOOD_MODULES_MODULE2900_H
+#define NEVERHOOD_MODULES_MODULE2900_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
@@ -99,4 +99,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE2900_H */
+#endif /* NEVERHOOD_MODULES_MODULE2900_H */
diff --git a/engines/neverhood/module3000.cpp b/engines/neverhood/modules/module3000.cpp
similarity index 99%
rename from engines/neverhood/module3000.cpp
rename to engines/neverhood/modules/module3000.cpp
index d08ff9d6aef..2bdb9f0497e 100644
--- a/engines/neverhood/module3000.cpp
+++ b/engines/neverhood/modules/module3000.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "neverhood/module3000.h"
+#include "neverhood/modules/module3000.h"
 #include "neverhood/gamemodule.h"
 #include "neverhood/navigationscene.h"
 
diff --git a/engines/neverhood/module3000.h b/engines/neverhood/modules/module3000.h
similarity index 97%
rename from engines/neverhood/module3000.h
rename to engines/neverhood/modules/module3000.h
index 0fd1a1ed706..7634360d7c9 100644
--- a/engines/neverhood/module3000.h
+++ b/engines/neverhood/modules/module3000.h
@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef NEVERHOOD_MODULE3000_H
-#define NEVERHOOD_MODULE3000_H
+#ifndef NEVERHOOD_MODULES_MODULE3000_H
+#define NEVERHOOD_MODULES_MODULE3000_H
 
 #include "neverhood/neverhood.h"
 #include "neverhood/module.h"
 #include "neverhood/scene.h"
-#include "neverhood/module1200.h"
+#include "neverhood/modules/module1200.h"
 
 namespace Neverhood {
 
@@ -252,4 +252,4 @@ protected:
 
 } // End of namespace Neverhood
 
-#endif /* NEVERHOOD_MODULE3000_H */
+#endif /* NEVERHOOD_MODULES_MODULE3000_H */