diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 1e44b0585..0f4e39f72 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -13,10 +13,6 @@ set(libdevilutionx_SRCS
   debug.cpp
   diablo.cpp
   doom.cpp
-  drlg_l1.cpp
-  drlg_l2.cpp
-  drlg_l3.cpp
-  drlg_l4.cpp
   dthread.cpp
   dx.cpp
   encrypt.cpp
@@ -24,7 +20,6 @@ set(libdevilutionx_SRCS
   error.cpp
   engine/assets.cpp
   gamemenu.cpp
-  gendung.cpp
   gmenu.cpp
   help.cpp
   hwcursor.cpp
@@ -58,19 +53,15 @@ set(libdevilutionx_SRCS
   quests.cpp
   restrict.cpp
   scrollrt.cpp
-  setmaps.cpp
   sha.cpp
   spelldat.cpp
   spells.cpp
   stores.cpp
   sync.cpp
   textdat.cpp
-  themes.cpp
   tmsg.cpp
-  town.cpp
   towners.cpp
   track.cpp
-  trigs.cpp
   controls/axis_direction.cpp
   controls/controller.cpp
   controls/controller_motion.cpp
@@ -95,6 +86,15 @@ set(libdevilutionx_SRCS
   engine/render/text_render.cpp
   engine/surface.cpp
   engine/trn.cpp
+  levels/drlg_l1.cpp
+  levels/drlg_l2.cpp
+  levels/drlg_l3.cpp
+  levels/drlg_l4.cpp
+  levels/gendung.cpp
+  levels/setmaps.cpp
+  levels/themes.cpp
+  levels/town.cpp
+  levels/trigs.cpp
   mpq/mpq_reader.cpp
   mpq/mpq_sdl_rwops.cpp
   mpq/mpq_writer.cpp
diff --git a/Source/DiabloUI/selgame.h b/Source/DiabloUI/selgame.h
index 7e86e5caa..17d2ecff0 100644
--- a/Source/DiabloUI/selgame.h
+++ b/Source/DiabloUI/selgame.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/automap.cpp b/Source/automap.cpp
index 121f974cf..7346a5082 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -10,10 +10,10 @@
 #include "control.h"
 #include "engine/load_file.hpp"
 #include "engine/render/automap_render.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
 #include "palette.h"
 #include "player.h"
-#include "setmaps.h"
 #include "utils/language.h"
 #include "utils/stdcompat/algorithm.hpp"
 #include "utils/ui_fwd.h"
diff --git a/Source/automap.h b/Source/automap.h
index 3b4d490e8..c5ec3b0f7 100644
--- a/Source/automap.h
+++ b/Source/automap.h
@@ -10,7 +10,7 @@
 #include "engine.h"
 #include "engine/displacement.hpp"
 #include "engine/point.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "utils/attributes.h"
 
 namespace devilution {
diff --git a/Source/control.cpp b/Source/control.cpp
index 03a7b217b..79cc170c1 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -28,6 +28,7 @@
 #include "init.h"
 #include "inv.h"
 #include "inv_iterators.hpp"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "minitext.h"
 #include "missiles.h"
@@ -41,7 +42,6 @@
 #include "qol/xpbar.h"
 #include "stores.h"
 #include "towners.h"
-#include "trigs.h"
 #include "utils/format_int.hpp"
 #include "utils/language.h"
 #include "utils/sdl_geometry.h"
diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
index 794b46db5..744c6f28b 100644
--- a/Source/controls/plrctrls.cpp
+++ b/Source/controls/plrctrls.cpp
@@ -25,6 +25,7 @@
 #include "hwcursor.hpp"
 #include "inv.h"
 #include "items.h"
+#include "levels/trigs.h"
 #include "minitext.h"
 #include "missiles.h"
 #include "panels/spell_list.hpp"
@@ -34,7 +35,6 @@
 #include "stores.h"
 #include "towners.h"
 #include "track.h"
-#include "trigs.h"
 #include "utils/log.hpp"
 
 #define SPLICONLENGTH 56
diff --git a/Source/controls/touch/renderers.cpp b/Source/controls/touch/renderers.cpp
index 06d4c3fec..13b6c30be 100644
--- a/Source/controls/touch/renderers.cpp
+++ b/Source/controls/touch/renderers.cpp
@@ -6,9 +6,9 @@
 #include "doom.h"
 #include "engine.h"
 #include "engine/render/cel_render.hpp"
-#include "gendung.h"
 #include "init.h"
 #include "inv.h"
+#include "levels/gendung.h"
 #include "minitext.h"
 #include "panels/ui_panels.hpp"
 #include "stores.h"
diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index 1ccb86b16..7964fba65 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -18,12 +18,12 @@
 #include "engine/render/cel_render.hpp"
 #include "hwcursor.hpp"
 #include "inv.h"
+#include "levels/trigs.h"
 #include "missiles.h"
 #include "qol/itemlabels.h"
 #include "qol/stash.h"
 #include "towners.h"
 #include "track.h"
-#include "trigs.h"
 #include "utils/attributes.h"
 #include "utils/language.h"
 #include "utils/utf8.hpp"
diff --git a/Source/dead.cpp b/Source/dead.cpp
index ffa41d676..f1b2e2de5 100644
--- a/Source/dead.cpp
+++ b/Source/dead.cpp
@@ -5,7 +5,7 @@
  */
 #include "dead.h"
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "lighting.h"
 #include "misdat.h"
 #include "monster.h"
diff --git a/Source/debug.cpp b/Source/debug.cpp
index 37847cf02..2ad54f09c 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -20,12 +20,12 @@
 #include "engine/point.hpp"
 #include "error.h"
 #include "inv.h"
+#include "levels/setmaps.h"
 #include "lighting.h"
 #include "monstdat.h"
 #include "monster.h"
 #include "plrmsg.h"
 #include "quests.h"
-#include "setmaps.h"
 #include "spells.h"
 #include "towners.h"
 #include "utils/language.h"
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index b0f1b968c..da085fb69 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -24,10 +24,6 @@
 #include "diablo.h"
 #include "discord/discord.h"
 #include "doom.h"
-#include "drlg_l1.h"
-#include "drlg_l2.h"
-#include "drlg_l3.h"
-#include "drlg_l4.h"
 #include "dx.h"
 #include "encrypt.h"
 #include "engine/cel_sprite.hpp"
@@ -37,11 +33,19 @@
 #include "engine/random.hpp"
 #include "error.h"
 #include "gamemenu.h"
-#include "gendung.h"
 #include "gmenu.h"
 #include "help.h"
 #include "hwcursor.hpp"
 #include "init.h"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l2.h"
+#include "levels/drlg_l3.h"
+#include "levels/drlg_l4.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
+#include "levels/themes.h"
+#include "levels/town.h"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "loadsave.h"
 #include "menu.h"
@@ -63,16 +67,12 @@
 #include "qol/stash.h"
 #include "qol/xpbar.h"
 #include "restrict.h"
-#include "setmaps.h"
 #include "sound.h"
 #include "stores.h"
 #include "storm/storm_net.hpp"
 #include "storm/storm_svid.h"
-#include "themes.h"
-#include "town.h"
 #include "towners.h"
 #include "track.h"
-#include "trigs.h"
 #include "utils/console.h"
 #include "utils/display.h"
 #include "utils/language.h"
diff --git a/Source/diablo.h b/Source/diablo.h
index 49b6d3491..faa27b1bb 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -10,8 +10,8 @@
 #ifdef _DEBUG
 #include "monstdat.h"
 #endif
-#include "gendung.h"
 #include "init.h"
+#include "levels/gendung.h"
 #include "utils/attributes.h"
 #include "utils/endian.hpp"
 
diff --git a/Source/discord/discord.cpp b/Source/discord/discord.cpp
index 4569e1a47..38dde97c5 100644
--- a/Source/discord/discord.cpp
+++ b/Source/discord/discord.cpp
@@ -12,12 +12,12 @@
 #include <fmt/format.h>
 
 #include "config.h"
-#include "gendung.h"
 #include "init.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
 #include "multi.h"
 #include "panels/charpanel.hpp"
 #include "player.h"
-#include "setmaps.h"
 #include "utils/language.h"
 
 namespace devilution {
diff --git a/Source/inv.cpp b/Source/inv.cpp
index bbe7e5c31..5fd2504ce 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -18,13 +18,13 @@
 #include "engine/size.hpp"
 #include "hwcursor.hpp"
 #include "inv_iterators.hpp"
+#include "levels/town.h"
 #include "minitext.h"
 #include "options.h"
 #include "panels/ui_panels.hpp"
 #include "plrmsg.h"
 #include "qol/stash.h"
 #include "stores.h"
-#include "town.h"
 #include "towners.h"
 #include "utils/format_int.hpp"
 #include "utils/language.h"
diff --git a/Source/items.cpp b/Source/items.cpp
index daa913d3b..672bbbc77 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -27,6 +27,7 @@
 #include "engine/render/text_render.hpp"
 #include "init.h"
 #include "inv_iterators.hpp"
+#include "levels/town.h"
 #include "lighting.h"
 #include "missiles.h"
 #include "options.h"
@@ -36,7 +37,6 @@
 #include "qol/stash.h"
 #include "spells.h"
 #include "stores.h"
-#include "town.h"
 #include "utils/format_int.hpp"
 #include "utils/language.h"
 #include "utils/math.h"
diff --git a/Source/drlg_l1.cpp b/Source/levels/drlg_l1.cpp
similarity index 96%
rename from Source/drlg_l1.cpp
rename to Source/levels/drlg_l1.cpp
index 2adfbd133..d1f27058b 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/levels/drlg_l1.cpp
@@ -1,14 +1,14 @@
 /**
- * @file drlg_l1.cpp
+ * @file levels/drlg_l1.cpp
  *
  * Implementation of the cathedral level generation algorithms.
  */
-#include "drlg_l1.h"
+#include "levels/drlg_l1.h"
 
 #include "engine/load_file.hpp"
 #include "engine/point.hpp"
 #include "engine/random.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "player.h"
 #include "quests.h"
 #include "utils/bitset2d.hpp"
diff --git a/Source/drlg_l1.h b/Source/levels/drlg_l1.h
similarity index 84%
rename from Source/drlg_l1.h
rename to Source/levels/drlg_l1.h
index efc951123..9b09906fb 100644
--- a/Source/drlg_l1.h
+++ b/Source/levels/drlg_l1.h
@@ -1,11 +1,11 @@
 /**
- * @file drlg_l1.h
+ * @file levels/drlg_l1.h
  *
  * Interface of the cathedral level generation algorithms.
  */
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l2.cpp b/Source/levels/drlg_l2.cpp
similarity index 94%
rename from Source/drlg_l2.cpp
rename to Source/levels/drlg_l2.cpp
index bf417ef59..6ddec0035 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/levels/drlg_l2.cpp
@@ -1,9 +1,9 @@
 /**
- * @file drlg_l2.cpp
+ * @file levels/drlg_l2.cpp
  *
  * Implementation of the catacombs level generation algorithms.
  */
-#include "drlg_l2.h"
+#include "levels/drlg_l2.h"
 
 #include <list>
 
@@ -11,10 +11,10 @@
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
 #include "engine/size.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
 #include "player.h"
 #include "quests.h"
-#include "setmaps.h"
 #include "utils/stdcompat/algorithm.hpp"
 
 namespace devilution {
diff --git a/Source/drlg_l2.h b/Source/levels/drlg_l2.h
similarity index 85%
rename from Source/drlg_l2.h
rename to Source/levels/drlg_l2.h
index e2d310930..5338545af 100644
--- a/Source/drlg_l2.h
+++ b/Source/levels/drlg_l2.h
@@ -1,11 +1,11 @@
 /**
- * @file drlg_l2.h
+ * @file levels/drlg_l2.h
  *
  * Interface of the catacombs level generation algorithms.
  */
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l3.cpp b/Source/levels/drlg_l3.cpp
similarity index 95%
rename from Source/drlg_l3.cpp
rename to Source/levels/drlg_l3.cpp
index 3c2ba719b..15059f13b 100644
--- a/Source/drlg_l3.cpp
+++ b/Source/levels/drlg_l3.cpp
@@ -1,21 +1,15 @@
-/**
- * @file drlg_l3.cpp
- *
- * Implementation of the caves level generation algorithms.
- */
-
 #include <algorithm>
 
 #include "engine/load_file.hpp"
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
 #include "lighting.h"
 #include "monster.h"
 #include "objdat.h"
 #include "objects.h"
 #include "quests.h"
-#include "setmaps.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l3.h b/Source/levels/drlg_l3.h
similarity index 80%
rename from Source/drlg_l3.h
rename to Source/levels/drlg_l3.h
index 880c8ddb6..9bd924e7d 100644
--- a/Source/drlg_l3.h
+++ b/Source/levels/drlg_l3.h
@@ -1,11 +1,11 @@
 /**
- * @file drlg_l3.h
+ * @file levels/drlg_l3.h
  *
  * Interface of the caves level generation algorithms.
  */
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l4.cpp b/Source/levels/drlg_l4.cpp
similarity index 96%
rename from Source/drlg_l4.cpp
rename to Source/levels/drlg_l4.cpp
index 1974c6e7b..cc32045e4 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/levels/drlg_l4.cpp
@@ -1,13 +1,13 @@
 /**
- * @file drlg_l4.cpp
+ * @file levels/drlg_l4.cpp
  *
  * Implementation of the hell level generation algorithms.
  */
-#include "drlg_l4.h"
+#include "levels/drlg_l4.h"
 
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "monster.h"
 #include "multi.h"
 #include "objdat.h"
diff --git a/Source/drlg_l4.h b/Source/levels/drlg_l4.h
similarity index 83%
rename from Source/drlg_l4.h
rename to Source/levels/drlg_l4.h
index 1e8235235..f14168b4c 100644
--- a/Source/drlg_l4.h
+++ b/Source/levels/drlg_l4.h
@@ -1,11 +1,11 @@
 /**
- * @file drlg_l4.h
+ * @file levels/drlg_l4.h
  *
  * Interface of the hell level generation algorithms.
  */
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/gendung.cpp b/Source/levels/gendung.cpp
similarity index 95%
rename from Source/gendung.cpp
rename to Source/levels/gendung.cpp
index 078311b29..67f92e37a 100644
--- a/Source/gendung.cpp
+++ b/Source/levels/gendung.cpp
@@ -1,22 +1,17 @@
-/**
- * @file gendung.cpp
- *
- * Implementation of general dungeon generation code.
- */
 #include <stack>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
-#include "drlg_l1.h"
-#include "drlg_l2.h"
-#include "drlg_l3.h"
-#include "drlg_l4.h"
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
 #include "init.h"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l2.h"
+#include "levels/drlg_l3.h"
+#include "levels/drlg_l4.h"
+#include "levels/town.h"
 #include "lighting.h"
 #include "options.h"
-#include "town.h"
 
 namespace devilution {
 
diff --git a/Source/gendung.h b/Source/levels/gendung.h
similarity index 100%
rename from Source/gendung.h
rename to Source/levels/gendung.h
diff --git a/Source/setmaps.cpp b/Source/levels/setmaps.cpp
similarity index 90%
rename from Source/setmaps.cpp
rename to Source/levels/setmaps.cpp
index ffdb189dd..9420c994f 100644
--- a/Source/setmaps.cpp
+++ b/Source/levels/setmaps.cpp
@@ -1,24 +1,19 @@
-/**
- * @file setmaps.cpp
- *
- * Implementation of functionality the special quest dungeons.
- */
-#include "setmaps.h"
+#include "levels/setmaps.h"
 
 #ifdef _DEBUG
 #include "debug.h"
 #endif
-#include "drlg_l1.h"
-#include "drlg_l2.h"
-#include "drlg_l3.h"
-#include "drlg_l4.h"
 #include "engine/load_file.hpp"
-#include "gendung.h"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l2.h"
+#include "levels/drlg_l3.h"
+#include "levels/drlg_l4.h"
+#include "levels/gendung.h"
+#include "levels/trigs.h"
 #include "objdat.h"
 #include "objects.h"
 #include "palette.h"
 #include "quests.h"
-#include "trigs.h"
 #include "utils/language.h"
 
 namespace devilution {
diff --git a/Source/setmaps.h b/Source/levels/setmaps.h
similarity index 100%
rename from Source/setmaps.h
rename to Source/levels/setmaps.h
diff --git a/Source/themes.cpp b/Source/levels/themes.cpp
similarity index 95%
rename from Source/themes.cpp
rename to Source/levels/themes.cpp
index b88e3de6b..1846b88a9 100644
--- a/Source/themes.cpp
+++ b/Source/levels/themes.cpp
@@ -3,16 +3,16 @@
  *
  * Implementation of the theme room placing algorithms.
  */
-#include "themes.h"
+#include "levels/themes.h"
 
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
 #include "items.h"
+#include "levels/trigs.h"
 #include "monster.h"
 #include "objects.h"
 #include "path.h"
 #include "quests.h"
-#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/themes.h b/Source/levels/themes.h
similarity index 89%
rename from Source/themes.h
rename to Source/levels/themes.h
index 5765afe9f..c14289a1a 100644
--- a/Source/themes.h
+++ b/Source/levels/themes.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "objdat.h"
 
 namespace devilution {
diff --git a/Source/town.cpp b/Source/levels/town.cpp
similarity index 93%
rename from Source/town.cpp
rename to Source/levels/town.cpp
index 1920c675a..a205b3e3f 100644
--- a/Source/town.cpp
+++ b/Source/levels/town.cpp
@@ -1,17 +1,12 @@
-/**
- * @file town.h
- *
- * Implementation of functionality for rendering the town, towners and calling other render routines.
- */
-#include "town.h"
+#include "levels/town.h"
 
-#include "drlg_l1.h"
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
 #include "init.h"
+#include "levels/drlg_l1.h"
+#include "levels/trigs.h"
 #include "player.h"
 #include "quests.h"
-#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/town.h b/Source/levels/town.h
similarity index 92%
rename from Source/town.h
rename to Source/levels/town.h
index 1a40c6b87..9330359ba 100644
--- a/Source/town.h
+++ b/Source/levels/town.h
@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include "gendung.h"
 #include "interfac.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/trigs.cpp b/Source/levels/trigs.cpp
similarity index 96%
rename from Source/trigs.cpp
rename to Source/levels/trigs.cpp
index b925f56c3..ccbbeee52 100644
--- a/Source/trigs.cpp
+++ b/Source/levels/trigs.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of functionality for triggering events when the player enters an area.
  */
-#include "trigs.h"
+#include "levels/trigs.h"
 
 #include <fmt/format.h>
 
diff --git a/Source/trigs.h b/Source/levels/trigs.h
similarity index 93%
rename from Source/trigs.h
rename to Source/levels/trigs.h
index 31323666c..c876863cf 100644
--- a/Source/trigs.h
+++ b/Source/levels/trigs.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include "engine/point.hpp"
-#include "gendung.h"
 #include "interfac.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index 1e4ff1adc..679c50ba9 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -19,10 +19,10 @@
 #include "engine/random.hpp"
 #include "init.h"
 #include "inv.h"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "monster.h"
 #include "spells.h"
-#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 285939f17..d288b47cc 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -14,14 +14,16 @@
 #include "control.h"
 #include "cursor.h"
 #include "dead.h"
-#include "drlg_l1.h"
-#include "drlg_l4.h"
 #include "engine/cel_header.hpp"
 #include "engine/load_file.hpp"
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
 #include "engine/render/cl2_render.hpp"
 #include "init.h"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l4.h"
+#include "levels/themes.h"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "minitext.h"
 #include "missiles.h"
@@ -29,9 +31,7 @@
 #include "options.h"
 #include "spelldat.h"
 #include "storm/storm_net.hpp"
-#include "themes.h"
 #include "towners.h"
-#include "trigs.h"
 #include "utils/file_name_generator.hpp"
 #include "utils/language.h"
 #include "utils/stdcompat/string_view.hpp"
diff --git a/Source/msg.cpp b/Source/msg.cpp
index a54ac3e85..431af2aa5 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -15,11 +15,13 @@
 #include "config.h"
 #include "control.h"
 #include "dead.h"
-#include "drlg_l1.h"
 #include "dthread.h"
 #include "encrypt.h"
 #include "engine/random.hpp"
 #include "gamemenu.h"
+#include "levels/drlg_l1.h"
+#include "levels/town.h"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "missiles.h"
 #include "nthread.h"
@@ -31,9 +33,7 @@
 #include "storm/storm_net.hpp"
 #include "sync.h"
 #include "tmsg.h"
-#include "town.h"
 #include "towners.h"
-#include "trigs.h"
 #include "utils/language.h"
 #include "utils/utf8.hpp"
 
diff --git a/Source/objdat.h b/Source/objdat.h
index ab4786bd1..5bf4362e2 100644
--- a/Source/objdat.h
+++ b/Source/objdat.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/objects.cpp b/Source/objects.cpp
index e83dde61a..728faf0ab 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -13,8 +13,6 @@
 #ifdef _DEBUG
 #include "debug.h"
 #endif
-#include "drlg_l1.h"
-#include "drlg_l4.h"
 #include "engine/load_file.hpp"
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
@@ -22,14 +20,16 @@
 #include "init.h"
 #include "inv.h"
 #include "inv_iterators.hpp"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l4.h"
+#include "levels/setmaps.h"
+#include "levels/themes.h"
 #include "lighting.h"
 #include "minitext.h"
 #include "missiles.h"
 #include "monster.h"
 #include "options.h"
-#include "setmaps.h"
 #include "stores.h"
-#include "themes.h"
 #include "towners.h"
 #include "track.h"
 #include "utils/language.h"
diff --git a/Source/palette.h b/Source/palette.h
index bc4effbb5..d59fc1c52 100644
--- a/Source/palette.h
+++ b/Source/palette.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/path.cpp b/Source/path.cpp
index 744a8cddd..ee3ecf7ec 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -7,7 +7,7 @@
 
 #include <array>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "objects.h"
 
 namespace devilution {
diff --git a/Source/player.h b/Source/player.h
index f2c228488..baec132fa 100644
--- a/Source/player.h
+++ b/Source/player.h
@@ -14,9 +14,9 @@
 #include "engine/animationinfo.h"
 #include "engine/cel_sprite.hpp"
 #include "engine/point.hpp"
-#include "gendung.h"
 #include "interfac.h"
 #include "items.h"
+#include "levels/gendung.h"
 #include "multi.h"
 #include "path.h"
 #include "spelldat.h"
diff --git a/Source/portal.h b/Source/portal.h
index 38ea8d6a4..449aaf47c 100644
--- a/Source/portal.h
+++ b/Source/portal.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "engine/point.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 
diff --git a/Source/quests.cpp b/Source/quests.cpp
index 4cefecfc7..32b977fa1 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -14,8 +14,9 @@
 #include "engine/random.hpp"
 #include "engine/render/cel_render.hpp"
 #include "engine/render/text_render.hpp"
-#include "gendung.h"
 #include "init.h"
+#include "levels/gendung.h"
+#include "levels/trigs.h"
 #include "minitext.h"
 #include "missiles.h"
 #include "monster.h"
@@ -23,7 +24,6 @@
 #include "panels/ui_panels.hpp"
 #include "stores.h"
 #include "towners.h"
-#include "trigs.h"
 #include "utils/language.h"
 #include "utils/utf8.hpp"
 
diff --git a/Source/quests.h b/Source/quests.h
index ffcdb8355..90a453609 100644
--- a/Source/quests.h
+++ b/Source/quests.h
@@ -10,7 +10,7 @@
 #include "engine.h"
 #include "engine/cel_sprite.hpp"
 #include "engine/point.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "monster.h"
 #include "objdat.h"
 #include "panels/info_box.hpp"
diff --git a/Source/sound.h b/Source/sound.h
index 18b068017..f4a862cb4 100644
--- a/Source/sound.h
+++ b/Source/sound.h
@@ -9,7 +9,7 @@
 #include <memory>
 #include <string>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "miniwin/miniwin.h"
 
 #ifndef NOSOUND
diff --git a/Source/sync.cpp b/Source/sync.cpp
index c8121652b..3bc5387c8 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -5,7 +5,7 @@
  */
 #include <climits>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "monster.h"
 #include "player.h"
 
diff --git a/test/dead_test.cpp b/test/dead_test.cpp
index a9bb5c25a..6dc94ea64 100644
--- a/test/dead_test.cpp
+++ b/test/dead_test.cpp
@@ -2,7 +2,7 @@
 
 #include "dead.h"
 #include "engine.h"
-#include "gendung.h"
+#include "levels/gendung.h"
 
 using namespace devilution;
 
diff --git a/test/drlg_l2_test.cpp b/test/drlg_l2_test.cpp
index 68d8ccca6..0144c7e60 100644
--- a/test/drlg_l2_test.cpp
+++ b/test/drlg_l2_test.cpp
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 #include "drlg_test.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "quests.h"
 
 using namespace devilution;
diff --git a/test/drlg_l3_test.cpp b/test/drlg_l3_test.cpp
index db2b2e505..5be8426f5 100644
--- a/test/drlg_l3_test.cpp
+++ b/test/drlg_l3_test.cpp
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 #include "drlg_test.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "quests.h"
 
 using namespace devilution;
diff --git a/test/drlg_l4_test.cpp b/test/drlg_l4_test.cpp
index 00644604e..939a4d13c 100644
--- a/test/drlg_l4_test.cpp
+++ b/test/drlg_l4_test.cpp
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 #include "drlg_test.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "multi.h"
 #include "quests.h"
 
diff --git a/test/drlg_test.hpp b/test/drlg_test.hpp
index 653f97ac6..80b6adf07 100644
--- a/test/drlg_test.hpp
+++ b/test/drlg_test.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "engine/load_file.hpp"
-#include "themes.h"
+#include "levels/themes.h"
 #include "utils/paths.h"
 
 using namespace devilution;
diff --git a/test/path_test.cpp b/test/path_test.cpp
index 47d2bc27f..acac4df79 100644
--- a/test/path_test.cpp
+++ b/test/path_test.cpp
@@ -3,7 +3,7 @@
 #include "path.h"
 
 // The following headers are included to access globals used in functions that have not been isolated yet.
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "objects.h"
 
 namespace devilution {