diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b711ec798..e69e80266 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -21,7 +21,6 @@ set(libdevilutionx_SRCS
   loadsave.cpp
   menu.cpp
   minitext.cpp
-  misdat.cpp
   missiles.cpp
   movie.cpp
   msg.cpp
@@ -31,9 +30,7 @@ set(libdevilutionx_SRCS
   portal.cpp
   restrict.cpp
   sync.cpp
-  textdat.cpp
   tmsg.cpp
-  townerdat.cpp
   towners.cpp
   track.cpp
 
@@ -156,6 +153,11 @@ set(libdevilutionx_SRCS
 
   storm/storm_net.cpp
   storm/storm_svid.cpp
+
+  tables/misdat.cpp
+  tables/textdat.cpp
+  tables/townerdat.cpp
+
   utils/display.cpp
   utils/language.cpp
   utils/sdl_bilinear_scale.cpp
@@ -486,7 +488,7 @@ target_link_dependencies(libdevilutionx_logged_fstream PUBLIC
 )
 
 add_devilutionx_object_library(libdevilutionx_items
-  itemdat.cpp
+  tables/itemdat.cpp
   items.cpp
 )
 target_link_dependencies(libdevilutionx_items PUBLIC
@@ -523,7 +525,7 @@ target_link_libraries(libdevilutionx_log INTERFACE
 target_sources(libdevilutionx_log INTERFACE $<TARGET_OBJECTS:libdevilutionx_strings>)
 
 add_devilutionx_object_library(libdevilutionx_level_objects
-  objdat.cpp
+  tables/objdat.cpp
   objects.cpp
 )
 target_link_dependencies(libdevilutionx_level_objects PUBLIC
@@ -540,7 +542,7 @@ target_link_dependencies(libdevilutionx_level_objects PUBLIC
 )
 
 add_devilutionx_object_library(libdevilutionx_monster
-  monstdat.cpp
+  tables/monstdat.cpp
   monster.cpp
 )
 target_link_dependencies(libdevilutionx_monster
@@ -644,7 +646,7 @@ endif()
 
 add_devilutionx_object_library(libdevilutionx_player
   player.cpp
-  playerdat.cpp
+  tables/playerdat.cpp
 )
 target_link_dependencies(libdevilutionx_player
   PUBLIC
@@ -676,7 +678,7 @@ add_devilutionx_object_library(libdevilutionx_quick_messages
 )
 
 add_devilutionx_object_library(libdevilutionx_spells
-  spelldat.cpp
+  tables/spelldat.cpp
   spells.cpp
 )
 target_link_dependencies(libdevilutionx_spells PUBLIC
diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp
index 732882d44..f85599af4 100644
--- a/Source/DiabloUI/diabloui.cpp
+++ b/Source/DiabloUI/diabloui.cpp
@@ -50,8 +50,8 @@
 #include "init.hpp"
 #include "options.h"
 #include "player.h"
-#include "playerdat.hpp"
 #include "sound_effect_enums.h"
+#include "tables/playerdat.hpp"
 #include "utils/algorithm/container.hpp"
 #include "utils/display.h"
 #include "utils/enum_traits.h"
diff --git a/Source/DiabloUI/hero/selhero.cpp b/Source/DiabloUI/hero/selhero.cpp
index bb3287c41..883b4c1f4 100644
--- a/Source/DiabloUI/hero/selhero.cpp
+++ b/Source/DiabloUI/hero/selhero.cpp
@@ -33,7 +33,7 @@
 #include "levels/gendung.h"
 #include "options.h"
 #include "pfile.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/enum_traits.h"
 #include "utils/language.h"
 #include "utils/sdl_geometry.h"
diff --git a/Source/control/control.hpp b/Source/control/control.hpp
index dcee869db..fe5f08489 100644
--- a/Source/control/control.hpp
+++ b/Source/control/control.hpp
@@ -28,8 +28,8 @@
 #include "engine/render/text_render.hpp"
 #include "engine/size.hpp"
 #include "panels/ui_panels.hpp"
-#include "spelldat.h"
 #include "spells.h"
+#include "tables/spelldat.h"
 #include "utils/attributes.h"
 #include "utils/string_or_view.hpp"
 #include "utils/ui_fwd.h"
diff --git a/Source/dead.cpp b/Source/dead.cpp
index 99c41edd4..ee4b88d5e 100644
--- a/Source/dead.cpp
+++ b/Source/dead.cpp
@@ -11,8 +11,8 @@
 #include "headless_mode.hpp"
 #include "levels/gendung.h"
 #include "lighting.h"
-#include "misdat.h"
 #include "monster.h"
+#include "tables/misdat.h"
 
 namespace devilution {
 
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 7fcd30399..0339a9043 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -76,7 +76,6 @@
 #include "menu.h"
 #include "minitext.h"
 #include "missiles.h"
-#include "monstdat.h"
 #include "movie.h"
 #include "multi.h"
 #include "nthread.h"
@@ -88,7 +87,6 @@
 #include "panels/spell_book.hpp"
 #include "panels/spell_list.hpp"
 #include "pfile.h"
-#include "playerdat.hpp"
 #include "plrmsg.h"
 #include "qol/chatlog.h"
 #include "qol/floatingnumbers.h"
@@ -101,6 +99,8 @@
 #include "stores.h"
 #include "storm/storm_net.hpp"
 #include "storm/storm_svid.h"
+#include "tables/monstdat.h"
+#include "tables/playerdat.hpp"
 #include "towners.h"
 #include "track.h"
 #include "utils/console.h"
diff --git a/Source/diablo.h b/Source/diablo.h
index c977e252b..ad28ebb82 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -19,7 +19,7 @@
 #endif
 
 #ifdef _DEBUG
-#include "monstdat.h"
+#include "tables/monstdat.h"
 #endif
 #include "levels/gendung.h"
 #include "utils/attributes.h"
diff --git a/Source/discord/discord.cpp b/Source/discord/discord.cpp
index 95b022946..d21fbccf4 100644
--- a/Source/discord/discord.cpp
+++ b/Source/discord/discord.cpp
@@ -23,7 +23,7 @@
 #include "multi.h"
 #include "panels/charpanel.hpp"
 #include "player.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/language.h"
 #include "utils/str_cat.hpp"
 
diff --git a/Source/items.cpp b/Source/items.cpp
index 82c0ebb23..2f6ce462c 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -52,7 +52,6 @@
 #include "headless_mode.hpp"
 #include "inv.h"
 #include "inv_iterators.hpp"
-#include "itemdat.h"
 #include "items/validation.h"
 #include "levels/gendung.h"
 #include "levels/gendung_defs.hpp"
@@ -60,25 +59,26 @@
 #include "levels/town.h"
 #include "lighting.h"
 #include "minitext.h"
-#include "monstdat.h"
 #include "monster.h"
 #include "msg.h"
 #include "multi.h"
-#include "objdat.h"
 #include "objects.h"
 #include "options.h"
 #include "pack.h"
 #include "panels/info_box.hpp"
 #include "panels/ui_panels.hpp"
 #include "player.h"
-#include "playerdat.hpp"
 #include "qol/stash.h"
 #include "quests.h"
 #include "sound_effect_enums.h"
-#include "spelldat.h"
 #include "spells.h"
 #include "stores.h"
-#include "textdat.h"
+#include "tables/itemdat.h"
+#include "tables/monstdat.h"
+#include "tables/objdat.h"
+#include "tables/playerdat.hpp"
+#include "tables/spelldat.h"
+#include "tables/textdat.h"
 #include "utils/enum_traits.h"
 #include "utils/format_int.hpp"
 #include "utils/is_of.hpp"
diff --git a/Source/items.h b/Source/items.h
index a208e75d2..9c855a405 100644
--- a/Source/items.h
+++ b/Source/items.h
@@ -13,9 +13,9 @@
 #include "engine/animationinfo.h"
 #include "engine/point.hpp"
 #include "engine/surface.hpp"
-#include "itemdat.h"
 #include "levels/dun_tile.hpp"
 #include "monster.h"
+#include "tables/itemdat.h"
 #include "utils/is_of.hpp"
 #include "utils/string_or_view.hpp"
 
diff --git a/Source/items/validation.cpp b/Source/items/validation.cpp
index a6d4e6dbd..31ca442ae 100644
--- a/Source/items/validation.cpp
+++ b/Source/items/validation.cpp
@@ -9,10 +9,10 @@
 #include <cstdint>
 
 #include "items.h"
-#include "monstdat.h"
 #include "msg.h"
 #include "player.h"
 #include "spells.h"
+#include "tables/monstdat.h"
 #include "utils/endian_swap.hpp"
 #include "utils/is_of.hpp"
 
diff --git a/Source/levels/drlg_l3.cpp b/Source/levels/drlg_l3.cpp
index 3dc011d99..f805c5b30 100644
--- a/Source/levels/drlg_l3.cpp
+++ b/Source/levels/drlg_l3.cpp
@@ -10,10 +10,10 @@
 #include "levels/setmaps.h"
 #include "lighting.h"
 #include "monster.h"
-#include "objdat.h"
 #include "objects.h"
 #include "player.h"
 #include "quests.h"
+#include "tables/objdat.h"
 #include "utils/is_of.hpp"
 
 namespace devilution {
diff --git a/Source/levels/drlg_l4.cpp b/Source/levels/drlg_l4.cpp
index d351df4a7..39637e17e 100644
--- a/Source/levels/drlg_l4.cpp
+++ b/Source/levels/drlg_l4.cpp
@@ -12,8 +12,8 @@
 #include "levels/gendung.h"
 #include "monster.h"
 #include "multi.h"
-#include "objdat.h"
 #include "player.h"
+#include "tables/objdat.h"
 #include "utils/is_of.hpp"
 
 namespace devilution {
diff --git a/Source/levels/setmaps.cpp b/Source/levels/setmaps.cpp
index 6108682e8..3858632e4 100644
--- a/Source/levels/setmaps.cpp
+++ b/Source/levels/setmaps.cpp
@@ -14,9 +14,9 @@
 #include "levels/gendung.h"
 #include "levels/trigs.h"
 #include "msg.h"
-#include "objdat.h"
 #include "objects.h"
 #include "quests.h"
+#include "tables/objdat.h"
 #include "utils/language.h"
 
 namespace devilution {
diff --git a/Source/levels/themes.h b/Source/levels/themes.h
index 53bf20512..dd8fe597c 100644
--- a/Source/levels/themes.h
+++ b/Source/levels/themes.h
@@ -8,7 +8,7 @@
 #include <cstdint>
 
 #include "levels/gendung.h"
-#include "objdat.h"
+#include "tables/objdat.h"
 
 namespace devilution {
 
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index 86b8d099f..010658713 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -33,10 +33,10 @@
 #include "monsters/validation.hpp"
 #include "mpq/mpq_common.hpp"
 #include "pfile.h"
-#include "playerdat.hpp"
 #include "plrmsg.h"
 #include "qol/stash.h"
 #include "stores.h"
+#include "tables/playerdat.hpp"
 #include "utils/algorithm/container.hpp"
 #include "utils/endian_read.hpp"
 #include "utils/endian_swap.hpp"
diff --git a/Source/lua/modules/dev/monsters.cpp b/Source/lua/modules/dev/monsters.cpp
index c1f8822fa..b9843bcc0 100644
--- a/Source/lua/modules/dev/monsters.cpp
+++ b/Source/lua/modules/dev/monsters.cpp
@@ -11,9 +11,9 @@
 #include "levels/tile_properties.hpp"
 #include "lighting.h"
 #include "lua/metadoc.hpp"
-#include "monstdat.h"
 #include "monster.h"
 #include "player.h"
+#include "tables/monstdat.h"
 #include "utils/str_case.hpp"
 #include "utils/str_cat.hpp"
 
diff --git a/Source/lua/modules/dev/player/spells.cpp b/Source/lua/modules/dev/player/spells.cpp
index ae60c40cb..d21d81d4d 100644
--- a/Source/lua/modules/dev/player/spells.cpp
+++ b/Source/lua/modules/dev/player/spells.cpp
@@ -8,8 +8,8 @@
 
 #include "lua/metadoc.hpp"
 #include "msg.h"
-#include "spelldat.h"
 #include "spells.h"
+#include "tables/spelldat.h"
 #include "utils/str_cat.hpp"
 
 namespace devilution {
diff --git a/Source/lua/modules/items.cpp b/Source/lua/modules/items.cpp
index ec395807e..f83328aac 100644
--- a/Source/lua/modules/items.cpp
+++ b/Source/lua/modules/items.cpp
@@ -6,10 +6,10 @@
 #include <sol/sol.hpp>
 
 #include "data/file.hpp"
-#include "itemdat.h"
 #include "items.h"
 #include "lua/metadoc.hpp"
 #include "player.h"
+#include "tables/itemdat.h"
 #include "utils/utf8.hpp"
 
 namespace devilution {
diff --git a/Source/lua/modules/monsters.cpp b/Source/lua/modules/monsters.cpp
index 3fbb01b36..cc7b2f02e 100644
--- a/Source/lua/modules/monsters.cpp
+++ b/Source/lua/modules/monsters.cpp
@@ -7,7 +7,7 @@
 
 #include "data/file.hpp"
 #include "lua/metadoc.hpp"
-#include "monstdat.h"
+#include "tables/monstdat.h"
 #include "utils/language.h"
 #include "utils/str_split.hpp"
 
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index fdca168b5..075279377 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -17,8 +17,8 @@
 #include "engine/render/clx_render.hpp"
 #include "engine/render/primitive_render.hpp"
 #include "engine/render/text_render.hpp"
-#include "playerdat.hpp"
-#include "textdat.h"
+#include "tables/playerdat.hpp"
+#include "tables/textdat.h"
 #include "utils/language.h"
 #include "utils/timer.hpp"
 
diff --git a/Source/minitext.h b/Source/minitext.h
index 9bfdcb6e2..2dfd293e4 100644
--- a/Source/minitext.h
+++ b/Source/minitext.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "engine/surface.hpp"
-#include "textdat.h"
+#include "tables/textdat.h"
 
 namespace devilution {
 
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index adf087d61..896ce94d6 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -37,19 +37,19 @@
 #include "engine/world_tile.hpp"
 #include "function_ref.hpp"
 #include "interfac.h"
-#include "itemdat.h"
 #include "items.h"
 #include "levels/gendung.h"
 #include "levels/gendung_defs.hpp"
-#include "misdat.h"
-#include "monstdat.h"
 #include "msg.h"
 #include "multi.h"
 #include "objects.h"
 #include "player.h"
-#include "playerdat.hpp"
 #include "sound_effect_enums.h"
-#include "spelldat.h"
+#include "tables/itemdat.h"
+#include "tables/misdat.h"
+#include "tables/monstdat.h"
+#include "tables/playerdat.hpp"
+#include "tables/spelldat.h"
 #include "utils/enum_traits.h"
 #ifdef _DEBUG
 #include "debug.h"
diff --git a/Source/missiles.h b/Source/missiles.h
index 5cb6d0082..65fd2f604 100644
--- a/Source/missiles.h
+++ b/Source/missiles.h
@@ -12,10 +12,10 @@
 #include "engine/displacement.hpp"
 #include "engine/point.hpp"
 #include "engine/world_tile.hpp"
-#include "misdat.h"
 #include "monster.h"
 #include "player.h"
-#include "spelldat.h"
+#include "tables/misdat.h"
+#include "tables/spelldat.h"
 #include "utils/is_of.hpp"
 
 namespace devilution {
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 0f7791578..dbe869a64 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -59,7 +59,6 @@
 #include "game_mode.hpp"
 #include "headless_mode.hpp"
 #include "inv.h"
-#include "itemdat.h"
 #include "items.h"
 #include "levels/crypt.h"
 #include "levels/drlg_l4.h"
@@ -71,23 +70,24 @@
 #include "levels/trigs.h"
 #include "lighting.h"
 #include "minitext.h"
-#include "misdat.h"
 #include "missiles.h"
-#include "monstdat.h"
 #include "movie.h"
 #include "msg.h"
 #include "multi.h"
-#include "objdat.h"
 #include "objects.h"
 #include "options.h"
 #include "player.h"
-#include "playerdat.hpp"
 #include "qol/floatingnumbers.h"
 #include "quests.h"
 #include "sound_effect_enums.h"
-#include "spelldat.h"
 #include "storm/storm_net.hpp"
-#include "textdat.h"
+#include "tables/itemdat.h"
+#include "tables/misdat.h"
+#include "tables/monstdat.h"
+#include "tables/objdat.h"
+#include "tables/playerdat.hpp"
+#include "tables/spelldat.h"
+#include "tables/textdat.h"
 #include "utils/algorithm/container.hpp"
 #include "utils/attributes.h"
 #include "utils/cl2_to_clx.hpp"
diff --git a/Source/monster.h b/Source/monster.h
index 6b3ef4303..a469ecd26 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -23,10 +23,10 @@
 #include "engine/world_tile.hpp"
 #include "game_mode.hpp"
 #include "levels/dun_tile.hpp"
-#include "misdat.h"
-#include "monstdat.h"
-#include "spelldat.h"
-#include "textdat.h"
+#include "tables/misdat.h"
+#include "tables/monstdat.h"
+#include "tables/spelldat.h"
+#include "tables/textdat.h"
 #include "utils/language.h"
 
 namespace devilution {
diff --git a/Source/objects.cpp b/Source/objects.cpp
index f4c89389f..b489fa3d7 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -38,10 +38,10 @@
 #include "minitext.h"
 #include "missiles.h"
 #include "monster.h"
-#include "objdat.h"
 #include "options.h"
 #include "qol/stash.h"
 #include "stores.h"
+#include "tables/objdat.h"
 #include "towners.h"
 #include "track.h"
 #include "utils/algorithm/container.hpp"
diff --git a/Source/objects.h b/Source/objects.h
index b7c20c5e8..c9032454d 100644
--- a/Source/objects.h
+++ b/Source/objects.h
@@ -16,11 +16,11 @@
 #include "engine/point.hpp"
 #include "engine/rectangle.hpp"
 #include "engine/world_tile.hpp"
-#include "itemdat.h"
 #include "levels/dun_tile.hpp"
 #include "monster.h"
-#include "objdat.h"
-#include "textdat.h"
+#include "tables/itemdat.h"
+#include "tables/objdat.h"
+#include "tables/textdat.h"
 #include "utils/attributes.h"
 #include "utils/is_of.hpp"
 #include "utils/string_or_view.hpp"
diff --git a/Source/pack.cpp b/Source/pack.cpp
index 7755c465e..fc29573b9 100644
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@@ -11,9 +11,9 @@
 #include "game_mode.hpp"
 #include "items/validation.h"
 #include "loadsave.h"
-#include "playerdat.hpp"
 #include "plrmsg.h"
 #include "stores.h"
+#include "tables/playerdat.hpp"
 #include "utils/endian_read.hpp"
 #include "utils/endian_swap.hpp"
 #include "utils/is_of.hpp"
diff --git a/Source/panels/charpanel.cpp b/Source/panels/charpanel.cpp
index 75ee4f76d..d7d676746 100644
--- a/Source/panels/charpanel.cpp
+++ b/Source/panels/charpanel.cpp
@@ -15,7 +15,7 @@
 #include "engine/render/text_render.hpp"
 #include "panels/ui_panels.hpp"
 #include "player.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/algorithm/container.hpp"
 #include "utils/display.h"
 #include "utils/enum_traits.h"
diff --git a/Source/panels/partypanel.cpp b/Source/panels/partypanel.cpp
index 5eab18802..de59fad2c 100644
--- a/Source/panels/partypanel.cpp
+++ b/Source/panels/partypanel.cpp
@@ -17,10 +17,10 @@
 #include "inv.h"
 #include "options.h"
 #include "pfile.h"
-#include "playerdat.hpp"
 #include "qol/monhealthbar.h"
 #include "qol/stash.h"
 #include "stores.h"
+#include "tables/playerdat.hpp"
 #include "utils/status_macros.hpp"
 #include "utils/surface_to_clx.hpp"
 
diff --git a/Source/panels/spell_book.cpp b/Source/panels/spell_book.cpp
index e5ef1aea5..532fa7a9b 100644
--- a/Source/panels/spell_book.cpp
+++ b/Source/panels/spell_book.cpp
@@ -20,7 +20,7 @@
 #include "panels/spell_icons.hpp"
 #include "panels/ui_panels.hpp"
 #include "player.h"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 #include "utils/language.h"
 #include "utils/status_macros.hpp"
 
diff --git a/Source/panels/spell_icons.hpp b/Source/panels/spell_icons.hpp
index 8d3d2e357..db66cfe8f 100644
--- a/Source/panels/spell_icons.hpp
+++ b/Source/panels/spell_icons.hpp
@@ -8,7 +8,7 @@
 #include "engine/clx_sprite.hpp"
 #include "engine/point.hpp"
 #include "engine/surface.hpp"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 
 #define SPLICONLENGTH 56
 
diff --git a/Source/panels/spell_list.hpp b/Source/panels/spell_list.hpp
index 8dba57c02..0b706f96a 100644
--- a/Source/panels/spell_list.hpp
+++ b/Source/panels/spell_list.hpp
@@ -5,7 +5,7 @@
 
 #include "engine/point.hpp"
 #include "engine/surface.hpp"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 
 namespace devilution {
 
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 16325e742..ec96c6608 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -27,8 +27,8 @@
 #include "menu.h"
 #include "mpq/mpq_common.hpp"
 #include "pack.h"
-#include "playerdat.hpp"
 #include "qol/stash.h"
+#include "tables/playerdat.hpp"
 #include "utils/endian_read.hpp"
 #include "utils/endian_swap.hpp"
 #include "utils/file_util.h"
diff --git a/Source/player.h b/Source/player.h
index 1758e2207..5cc99ca19 100644
--- a/Source/player.h
+++ b/Source/player.h
@@ -26,8 +26,8 @@
 #include "levels/dun_tile.hpp"
 #include "levels/gendung.h"
 #include "multi.h"
-#include "playerdat.hpp"
-#include "spelldat.h"
+#include "tables/playerdat.hpp"
+#include "tables/spelldat.h"
 #include "utils/attributes.h"
 #include "utils/enum_traits.h"
 #include "utils/is_of.hpp"
diff --git a/Source/portal.cpp b/Source/portal.cpp
index 0f0769cf9..4d02adda5 100644
--- a/Source/portal.cpp
+++ b/Source/portal.cpp
@@ -6,10 +6,10 @@
 #include "portal.h"
 
 #include "lighting.h"
-#include "misdat.h"
 #include "missiles.h"
 #include "multi.h"
 #include "player.h"
+#include "tables/misdat.h"
 
 namespace devilution {
 
diff --git a/Source/qol/floatingnumbers.h b/Source/qol/floatingnumbers.h
index 660ae9d64..dff1f56a5 100644
--- a/Source/qol/floatingnumbers.h
+++ b/Source/qol/floatingnumbers.h
@@ -6,9 +6,9 @@
 #pragma once
 
 #include "engine/point.hpp"
-#include "misdat.h"
 #include "monster.h"
 #include "player.h"
+#include "tables/misdat.h"
 
 namespace devilution {
 
diff --git a/Source/qol/xpbar.cpp b/Source/qol/xpbar.cpp
index da0bba575..fa8fdc989 100644
--- a/Source/qol/xpbar.cpp
+++ b/Source/qol/xpbar.cpp
@@ -18,7 +18,7 @@
 #include "engine/render/primitive_render.hpp"
 #include "game_mode.hpp"
 #include "options.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/format_int.hpp"
 #include "utils/language.h"
 
diff --git a/Source/quests.cpp b/Source/quests.cpp
index 4d5d56920..32cf9cba5 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -29,7 +29,7 @@
 #include "options.h"
 #include "panels/ui_panels.hpp"
 #include "stores.h"
-#include "townerdat.hpp"
+#include "tables/townerdat.hpp"
 #include "towners.h"
 #include "utils/endian_swap.hpp"
 #include "utils/is_of.hpp"
diff --git a/Source/quests.h b/Source/quests.h
index 5a47bc8cc..549584e1d 100644
--- a/Source/quests.h
+++ b/Source/quests.h
@@ -12,9 +12,9 @@
 #include "engine/surface.hpp"
 #include "levels/gendung.h"
 #include "monster.h"
-#include "objdat.h"
 #include "panels/info_box.hpp"
-#include "textdat.h"
+#include "tables/objdat.h"
+#include "tables/textdat.h"
 #include "utils/attributes.h"
 
 namespace devilution {
diff --git a/Source/quests/validation.cpp b/Source/quests/validation.cpp
index 5bb9e786a..fd4df6b9d 100644
--- a/Source/quests/validation.cpp
+++ b/Source/quests/validation.cpp
@@ -8,9 +8,9 @@
 
 #include <cstdint>
 
-#include "objdat.h"
 #include "quests.h"
-#include "textdat.h"
+#include "tables/objdat.h"
+#include "tables/textdat.h"
 #include "utils/is_of.hpp"
 
 namespace devilution {
diff --git a/Source/quests/validation.hpp b/Source/quests/validation.hpp
index 205458add..2e11f121e 100644
--- a/Source/quests/validation.hpp
+++ b/Source/quests/validation.hpp
@@ -7,8 +7,8 @@
 
 #include <cstdint>
 
-#include "objdat.h"
 #include "quests.h"
+#include "tables/objdat.h"
 
 namespace devilution {
 
diff --git a/Source/stores.cpp b/Source/stores.cpp
index 0ddabdba0..289efdaab 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -26,7 +26,7 @@
 #include "options.h"
 #include "panels/info_box.hpp"
 #include "qol/stash.h"
-#include "townerdat.hpp"
+#include "tables/townerdat.hpp"
 #include "towners.h"
 #include "utils/format_int.hpp"
 #include "utils/language.h"
diff --git a/Source/itemdat.cpp b/Source/tables/itemdat.cpp
similarity index 97%
rename from Source/itemdat.cpp
rename to Source/tables/itemdat.cpp
index 619193765..8c26c7b4d 100644
--- a/Source/itemdat.cpp
+++ b/Source/tables/itemdat.cpp
@@ -4,7 +4,7 @@
  * Implementation of all item data.
  */
 
-#include "itemdat.h"
+#include "tables/itemdat.h"
 
 #include <string_view>
 #include <vector>
@@ -15,7 +15,7 @@
 #include "data/iterators.hpp"
 #include "data/record_reader.hpp"
 #include "lua/lua_global.hpp"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 #include "utils/str_cat.hpp"
 
 namespace devilution {
diff --git a/Source/itemdat.h b/Source/tables/itemdat.h
similarity index 95%
rename from Source/itemdat.h
rename to Source/tables/itemdat.h
index 146516fcd..77b8bcf1d 100644
--- a/Source/itemdat.h
+++ b/Source/tables/itemdat.h
@@ -13,8 +13,8 @@
 #include <expected.hpp>
 #include <magic_enum/magic_enum.hpp>
 
-#include "objdat.h"
-#include "spelldat.h"
+#include "tables/objdat.h"
+#include "tables/spelldat.h"
 
 namespace devilution {
 
diff --git a/Source/misdat.cpp b/Source/tables/misdat.cpp
similarity index 97%
rename from Source/misdat.cpp
rename to Source/tables/misdat.cpp
index ba1fdf1a5..620fa1e4c 100644
--- a/Source/misdat.cpp
+++ b/Source/tables/misdat.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of data related to missiles.
  */
-#include "misdat.h"
+#include "tables/misdat.h"
 
 #include <array>
 #include <cassert>
@@ -25,7 +25,7 @@
 #include "missiles.h"
 #include "mpq/mpq_common.hpp"
 #include "sound_effect_enums.h"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 #include "utils/file_name_generator.hpp"
 #include "utils/status_macros.hpp"
 #include "utils/str_cat.hpp"
diff --git a/Source/misdat.h b/Source/tables/misdat.h
similarity index 94%
rename from Source/misdat.h
rename to Source/tables/misdat.h
index 3c2c08d3d..eb4fb7452 100644
--- a/Source/misdat.h
+++ b/Source/tables/misdat.h
@@ -14,7 +14,7 @@
 
 #include "effects.h"
 #include "engine/clx_sprite.hpp"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 #include "utils/enum_traits.h"
 
 namespace devilution {
diff --git a/Source/monstdat.cpp b/Source/tables/monstdat.cpp
similarity index 96%
rename from Source/monstdat.cpp
rename to Source/tables/monstdat.cpp
index c948b39dd..33f4799e3 100644
--- a/Source/monstdat.cpp
+++ b/Source/tables/monstdat.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of all monster data.
  */
-#include "monstdat.h"
+#include "tables/monstdat.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -26,7 +26,7 @@
 #include "items.h"
 #include "lua/lua_global.hpp"
 #include "monster.h"
-#include "textdat.h"
+#include "tables/textdat.h"
 #include "utils/language.h"
 
 namespace devilution {
diff --git a/Source/monstdat.h b/Source/tables/monstdat.h
similarity index 94%
rename from Source/monstdat.h
rename to Source/tables/monstdat.h
index 43c6bb55c..8a7b1a7cd 100644
--- a/Source/monstdat.h
+++ b/Source/tables/monstdat.h
@@ -13,7 +13,7 @@
 #include <magic_enum/magic_enum.hpp>
 
 #include "cursor.h"
-#include "textdat.h"
+#include "tables/textdat.h"
 
 namespace devilution {
 
diff --git a/Source/objdat.cpp b/Source/tables/objdat.cpp
similarity index 95%
rename from Source/objdat.cpp
rename to Source/tables/objdat.cpp
index 9b54109b5..e1c3c79d8 100644
--- a/Source/objdat.cpp
+++ b/Source/tables/objdat.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of all object data.
  */
-#include "objdat.h"
+#include "tables/objdat.h"
 
 #include <string>
 #include <string_view>
diff --git a/Source/objdat.h b/Source/tables/objdat.h
similarity index 100%
rename from Source/objdat.h
rename to Source/tables/objdat.h
diff --git a/Source/playerdat.cpp b/Source/tables/playerdat.cpp
similarity index 96%
rename from Source/playerdat.cpp
rename to Source/tables/playerdat.cpp
index 3a7813d15..5c6b63d47 100644
--- a/Source/playerdat.cpp
+++ b/Source/tables/playerdat.cpp
@@ -4,7 +4,7 @@
  * Implementation of all player data.
  */
 
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 
 #include <algorithm>
 #include <array>
@@ -22,7 +22,7 @@
 #include "data/value_reader.hpp"
 #include "items.h"
 #include "player.h"
-#include "textdat.h"
+#include "tables/textdat.h"
 #include "utils/language.h"
 #include "utils/static_vector.hpp"
 #include "utils/str_cat.hpp"
diff --git a/Source/playerdat.hpp b/Source/tables/playerdat.hpp
similarity index 95%
rename from Source/playerdat.hpp
rename to Source/tables/playerdat.hpp
index 9af28ccd0..9f2bf68e3 100644
--- a/Source/playerdat.hpp
+++ b/Source/tables/playerdat.hpp
@@ -9,8 +9,8 @@
 #include <cstdint>
 
 #include "effects.h"
-#include "itemdat.h"
-#include "spelldat.h"
+#include "tables/itemdat.h"
+#include "tables/spelldat.h"
 
 namespace devilution {
 
diff --git a/Source/spelldat.cpp b/Source/tables/spelldat.cpp
similarity index 97%
rename from Source/spelldat.cpp
rename to Source/tables/spelldat.cpp
index 5e61a5137..501ae1561 100644
--- a/Source/spelldat.cpp
+++ b/Source/tables/spelldat.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of all spell data.
  */
-#include "spelldat.h"
+#include "tables/spelldat.h"
 
 #include <optional>
 #include <string_view>
diff --git a/Source/spelldat.h b/Source/tables/spelldat.h
similarity index 100%
rename from Source/spelldat.h
rename to Source/tables/spelldat.h
diff --git a/Source/textdat.cpp b/Source/tables/textdat.cpp
similarity index 95%
rename from Source/textdat.cpp
rename to Source/tables/textdat.cpp
index 0b02604eb..849d70dc1 100644
--- a/Source/textdat.cpp
+++ b/Source/tables/textdat.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of all dialog texts.
  */
-#include "textdat.h"
+#include "tables/textdat.h"
 
 #include <ankerl/unordered_dense.h>
 #include <fmt/core.h>
diff --git a/Source/textdat.h b/Source/tables/textdat.h
similarity index 100%
rename from Source/textdat.h
rename to Source/tables/textdat.h
diff --git a/Source/townerdat.cpp b/Source/tables/townerdat.cpp
similarity index 96%
rename from Source/townerdat.cpp
rename to Source/tables/townerdat.cpp
index 6932c432c..9f7ab2c15 100644
--- a/Source/townerdat.cpp
+++ b/Source/tables/townerdat.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of towner data loading from TSV files.
  */
-#include "townerdat.hpp"
+#include "tables/townerdat.hpp"
 
 #include <charconv>
 #include <optional>
diff --git a/Source/townerdat.hpp b/Source/tables/townerdat.hpp
similarity index 93%
rename from Source/townerdat.hpp
rename to Source/tables/townerdat.hpp
index 9cc12535e..08a011b66 100644
--- a/Source/townerdat.hpp
+++ b/Source/tables/townerdat.hpp
@@ -12,8 +12,8 @@
 
 #include "engine/direction.hpp"
 #include "levels/gendung.h"
-#include "objdat.h"
-#include "textdat.h"
+#include "tables/objdat.h"
+#include "tables/textdat.h"
 #include "towners.h"
 #include "utils/attributes.h"
 
diff --git a/Source/towners.cpp b/Source/towners.cpp
index db0f77fb5..3c8a28d3b 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -13,8 +13,8 @@
 #include "inv.h"
 #include "minitext.h"
 #include "stores.h"
-#include "textdat.h"
-#include "townerdat.hpp"
+#include "tables/textdat.h"
+#include "tables/townerdat.hpp"
 #include "utils/is_of.hpp"
 #include "utils/language.h"
 #include "utils/str_case.hpp"
diff --git a/test/pack_test.cpp b/test/pack_test.cpp
index 23771d6fd..8a3d28bb8 100644
--- a/test/pack_test.cpp
+++ b/test/pack_test.cpp
@@ -5,9 +5,9 @@
 #include "cursor.h"
 #include "engine/assets.hpp"
 #include "game_mode.hpp"
-#include "monstdat.h"
 #include "pack.h"
-#include "playerdat.hpp"
+#include "tables/monstdat.h"
+#include "tables/playerdat.hpp"
 #include "utils/endian_swap.hpp"
 #include "utils/is_of.hpp"
 #include "utils/paths.h"
diff --git a/test/player_test.cpp b/test/player_test.cpp
index 7a4cbed50..4d4108e7f 100644
--- a/test/player_test.cpp
+++ b/test/player_test.cpp
@@ -5,7 +5,7 @@
 #include "cursor.h"
 #include "engine/assets.hpp"
 #include "init.hpp"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 
 using namespace devilution;
 
diff --git a/test/quests_test.cpp b/test/quests_test.cpp
index f0aff22aa..8194c2b70 100644
--- a/test/quests_test.cpp
+++ b/test/quests_test.cpp
@@ -3,7 +3,7 @@
 
 #include "quests.h"
 
-#include "objdat.h" // For quest IDs
+#include "tables/objdat.h" // For quest IDs
 
 namespace devilution {
 void ResetQuests()
diff --git a/test/tile_properties_test.cpp b/test/tile_properties_test.cpp
index 56d502459..539a41ad7 100644
--- a/test/tile_properties_test.cpp
+++ b/test/tile_properties_test.cpp
@@ -5,8 +5,8 @@
 
 #include "levels/dun_tile.hpp"
 #include "levels/gendung.h"
-#include "objdat.h"
 #include "objects.h"
+#include "tables/objdat.h"
 
 namespace devilution {
 namespace {
diff --git a/test/timedemo_test.cpp b/test/timedemo_test.cpp
index b379ecc3e..824b8f062 100644
--- a/test/timedemo_test.cpp
+++ b/test/timedemo_test.cpp
@@ -14,10 +14,10 @@
 #include "headless_mode.hpp"
 #include "init.hpp"
 #include "lua/lua_global.hpp"
-#include "monstdat.h"
 #include "options.h"
 #include "pfile.h"
-#include "playerdat.hpp"
+#include "tables/monstdat.h"
+#include "tables/playerdat.hpp"
 #include "utils/display.h"
 #include "utils/paths.h"
 
diff --git a/test/townerdat_test.cpp b/test/townerdat_test.cpp
index 5137456f6..52343ca5f 100644
--- a/test/townerdat_test.cpp
+++ b/test/townerdat_test.cpp
@@ -7,7 +7,7 @@
 #endif
 
 #include "engine/assets.hpp"
-#include "townerdat.hpp"
+#include "tables/townerdat.hpp"
 #include "towners.h"
 #include "utils/paths.h"
 
diff --git a/test/vendor_test.cpp b/test/vendor_test.cpp
index 82a4e5ee8..d40083c20 100644
--- a/test/vendor_test.cpp
+++ b/test/vendor_test.cpp
@@ -3,8 +3,8 @@
 
 #include "items.h"
 #include "player.h"
-#include "playerdat.hpp"
 #include "stores.h"
+#include "tables/playerdat.hpp"
 
 #include "engine/assets.hpp"
 #include "engine/random.hpp"
diff --git a/test/writehero_test.cpp b/test/writehero_test.cpp
index 2d10f9f5f..892f7e18d 100644
--- a/test/writehero_test.cpp
+++ b/test/writehero_test.cpp
@@ -14,7 +14,7 @@
 #include "loadsave.h"
 #include "pack.h"
 #include "pfile.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/endian_swap.hpp"
 #include "utils/file_util.h"
 #include "utils/paths.h"