diff --git a/source/gui/Screen/Screen.cpp b/source/gui/Screen.cpp
similarity index 100%
rename from source/gui/Screen/Screen.cpp
rename to source/gui/Screen.cpp
diff --git a/source/gui/Screen/Screen.hpp b/source/gui/Screen.hpp
similarity index 100%
rename from source/gui/Screen/Screen.hpp
rename to source/gui/Screen.hpp
diff --git a/source/gui/AvailableGamesList.cpp b/source/gui/components/AvailableGamesList.cpp
similarity index 100%
rename from source/gui/AvailableGamesList.cpp
rename to source/gui/components/AvailableGamesList.cpp
diff --git a/source/gui/AvailableGamesList.hpp b/source/gui/components/AvailableGamesList.hpp
similarity index 100%
rename from source/gui/AvailableGamesList.hpp
rename to source/gui/components/AvailableGamesList.hpp
diff --git a/source/gui/Button.cpp b/source/gui/components/Button.cpp
similarity index 100%
rename from source/gui/Button.cpp
rename to source/gui/components/Button.cpp
diff --git a/source/gui/Button.hpp b/source/gui/components/Button.hpp
similarity index 100%
rename from source/gui/Button.hpp
rename to source/gui/components/Button.hpp
diff --git a/source/gui/RolledSelectionList.cpp b/source/gui/components/RolledSelectionList.cpp
similarity index 100%
rename from source/gui/RolledSelectionList.cpp
rename to source/gui/components/RolledSelectionList.cpp
diff --git a/source/gui/RolledSelectionList.hpp b/source/gui/components/RolledSelectionList.hpp
similarity index 100%
rename from source/gui/RolledSelectionList.hpp
rename to source/gui/components/RolledSelectionList.hpp
diff --git a/source/gui/ScrolledSelectionList.cpp b/source/gui/components/ScrolledSelectionList.cpp
similarity index 100%
rename from source/gui/ScrolledSelectionList.cpp
rename to source/gui/components/ScrolledSelectionList.cpp
diff --git a/source/gui/ScrolledSelectionList.hpp b/source/gui/components/ScrolledSelectionList.hpp
similarity index 100%
rename from source/gui/ScrolledSelectionList.hpp
rename to source/gui/components/ScrolledSelectionList.hpp
diff --git a/source/gui/SmallButton.cpp b/source/gui/components/SmallButton.cpp
similarity index 100%
rename from source/gui/SmallButton.cpp
rename to source/gui/components/SmallButton.cpp
diff --git a/source/gui/SmallButton.hpp b/source/gui/components/SmallButton.hpp
similarity index 100%
rename from source/gui/SmallButton.hpp
rename to source/gui/components/SmallButton.hpp
diff --git a/source/gui/TextInputBox.cpp b/source/gui/components/TextInputBox.cpp
similarity index 100%
rename from source/gui/TextInputBox.cpp
rename to source/gui/components/TextInputBox.cpp
diff --git a/source/gui/TextInputBox.hpp b/source/gui/components/TextInputBox.hpp
similarity index 100%
rename from source/gui/TextInputBox.hpp
rename to source/gui/components/TextInputBox.hpp
diff --git a/source/gui/WorldSelectionList.cpp b/source/gui/components/WorldSelectionList.cpp
similarity index 100%
rename from source/gui/WorldSelectionList.cpp
rename to source/gui/components/WorldSelectionList.cpp
diff --git a/source/gui/WorldSelectionList.hpp b/source/gui/components/WorldSelectionList.hpp
similarity index 100%
rename from source/gui/WorldSelectionList.hpp
rename to source/gui/components/WorldSelectionList.hpp
diff --git a/source/gui/Screen/ChatScreen.cpp b/source/gui/screens/ChatScreen.cpp
similarity index 100%
rename from source/gui/Screen/ChatScreen.cpp
rename to source/gui/screens/ChatScreen.cpp
diff --git a/source/gui/Screen/ChatScreen.hpp b/source/gui/screens/ChatScreen.hpp
similarity index 100%
rename from source/gui/Screen/ChatScreen.hpp
rename to source/gui/screens/ChatScreen.hpp
diff --git a/source/gui/Screen/ConfirmScreen.cpp b/source/gui/screens/ConfirmScreen.cpp
similarity index 100%
rename from source/gui/Screen/ConfirmScreen.cpp
rename to source/gui/screens/ConfirmScreen.cpp
diff --git a/source/gui/Screen/ConfirmScreen.hpp b/source/gui/screens/ConfirmScreen.hpp
similarity index 100%
rename from source/gui/Screen/ConfirmScreen.hpp
rename to source/gui/screens/ConfirmScreen.hpp
diff --git a/source/gui/Screen/CreateWorldScreen.cpp b/source/gui/screens/CreateWorldScreen.cpp
similarity index 100%
rename from source/gui/Screen/CreateWorldScreen.cpp
rename to source/gui/screens/CreateWorldScreen.cpp
diff --git a/source/gui/Screen/CreateWorldScreen.hpp b/source/gui/screens/CreateWorldScreen.hpp
similarity index 100%
rename from source/gui/Screen/CreateWorldScreen.hpp
rename to source/gui/screens/CreateWorldScreen.hpp
diff --git a/source/gui/Screen/DeleteWorldScreen.cpp b/source/gui/screens/DeleteWorldScreen.cpp
similarity index 100%
rename from source/gui/Screen/DeleteWorldScreen.cpp
rename to source/gui/screens/DeleteWorldScreen.cpp
diff --git a/source/gui/Screen/DeleteWorldScreen.hpp b/source/gui/screens/DeleteWorldScreen.hpp
similarity index 100%
rename from source/gui/Screen/DeleteWorldScreen.hpp
rename to source/gui/screens/DeleteWorldScreen.hpp
diff --git a/source/gui/Screen/IngameBlockSelectionScreen.cpp b/source/gui/screens/IngameBlockSelectionScreen.cpp
similarity index 100%
rename from source/gui/Screen/IngameBlockSelectionScreen.cpp
rename to source/gui/screens/IngameBlockSelectionScreen.cpp
diff --git a/source/gui/Screen/IngameBlockSelectionScreen.hpp b/source/gui/screens/IngameBlockSelectionScreen.hpp
similarity index 100%
rename from source/gui/Screen/IngameBlockSelectionScreen.hpp
rename to source/gui/screens/IngameBlockSelectionScreen.hpp
diff --git a/source/gui/Screen/InvalidLicenseScreen.cpp b/source/gui/screens/InvalidLicenseScreen.cpp
similarity index 100%
rename from source/gui/Screen/InvalidLicenseScreen.cpp
rename to source/gui/screens/InvalidLicenseScreen.cpp
diff --git a/source/gui/Screen/InvalidLicenseScreen.hpp b/source/gui/screens/InvalidLicenseScreen.hpp
similarity index 100%
rename from source/gui/Screen/InvalidLicenseScreen.hpp
rename to source/gui/screens/InvalidLicenseScreen.hpp
diff --git a/source/Inventory.cpp b/source/gui/screens/Inventory.cpp
similarity index 100%
rename from source/Inventory.cpp
rename to source/gui/screens/Inventory.cpp
diff --git a/source/Inventory.hpp b/source/gui/screens/Inventory.hpp
similarity index 100%
rename from source/Inventory.hpp
rename to source/gui/screens/Inventory.hpp
diff --git a/source/gui/Screen/JoinGameScreen.cpp b/source/gui/screens/JoinGameScreen.cpp
similarity index 100%
rename from source/gui/Screen/JoinGameScreen.cpp
rename to source/gui/screens/JoinGameScreen.cpp
diff --git a/source/gui/Screen/JoinGameScreen.hpp b/source/gui/screens/JoinGameScreen.hpp
similarity index 100%
rename from source/gui/Screen/JoinGameScreen.hpp
rename to source/gui/screens/JoinGameScreen.hpp
diff --git a/source/Options.cpp b/source/gui/screens/Options.cpp
similarity index 100%
rename from source/Options.cpp
rename to source/gui/screens/Options.cpp
diff --git a/source/Options.hpp b/source/gui/screens/Options.hpp
similarity index 100%
rename from source/Options.hpp
rename to source/gui/screens/Options.hpp
diff --git a/source/gui/Screen/OptionsScreen.cpp b/source/gui/screens/OptionsScreen.cpp
similarity index 100%
rename from source/gui/Screen/OptionsScreen.cpp
rename to source/gui/screens/OptionsScreen.cpp
diff --git a/source/gui/Screen/OptionsScreen.hpp b/source/gui/screens/OptionsScreen.hpp
similarity index 100%
rename from source/gui/Screen/OptionsScreen.hpp
rename to source/gui/screens/OptionsScreen.hpp
diff --git a/source/gui/Screen/PauseScreen.cpp b/source/gui/screens/PauseScreen.cpp
similarity index 100%
rename from source/gui/Screen/PauseScreen.cpp
rename to source/gui/screens/PauseScreen.cpp
diff --git a/source/gui/Screen/PauseScreen.hpp b/source/gui/screens/PauseScreen.hpp
similarity index 100%
rename from source/gui/Screen/PauseScreen.hpp
rename to source/gui/screens/PauseScreen.hpp
diff --git a/source/gui/Screen/ProgressScreen.cpp b/source/gui/screens/ProgressScreen.cpp
similarity index 100%
rename from source/gui/Screen/ProgressScreen.cpp
rename to source/gui/screens/ProgressScreen.cpp
diff --git a/source/gui/Screen/ProgressScreen.hpp b/source/gui/screens/ProgressScreen.hpp
similarity index 100%
rename from source/gui/Screen/ProgressScreen.hpp
rename to source/gui/screens/ProgressScreen.hpp
diff --git a/source/gui/Screen/RenameMPLevelScreen.cpp b/source/gui/screens/RenameMPLevelScreen.cpp
similarity index 100%
rename from source/gui/Screen/RenameMPLevelScreen.cpp
rename to source/gui/screens/RenameMPLevelScreen.cpp
diff --git a/source/gui/Screen/RenameMPLevelScreen.hpp b/source/gui/screens/RenameMPLevelScreen.hpp
similarity index 100%
rename from source/gui/Screen/RenameMPLevelScreen.hpp
rename to source/gui/screens/RenameMPLevelScreen.hpp
diff --git a/source/gui/Screen/SavingWorldScreen.cpp b/source/gui/screens/SavingWorldScreen.cpp
similarity index 100%
rename from source/gui/Screen/SavingWorldScreen.cpp
rename to source/gui/screens/SavingWorldScreen.cpp
diff --git a/source/gui/Screen/SavingWorldScreen.hpp b/source/gui/screens/SavingWorldScreen.hpp
similarity index 100%
rename from source/gui/Screen/SavingWorldScreen.hpp
rename to source/gui/screens/SavingWorldScreen.hpp
diff --git a/source/gui/Screen/SelectWorldScreen.cpp b/source/gui/screens/SelectWorldScreen.cpp
similarity index 100%
rename from source/gui/Screen/SelectWorldScreen.cpp
rename to source/gui/screens/SelectWorldScreen.cpp
diff --git a/source/gui/Screen/SelectWorldScreen.hpp b/source/gui/screens/SelectWorldScreen.hpp
similarity index 100%
rename from source/gui/Screen/SelectWorldScreen.hpp
rename to source/gui/screens/SelectWorldScreen.hpp
diff --git a/source/gui/Screen/StartMenuScreen.cpp b/source/gui/screens/StartMenuScreen.cpp
similarity index 100%
rename from source/gui/Screen/StartMenuScreen.cpp
rename to source/gui/screens/StartMenuScreen.cpp
diff --git a/source/gui/Screen/StartMenuScreen.hpp b/source/gui/screens/StartMenuScreen.hpp
similarity index 100%
rename from source/gui/Screen/StartMenuScreen.hpp
rename to source/gui/screens/StartMenuScreen.hpp
diff --git a/source/world/LevelChunk.cpp b/source/world/level/levelgen/chunk/LevelChunk.cpp
similarity index 100%
rename from source/world/LevelChunk.cpp
rename to source/world/level/levelgen/chunk/LevelChunk.cpp
diff --git a/source/world/LevelChunk.hpp b/source/world/level/levelgen/chunk/LevelChunk.hpp
similarity index 100%
rename from source/world/LevelChunk.hpp
rename to source/world/level/levelgen/chunk/LevelChunk.hpp
diff --git a/source/world/level/levelgen/RegionFile.cpp b/source/world/level/storage/RegionFile.cpp
similarity index 100%
rename from source/world/level/levelgen/RegionFile.cpp
rename to source/world/level/storage/RegionFile.cpp
diff --git a/source/world/level/levelgen/RegionFile.hpp b/source/world/level/storage/RegionFile.hpp
similarity index 100%
rename from source/world/level/levelgen/RegionFile.hpp
rename to source/world/level/storage/RegionFile.hpp
diff --git a/source/world/Renderer/Chunk.cpp b/source/world/renderer/Chunk.cpp
similarity index 100%
rename from source/world/Renderer/Chunk.cpp
rename to source/world/renderer/Chunk.cpp
diff --git a/source/world/Renderer/Chunk.hpp b/source/world/renderer/Chunk.hpp
similarity index 100%
rename from source/world/Renderer/Chunk.hpp
rename to source/world/renderer/Chunk.hpp
diff --git a/source/world/Renderer/Culler.cpp b/source/world/renderer/Culler.cpp
similarity index 100%
rename from source/world/Renderer/Culler.cpp
rename to source/world/renderer/Culler.cpp
diff --git a/source/world/Renderer/Culler.hpp b/source/world/renderer/Culler.hpp
similarity index 100%
rename from source/world/Renderer/Culler.hpp
rename to source/world/renderer/Culler.hpp
diff --git a/source/world/Renderer/EntityRenderDispatcher.cpp b/source/world/renderer/EntityRenderDispatcher.cpp
similarity index 100%
rename from source/world/Renderer/EntityRenderDispatcher.cpp
rename to source/world/renderer/EntityRenderDispatcher.cpp
diff --git a/source/world/Renderer/EntityRenderDispatcher.hpp b/source/world/renderer/EntityRenderDispatcher.hpp
similarity index 100%
rename from source/world/Renderer/EntityRenderDispatcher.hpp
rename to source/world/renderer/EntityRenderDispatcher.hpp
diff --git a/source/world/Renderer/EntityRenderer.cpp b/source/world/renderer/EntityRenderer.cpp
similarity index 100%
rename from source/world/Renderer/EntityRenderer.cpp
rename to source/world/renderer/EntityRenderer.cpp
diff --git a/source/world/Renderer/EntityRenderer.hpp b/source/world/renderer/EntityRenderer.hpp
similarity index 100%
rename from source/world/Renderer/EntityRenderer.hpp
rename to source/world/renderer/EntityRenderer.hpp
diff --git a/source/world/Renderer/FallingTileRenderer.cpp b/source/world/renderer/FallingTileRenderer.cpp
similarity index 100%
rename from source/world/Renderer/FallingTileRenderer.cpp
rename to source/world/renderer/FallingTileRenderer.cpp
diff --git a/source/world/Renderer/FallingTileRenderer.hpp b/source/world/renderer/FallingTileRenderer.hpp
similarity index 100%
rename from source/world/Renderer/FallingTileRenderer.hpp
rename to source/world/renderer/FallingTileRenderer.hpp
diff --git a/source/world/Renderer/Frustum.cpp b/source/world/renderer/Frustum.cpp
similarity index 100%
rename from source/world/Renderer/Frustum.cpp
rename to source/world/renderer/Frustum.cpp
diff --git a/source/world/Renderer/Frustum.hpp b/source/world/renderer/Frustum.hpp
similarity index 100%
rename from source/world/Renderer/Frustum.hpp
rename to source/world/renderer/Frustum.hpp
diff --git a/source/world/Renderer/FrustumCuller.cpp b/source/world/renderer/FrustumCuller.cpp
similarity index 100%
rename from source/world/Renderer/FrustumCuller.cpp
rename to source/world/renderer/FrustumCuller.cpp
diff --git a/source/world/Renderer/FrustumCuller.hpp b/source/world/renderer/FrustumCuller.hpp
similarity index 100%
rename from source/world/Renderer/FrustumCuller.hpp
rename to source/world/renderer/FrustumCuller.hpp
diff --git a/source/world/Renderer/HumanoidMobRenderer.cpp b/source/world/renderer/HumanoidMobRenderer.cpp
similarity index 100%
rename from source/world/Renderer/HumanoidMobRenderer.cpp
rename to source/world/renderer/HumanoidMobRenderer.cpp
diff --git a/source/world/Renderer/HumanoidMobRenderer.hpp b/source/world/renderer/HumanoidMobRenderer.hpp
similarity index 100%
rename from source/world/Renderer/HumanoidMobRenderer.hpp
rename to source/world/renderer/HumanoidMobRenderer.hpp
diff --git a/source/world/Renderer/ItemInHandRenderer.cpp b/source/world/renderer/ItemInHandRenderer.cpp
similarity index 100%
rename from source/world/Renderer/ItemInHandRenderer.cpp
rename to source/world/renderer/ItemInHandRenderer.cpp
diff --git a/source/world/Renderer/ItemInHandRenderer.hpp b/source/world/renderer/ItemInHandRenderer.hpp
similarity index 100%
rename from source/world/Renderer/ItemInHandRenderer.hpp
rename to source/world/renderer/ItemInHandRenderer.hpp
diff --git a/source/world/Renderer/ItemRenderer.cpp b/source/world/renderer/ItemRenderer.cpp
similarity index 100%
rename from source/world/Renderer/ItemRenderer.cpp
rename to source/world/renderer/ItemRenderer.cpp
diff --git a/source/world/Renderer/ItemRenderer.hpp b/source/world/renderer/ItemRenderer.hpp
similarity index 100%
rename from source/world/Renderer/ItemRenderer.hpp
rename to source/world/renderer/ItemRenderer.hpp
diff --git a/source/world/Renderer/ItemSpriteRenderer.cpp b/source/world/renderer/ItemSpriteRenderer.cpp
similarity index 100%
rename from source/world/Renderer/ItemSpriteRenderer.cpp
rename to source/world/renderer/ItemSpriteRenderer.cpp
diff --git a/source/world/Renderer/ItemSpriteRenderer.hpp b/source/world/renderer/ItemSpriteRenderer.hpp
similarity index 100%
rename from source/world/Renderer/ItemSpriteRenderer.hpp
rename to source/world/renderer/ItemSpriteRenderer.hpp
diff --git a/source/world/Renderer/LevelRenderer.cpp b/source/world/renderer/LevelRenderer.cpp
similarity index 100%
rename from source/world/Renderer/LevelRenderer.cpp
rename to source/world/renderer/LevelRenderer.cpp
diff --git a/source/world/Renderer/LevelRenderer.hpp b/source/world/renderer/LevelRenderer.hpp
similarity index 100%
rename from source/world/Renderer/LevelRenderer.hpp
rename to source/world/renderer/LevelRenderer.hpp
diff --git a/source/world/Renderer/MobRenderer.cpp b/source/world/renderer/MobRenderer.cpp
similarity index 100%
rename from source/world/Renderer/MobRenderer.cpp
rename to source/world/renderer/MobRenderer.cpp
diff --git a/source/world/Renderer/MobRenderer.hpp b/source/world/renderer/MobRenderer.hpp
similarity index 100%
rename from source/world/Renderer/MobRenderer.hpp
rename to source/world/renderer/MobRenderer.hpp
diff --git a/source/world/Renderer/TileRenderer.cpp b/source/world/renderer/TileRenderer.cpp
similarity index 100%
rename from source/world/Renderer/TileRenderer.cpp
rename to source/world/renderer/TileRenderer.cpp
diff --git a/source/world/Renderer/TileRenderer.hpp b/source/world/renderer/TileRenderer.hpp
similarity index 100%
rename from source/world/Renderer/TileRenderer.hpp
rename to source/world/renderer/TileRenderer.hpp
diff --git a/source/world/Renderer/TntRenderer.cpp b/source/world/renderer/TntRenderer.cpp
similarity index 100%
rename from source/world/Renderer/TntRenderer.cpp
rename to source/world/renderer/TntRenderer.cpp
diff --git a/source/world/Renderer/TntRenderer.hpp b/source/world/renderer/TntRenderer.hpp
similarity index 100%
rename from source/world/Renderer/TntRenderer.hpp
rename to source/world/renderer/TntRenderer.hpp
diff --git a/source/world/Renderer/TripodCameraRenderer.cpp b/source/world/renderer/TripodCameraRenderer.cpp
similarity index 100%
rename from source/world/Renderer/TripodCameraRenderer.cpp
rename to source/world/renderer/TripodCameraRenderer.cpp
diff --git a/source/world/Renderer/TripodCameraRenderer.hpp b/source/world/renderer/TripodCameraRenderer.hpp
similarity index 100%
rename from source/world/Renderer/TripodCameraRenderer.hpp
rename to source/world/renderer/TripodCameraRenderer.hpp