diff --git a/src/content/ContentReport.cpp b/src/content/ContentReport.cpp
index 7de04be5..c25a903a 100644
--- a/src/content/ContentReport.cpp
+++ b/src/content/ContentReport.cpp
@@ -8,7 +8,7 @@
 #include "items/ItemDef.hpp"
 #include "voxels/Block.hpp"
 #include "world/World.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "Content.hpp"
 
 ContentReport::ContentReport(
diff --git a/src/content/ContentReport.hpp b/src/content/ContentReport.hpp
index 3476b872..62893527 100644
--- a/src/content/ContentReport.hpp
+++ b/src/content/ContentReport.hpp
@@ -11,7 +11,7 @@
 #include "typedefs.hpp"
 #include "Content.hpp"
 #include "data/StructLayout.hpp"
-#include "files/world_regions_fwd.hpp"
+#include "world/files/world_regions_fwd.hpp"
 
 namespace fs = std::filesystem;
 
diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp
index 2c8cd02c..0cb90de8 100644
--- a/src/files/engine_paths.cpp
+++ b/src/files/engine_paths.cpp
@@ -9,7 +9,7 @@
 #include "util/stringutil.hpp"
 #include <utility>
 
-#include "WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "debug/Logger.hpp"
 
 static debug::Logger logger("engine-paths");
diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp
index 0f341322..ccdd59b1 100644
--- a/src/logic/ChunksController.cpp
+++ b/src/logic/ChunksController.cpp
@@ -4,7 +4,7 @@
 #include <memory>
 
 #include "content/Content.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "graphics/core/Mesh.hpp"
 #include "lighting/Lighting.hpp"
 #include "maths/voxmaths.hpp"
diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp
index 90106ec9..9eeea3a6 100644
--- a/src/logic/EngineController.cpp
+++ b/src/logic/EngineController.cpp
@@ -9,8 +9,8 @@
 #include "debug/Logger.hpp"
 #include "coders/json.hpp"
 #include "content/ContentReport.hpp"
-#include "files/WorldConverter.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldConverter.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "frontend/locale.hpp"
 #include "frontend/menu.hpp"
 #include "frontend/screens/LevelScreen.hpp"
diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp
index f99d7fd6..4404fb3a 100644
--- a/src/logic/LevelController.cpp
+++ b/src/logic/LevelController.cpp
@@ -4,7 +4,7 @@
 
 #include "debug/Logger.hpp"
 #include "engine/Engine.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "maths/voxmaths.hpp"
 #include "objects/Entities.hpp"
 #include "objects/Players.hpp"
diff --git a/src/logic/scripting/lua/libs/libpack.cpp b/src/logic/scripting/lua/libs/libpack.cpp
index 5b3977a4..3629679e 100644
--- a/src/logic/scripting/lua/libs/libpack.cpp
+++ b/src/logic/scripting/lua/libs/libpack.cpp
@@ -7,7 +7,7 @@
 #include "assets/AssetsLoader.hpp"
 #include "content/Content.hpp"
 #include "engine/Engine.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "files/engine_paths.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"
diff --git a/src/logic/scripting/lua/libs/libworld.cpp b/src/logic/scripting/lua/libs/libworld.cpp
index f858f963..24cfd733 100644
--- a/src/logic/scripting/lua/libs/libworld.cpp
+++ b/src/logic/scripting/lua/libs/libworld.cpp
@@ -6,7 +6,7 @@
 #include "assets/AssetsLoader.hpp"
 #include "coders/json.hpp"
 #include "engine/Engine.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "files/engine_paths.hpp"
 #include "files/files.hpp"
 #include "lighting/Lighting.hpp"
diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index bf9b2990..5b5a2cd9 100644
--- a/src/voxels/Chunks.cpp
+++ b/src/voxels/Chunks.cpp
@@ -9,7 +9,7 @@
 #include "data/StructLayout.hpp"
 #include "coders/byte_utils.hpp"
 #include "content/Content.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "graphics/core/Mesh.hpp"
 #include "lighting/Lightmap.hpp"
 #include "maths/aabb.hpp"
diff --git a/src/voxels/GlobalChunks.cpp b/src/voxels/GlobalChunks.cpp
index 1e67a374..a4c11151 100644
--- a/src/voxels/GlobalChunks.cpp
+++ b/src/voxels/GlobalChunks.cpp
@@ -5,7 +5,7 @@
 #include "content/Content.hpp"
 #include "coders/json.hpp"
 #include "debug/Logger.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "items/Inventories.hpp"
 #include "lighting/Lightmap.hpp"
 #include "maths/voxmaths.hpp"
diff --git a/src/voxels/compressed_chunks.cpp b/src/voxels/compressed_chunks.cpp
index 24cc02dd..9bc5bf7e 100644
--- a/src/voxels/compressed_chunks.cpp
+++ b/src/voxels/compressed_chunks.cpp
@@ -3,7 +3,7 @@
 #include "coders/rle.hpp"
 #include "coders/gzip.hpp"
 
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 
 inline constexpr int HAS_VOXELS = 0x1;
 inline constexpr int HAS_METADATA = 0x2;
diff --git a/src/world/World.cpp b/src/world/World.cpp
index 54785862..2319fe2c 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -7,7 +7,7 @@
 #include "content/Content.hpp"
 #include "content/ContentReport.hpp"
 #include "debug/Logger.hpp"
-#include "files/WorldFiles.hpp"
+#include "world/files/WorldFiles.hpp"
 #include "items/Inventories.hpp"
 #include "objects/Entities.hpp"
 #include "objects/Player.hpp"
diff --git a/src/files/RegionsLayer.cpp b/src/world/files/RegionsLayer.cpp
similarity index 100%
rename from src/files/RegionsLayer.cpp
rename to src/world/files/RegionsLayer.cpp
diff --git a/src/files/WorldConverter.cpp b/src/world/files/WorldConverter.cpp
similarity index 99%
rename from src/files/WorldConverter.cpp
rename to src/world/files/WorldConverter.cpp
index f9484142..25a0ca9d 100644
--- a/src/files/WorldConverter.cpp
+++ b/src/world/files/WorldConverter.cpp
@@ -6,7 +6,7 @@
 #include <utility>
 
 #include "content/ContentReport.hpp"
-#include "files/compatibility.hpp"
+#include "compatibility.hpp"
 #include "debug/Logger.hpp"
 #include "files/files.hpp"
 #include "objects/Player.hpp"
diff --git a/src/files/WorldConverter.hpp b/src/world/files/WorldConverter.hpp
similarity index 98%
rename from src/files/WorldConverter.hpp
rename to src/world/files/WorldConverter.hpp
index b7852c97..499fba3c 100644
--- a/src/files/WorldConverter.hpp
+++ b/src/world/files/WorldConverter.hpp
@@ -6,7 +6,7 @@
 
 #include "delegates.hpp"
 #include "interfaces/Task.hpp"
-#include "files/world_regions_fwd.hpp"
+#include "world/files/world_regions_fwd.hpp"
 #include "typedefs.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/files/WorldFiles.cpp b/src/world/files/WorldFiles.cpp
similarity index 100%
rename from src/files/WorldFiles.cpp
rename to src/world/files/WorldFiles.cpp
diff --git a/src/files/WorldFiles.hpp b/src/world/files/WorldFiles.hpp
similarity index 98%
rename from src/files/WorldFiles.hpp
rename to src/world/files/WorldFiles.hpp
index 2d8ff0f0..d8e1f62d 100644
--- a/src/files/WorldFiles.hpp
+++ b/src/world/files/WorldFiles.hpp
@@ -11,7 +11,7 @@
 #include "typedefs.hpp"
 #include "voxels/Chunk.hpp"
 #include "WorldRegions.hpp"
-#include "files.hpp"
+#include "files/files.hpp"
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/hash.hpp>
 
diff --git a/src/files/WorldRegions.cpp b/src/world/files/WorldRegions.cpp
similarity index 100%
rename from src/files/WorldRegions.cpp
rename to src/world/files/WorldRegions.cpp
diff --git a/src/files/WorldRegions.hpp b/src/world/files/WorldRegions.hpp
similarity index 99%
rename from src/files/WorldRegions.hpp
rename to src/world/files/WorldRegions.hpp
index ad0bc584..75be22ac 100644
--- a/src/files/WorldRegions.hpp
+++ b/src/world/files/WorldRegions.hpp
@@ -13,7 +13,7 @@
 #include "voxels/Chunk.hpp"
 #include "maths/voxmaths.hpp"
 #include "coders/compression.hpp"
-#include "files.hpp"
+#include "files/files.hpp"
 #include "world_regions_fwd.hpp"
 
 #define GLM_ENABLE_EXPERIMENTAL
diff --git a/src/files/compatibility.cpp b/src/world/files/compatibility.cpp
similarity index 100%
rename from src/files/compatibility.cpp
rename to src/world/files/compatibility.cpp
diff --git a/src/files/compatibility.hpp b/src/world/files/compatibility.hpp
similarity index 89%
rename from src/files/compatibility.hpp
rename to src/world/files/compatibility.hpp
index cf78b5bc..736c68a9 100644
--- a/src/files/compatibility.hpp
+++ b/src/world/files/compatibility.hpp
@@ -2,7 +2,7 @@
 
 #include "typedefs.hpp"
 #include "util/Buffer.hpp"
-#include "files/world_regions_fwd.hpp"
+#include "world/files/world_regions_fwd.hpp"
 
 namespace compatibility {
     /// @brief Convert region file from version 2 to 3
diff --git a/src/files/world_regions_fwd.hpp b/src/world/files/world_regions_fwd.hpp
similarity index 100%
rename from src/files/world_regions_fwd.hpp
rename to src/world/files/world_regions_fwd.hpp