diff --git a/source/renderer/Cube.cpp b/source/model/Cube.cpp
similarity index 100%
rename from source/renderer/Cube.cpp
rename to source/model/Cube.cpp
diff --git a/source/renderer/Cube.hpp b/source/model/Cube.hpp
similarity index 100%
rename from source/renderer/Cube.hpp
rename to source/model/Cube.hpp
diff --git a/source/world/entity/Models/HumanoidModel.cpp b/source/model/HumanoidModel.cpp
similarity index 100%
rename from source/world/entity/Models/HumanoidModel.cpp
rename to source/model/HumanoidModel.cpp
diff --git a/source/world/entity/Models/HumanoidModel.hpp b/source/model/HumanoidModel.hpp
similarity index 100%
rename from source/world/entity/Models/HumanoidModel.hpp
rename to source/model/HumanoidModel.hpp
diff --git a/source/world/entity/Models/Model.cpp b/source/model/Model.cpp
similarity index 100%
rename from source/world/entity/Models/Model.cpp
rename to source/model/Model.cpp
diff --git a/source/world/entity/Models/Model.hpp b/source/model/Model.hpp
similarity index 100%
rename from source/world/entity/Models/Model.hpp
rename to source/model/Model.hpp
diff --git a/source/renderer/PolygonQuad.cpp b/source/model/PolygonQuad.cpp
similarity index 100%
rename from source/renderer/PolygonQuad.cpp
rename to source/model/PolygonQuad.cpp
diff --git a/source/renderer/PolygonQuad.hpp b/source/model/PolygonQuad.hpp
similarity index 100%
rename from source/renderer/PolygonQuad.hpp
rename to source/model/PolygonQuad.hpp
diff --git a/source/input/Controller.cpp b/source/player/input/Controller.cpp
similarity index 100%
rename from source/input/Controller.cpp
rename to source/player/input/Controller.cpp
diff --git a/source/input/Controller.hpp b/source/player/input/Controller.hpp
similarity index 100%
rename from source/input/Controller.hpp
rename to source/player/input/Controller.hpp
diff --git a/source/input/ControllerTurnInput.cpp b/source/player/input/ControllerTurnInput.cpp
similarity index 100%
rename from source/input/ControllerTurnInput.cpp
rename to source/player/input/ControllerTurnInput.cpp
diff --git a/source/input/ControllerTurnInput.hpp b/source/player/input/ControllerTurnInput.hpp
similarity index 100%
rename from source/input/ControllerTurnInput.hpp
rename to source/player/input/ControllerTurnInput.hpp
diff --git a/source/input/ITurnInput.cpp b/source/player/input/ITurnInput.cpp
similarity index 100%
rename from source/input/ITurnInput.cpp
rename to source/player/input/ITurnInput.cpp
diff --git a/source/input/ITurnInput.hpp b/source/player/input/ITurnInput.hpp
similarity index 100%
rename from source/input/ITurnInput.hpp
rename to source/player/input/ITurnInput.hpp
diff --git a/source/input/Keyboard.cpp b/source/player/input/Keyboard.cpp
similarity index 100%
rename from source/input/Keyboard.cpp
rename to source/player/input/Keyboard.cpp
diff --git a/source/input/Keyboard.hpp b/source/player/input/Keyboard.hpp
similarity index 100%
rename from source/input/Keyboard.hpp
rename to source/player/input/Keyboard.hpp
diff --git a/source/input/KeyboardInput.cpp b/source/player/input/KeyboardInput.cpp
similarity index 100%
rename from source/input/KeyboardInput.cpp
rename to source/player/input/KeyboardInput.cpp
diff --git a/source/input/KeyboardInput.hpp b/source/player/input/KeyboardInput.hpp
similarity index 100%
rename from source/input/KeyboardInput.hpp
rename to source/player/input/KeyboardInput.hpp
diff --git a/source/input/Mouse.cpp b/source/player/input/Mouse.cpp
similarity index 100%
rename from source/input/Mouse.cpp
rename to source/player/input/Mouse.cpp
diff --git a/source/input/Mouse.hpp b/source/player/input/Mouse.hpp
similarity index 100%
rename from source/input/Mouse.hpp
rename to source/player/input/Mouse.hpp
diff --git a/source/input/MouseTurnInput.cpp b/source/player/input/MouseTurnInput.cpp
similarity index 100%
rename from source/input/MouseTurnInput.cpp
rename to source/player/input/MouseTurnInput.cpp
diff --git a/source/input/MouseTurnInput.hpp b/source/player/input/MouseTurnInput.hpp
similarity index 100%
rename from source/input/MouseTurnInput.hpp
rename to source/player/input/MouseTurnInput.hpp
diff --git a/source/input/User.hpp b/source/player/input/User.hpp
similarity index 100%
rename from source/input/User.hpp
rename to source/player/input/User.hpp
diff --git a/source/world/renderer/Chunk.cpp b/source/renderer/Chunk.cpp
similarity index 100%
rename from source/world/renderer/Chunk.cpp
rename to source/renderer/Chunk.cpp
diff --git a/source/world/renderer/Chunk.hpp b/source/renderer/Chunk.hpp
similarity index 100%
rename from source/world/renderer/Chunk.hpp
rename to source/renderer/Chunk.hpp
diff --git a/source/world/renderer/Culler.cpp b/source/renderer/Culler.cpp
similarity index 100%
rename from source/world/renderer/Culler.cpp
rename to source/renderer/Culler.cpp
diff --git a/source/world/renderer/Culler.hpp b/source/renderer/Culler.hpp
similarity index 100%
rename from source/world/renderer/Culler.hpp
rename to source/renderer/Culler.hpp
diff --git a/source/world/renderer/FallingTileRenderer.cpp b/source/renderer/FallingTileRenderer.cpp
similarity index 100%
rename from source/world/renderer/FallingTileRenderer.cpp
rename to source/renderer/FallingTileRenderer.cpp
diff --git a/source/world/renderer/FallingTileRenderer.hpp b/source/renderer/FallingTileRenderer.hpp
similarity index 100%
rename from source/world/renderer/FallingTileRenderer.hpp
rename to source/renderer/FallingTileRenderer.hpp
diff --git a/source/world/renderer/Frustum.cpp b/source/renderer/Frustum.cpp
similarity index 100%
rename from source/world/renderer/Frustum.cpp
rename to source/renderer/Frustum.cpp
diff --git a/source/world/renderer/Frustum.hpp b/source/renderer/Frustum.hpp
similarity index 100%
rename from source/world/renderer/Frustum.hpp
rename to source/renderer/Frustum.hpp
diff --git a/source/world/renderer/FrustumCuller.cpp b/source/renderer/FrustumCuller.cpp
similarity index 100%
rename from source/world/renderer/FrustumCuller.cpp
rename to source/renderer/FrustumCuller.cpp
diff --git a/source/world/renderer/FrustumCuller.hpp b/source/renderer/FrustumCuller.hpp
similarity index 100%
rename from source/world/renderer/FrustumCuller.hpp
rename to source/renderer/FrustumCuller.hpp
diff --git a/source/world/renderer/ItemInHandRenderer.cpp b/source/renderer/ItemInHandRenderer.cpp
similarity index 100%
rename from source/world/renderer/ItemInHandRenderer.cpp
rename to source/renderer/ItemInHandRenderer.cpp
diff --git a/source/world/renderer/ItemInHandRenderer.hpp b/source/renderer/ItemInHandRenderer.hpp
similarity index 100%
rename from source/world/renderer/ItemInHandRenderer.hpp
rename to source/renderer/ItemInHandRenderer.hpp
diff --git a/source/world/renderer/LevelRenderer.cpp b/source/renderer/LevelRenderer.cpp
similarity index 100%
rename from source/world/renderer/LevelRenderer.cpp
rename to source/renderer/LevelRenderer.cpp
diff --git a/source/world/renderer/LevelRenderer.hpp b/source/renderer/LevelRenderer.hpp
similarity index 100%
rename from source/world/renderer/LevelRenderer.hpp
rename to source/renderer/LevelRenderer.hpp
diff --git a/source/world/LightLayer.cpp b/source/renderer/LightLayer.cpp
similarity index 100%
rename from source/world/LightLayer.cpp
rename to source/renderer/LightLayer.cpp
diff --git a/source/world/LightLayer.hpp b/source/renderer/LightLayer.hpp
similarity index 100%
rename from source/world/LightLayer.hpp
rename to source/renderer/LightLayer.hpp
diff --git a/source/world/LightUpdate.cpp b/source/renderer/LightUpdate.cpp
similarity index 100%
rename from source/world/LightUpdate.cpp
rename to source/renderer/LightUpdate.cpp
diff --git a/source/world/LightUpdate.hpp b/source/renderer/LightUpdate.hpp
similarity index 100%
rename from source/world/LightUpdate.hpp
rename to source/renderer/LightUpdate.hpp
diff --git a/source/world/renderer/TileRenderer.cpp b/source/renderer/TileRenderer.cpp
similarity index 100%
rename from source/world/renderer/TileRenderer.cpp
rename to source/renderer/TileRenderer.cpp
diff --git a/source/world/renderer/TileRenderer.hpp b/source/renderer/TileRenderer.hpp
similarity index 100%
rename from source/world/renderer/TileRenderer.hpp
rename to source/renderer/TileRenderer.hpp
diff --git a/source/world/renderer/EntityRenderDispatcher.cpp b/source/renderer/entity/EntityRenderDispatcher.cpp
similarity index 100%
rename from source/world/renderer/EntityRenderDispatcher.cpp
rename to source/renderer/entity/EntityRenderDispatcher.cpp
diff --git a/source/world/renderer/EntityRenderDispatcher.hpp b/source/renderer/entity/EntityRenderDispatcher.hpp
similarity index 100%
rename from source/world/renderer/EntityRenderDispatcher.hpp
rename to source/renderer/entity/EntityRenderDispatcher.hpp
diff --git a/source/world/renderer/EntityRenderer.cpp b/source/renderer/entity/EntityRenderer.cpp
similarity index 100%
rename from source/world/renderer/EntityRenderer.cpp
rename to source/renderer/entity/EntityRenderer.cpp
diff --git a/source/world/renderer/EntityRenderer.hpp b/source/renderer/entity/EntityRenderer.hpp
similarity index 100%
rename from source/world/renderer/EntityRenderer.hpp
rename to source/renderer/entity/EntityRenderer.hpp
diff --git a/source/world/renderer/HumanoidMobRenderer.cpp b/source/renderer/entity/HumanoidMobRenderer.cpp
similarity index 100%
rename from source/world/renderer/HumanoidMobRenderer.cpp
rename to source/renderer/entity/HumanoidMobRenderer.cpp
diff --git a/source/world/renderer/HumanoidMobRenderer.hpp b/source/renderer/entity/HumanoidMobRenderer.hpp
similarity index 100%
rename from source/world/renderer/HumanoidMobRenderer.hpp
rename to source/renderer/entity/HumanoidMobRenderer.hpp
diff --git a/source/world/renderer/ItemRenderer.cpp b/source/renderer/entity/ItemRenderer.cpp
similarity index 100%
rename from source/world/renderer/ItemRenderer.cpp
rename to source/renderer/entity/ItemRenderer.cpp
diff --git a/source/world/renderer/ItemRenderer.hpp b/source/renderer/entity/ItemRenderer.hpp
similarity index 100%
rename from source/world/renderer/ItemRenderer.hpp
rename to source/renderer/entity/ItemRenderer.hpp
diff --git a/source/world/renderer/ItemSpriteRenderer.cpp b/source/renderer/entity/ItemSpriteRenderer.cpp
similarity index 100%
rename from source/world/renderer/ItemSpriteRenderer.cpp
rename to source/renderer/entity/ItemSpriteRenderer.cpp
diff --git a/source/world/renderer/ItemSpriteRenderer.hpp b/source/renderer/entity/ItemSpriteRenderer.hpp
similarity index 100%
rename from source/world/renderer/ItemSpriteRenderer.hpp
rename to source/renderer/entity/ItemSpriteRenderer.hpp
diff --git a/source/world/renderer/MobRenderer.cpp b/source/renderer/entity/MobRenderer.cpp
similarity index 100%
rename from source/world/renderer/MobRenderer.cpp
rename to source/renderer/entity/MobRenderer.cpp
diff --git a/source/world/renderer/MobRenderer.hpp b/source/renderer/entity/MobRenderer.hpp
similarity index 100%
rename from source/world/renderer/MobRenderer.hpp
rename to source/renderer/entity/MobRenderer.hpp
diff --git a/source/world/renderer/TntRenderer.cpp b/source/renderer/entity/TntRenderer.cpp
similarity index 100%
rename from source/world/renderer/TntRenderer.cpp
rename to source/renderer/entity/TntRenderer.cpp
diff --git a/source/world/renderer/TntRenderer.hpp b/source/renderer/entity/TntRenderer.hpp
similarity index 100%
rename from source/world/renderer/TntRenderer.hpp
rename to source/renderer/entity/TntRenderer.hpp
diff --git a/source/world/renderer/TripodCameraRenderer.cpp b/source/renderer/entity/TripodCameraRenderer.cpp
similarity index 100%
rename from source/world/renderer/TripodCameraRenderer.cpp
rename to source/renderer/entity/TripodCameraRenderer.cpp
diff --git a/source/world/renderer/TripodCameraRenderer.hpp b/source/renderer/entity/TripodCameraRenderer.hpp
similarity index 100%
rename from source/world/renderer/TripodCameraRenderer.hpp
rename to source/renderer/entity/TripodCameraRenderer.hpp