From 6e9b364f818d2366a536a8e6a898b17fc1508d9b Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Thu, 11 Jan 2024 22:10:30 -0500
Subject: [PATCH] Organize Symbols

---
 dependencies/symbol-processor/src             |   2 +-
 symbols/CMakeLists.txt                        | 252 +++++++++---------
 symbols/src/Container.def                     |   2 -
 symbols/src/TripodCameraRenderer.def          |   3 -
 symbols/src/{ => api}/CommandServer.def       |   0
 symbols/src/{ => api}/ConnectedClient.def     |   0
 symbols/src/{ => api}/OffsetPosTranslator.def |   0
 .../src/{ => app-platform}/AppPlatform.def    |   0
 .../{ => app-platform}/AppPlatform_linux.def  |   0
 ...AppPlatform_readAssetFile_return_value.def |   0
 symbols/src/{ => entity}/AgableMob.def        |   0
 symbols/src/{ => entity}/Animal.def           |   0
 symbols/src/{ => entity}/Arrow.def            |   0
 symbols/src/{ => entity}/Entity.def           |   0
 symbols/src/{ => entity}/EntityFactory.def    |   0
 .../{ => entity}/EntityRenderDispatcher.def   |   0
 symbols/src/{ => entity}/EntityRenderer.def   |   0
 .../src/{ => entity}/HumanoidMobRenderer.def  |   0
 symbols/src/{ => entity}/HumanoidModel.def    |   0
 symbols/src/{ => entity}/ItemEntity.def       |   0
 symbols/src/{ => entity}/Mob.def              |   0
 symbols/src/{ => entity}/MobFactory.def       |   0
 symbols/src/{ => entity}/MobRenderer.def      |   0
 symbols/src/{ => entity}/PathfinderMob.def    |   0
 symbols/src/{ => entity}/PrimedTnt.def        |   0
 symbols/src/{ => entity}/Sheep.def            |   0
 symbols/src/entity/TripodCameraRenderer.def   |   5 +
 .../src/{ => entity/player}/LocalPlayer.def   |   0
 symbols/src/{ => entity/player}/Player.def    |   0
 .../{ => entity/player}/PlayerRenderer.def    |   0
 .../src/{ => entity/player}/RemotePlayer.def  |   0
 .../src/{ => entity/player}/ServerPlayer.def  |   0
 symbols/src/{ => game}/GameRenderer.def       |   0
 symbols/src/{ => game}/Minecraft.def          |   0
 symbols/src/{ => game}/NinecraftApp.def       |   0
 symbols/src/{ => game/mode}/CreatorMode.def   |   0
 symbols/src/{ => game/mode}/GameMode.def      |   0
 symbols/src/{ => game/mode}/SurvivalMode.def  |   0
 symbols/src/{ => game/options}/Options.def    |   0
 .../src/{ => game/options}/OptionsFile.def    |   0
 .../src/{ => game/options}/Options_Option.def |   0
 symbols/src/{ => gui}/Font.def                |   0
 symbols/src/{ => gui/components}/Button.def   |   0
 symbols/src/{ => gui/components}/Gui.def      |   0
 .../src/{ => gui/components}/GuiComponent.def |   0
 .../src/{ => gui/components}/ImageButton.def  |   0
 .../src/{ => gui/components}/OptionButton.def |   0
 .../src/{ => gui/components}/OptionsPane.def  |   0
 .../src/{ => gui/screens}/FurnaceScreen.def   |   0
 symbols/src/{ => gui/screens}/InBedScreen.def |   0
 .../src/{ => gui/screens}/OptionsScreen.def   |   0
 symbols/src/{ => gui/screens}/PauseScreen.def |   0
 .../src/{ => gui/screens}/ProgressScreen.def  |   0
 symbols/src/{ => gui/screens}/Screen.def      |   4 +-
 .../{ => gui/screens}/SelectWorldScreen.def   |   0
 .../screens}/SimpleChooseLevelScreen.def      |   0
 .../src/{ => gui/screens}/StartMenuScreen.def |   0
 .../src/{ => gui/screens}/TextEditScreen.def  |   0
 .../Touch_IngameBlockSelectionScreen.def      |   0
 .../screens}/Touch_SelectWorldScreen.def      |   0
 .../src/{ => gui/screens}/WorkbenchScreen.def |   0
 symbols/src/{ => input}/IBuildInput.def       |   0
 symbols/src/{ => input}/Mouse.def             |   0
 symbols/src/{ => input}/MouseBuildInput.def   |   0
 symbols/src/{ => item}/AuxDataTileItem.def    |   0
 symbols/src/{ => item}/Item.def               |   0
 symbols/src/{ => item}/ItemInstance.def       |   0
 symbols/src/{ => item}/ItemRenderer.def       |   0
 symbols/src/{ => item}/TileItem.def           |   0
 symbols/src/{ => level}/Biome.def             |   0
 symbols/src/{ => level}/ChunkSource.def       |   0
 .../ExternalFileLevelStorageSource.def        |   0
 symbols/src/{ => level}/Level.def             |   4 +-
 symbols/src/{ => level}/LevelData.def         |   0
 symbols/src/{ => level}/LevelRenderer.def     |   0
 symbols/src/{ => level}/LevelSettings.def     |   0
 symbols/src/{ => level}/LevelSource.def       |   0
 .../src/{ => level}/LevelStorageSource.def    |   0
 symbols/src/{ => level}/Material.def          |   0
 symbols/src/{ => level}/ParticleEngine.def    |   0
 symbols/src/{ => level}/RandomLevelSource.def |   0
 symbols/src/{ => level}/ServerLevel.def       |   0
 symbols/src/level/container/Container.def     |   4 +
 .../{ => level/container}/ContainerMenu.def   |   0
 .../container}/FillingContainer.def           |   4 +-
 .../src/{ => level/container}/Inventory.def   |   0
 .../{ => level/feature}/LargeCaveFeature.def  |   0
 .../src/{ => level/feature}/LargeFeature.def  |   0
 symbols/src/{ => misc}/AABB.def               |   0
 symbols/src/{ => misc}/Common.def             |   0
 symbols/src/{ => misc}/Config.def             |   0
 symbols/src/{ => misc}/HitResult.def          |   0
 symbols/src/{ => misc}/ModelPart.def          |   0
 symbols/src/{ => misc}/PerfRenderer.def       |   0
 symbols/src/{ => misc}/SoundEngine.def        |   0
 symbols/src/{ => misc}/Strings.def            |   0
 symbols/src/{ => misc}/Tesselator.def         |   0
 symbols/src/{ => misc}/Texture.def            |   0
 symbols/src/{ => misc}/Textures.def           |   0
 symbols/src/{ => misc}/Vec3.def               |   0
 .../src/{ => network}/NetEventCallback.def    |   0
 .../{ => network}/PingedCompatibleServer.def  |   0
 symbols/src/{ => network}/RakNetInstance.def  |   0
 .../ServerSideNetworkHandler.def              |   0
 .../src/{ => network/packet}/ChatPacket.def   |   0
 .../src/{ => network/packet}/LoginPacket.def  |   0
 symbols/src/{ => network/packet}/Packet.def   |   0
 .../{ => network/packet}/StartGamePacket.def  |   0
 .../raknet}/RakNet_RakNetGUID.def             |   0
 .../{ => network/raknet}/RakNet_RakPeer.def   |   0
 .../{ => network/raknet}/RakNet_RakString.def |   0
 .../raknet}/RakNet_RakString_SharedString.def |   0
 .../raknet}/RakNet_SystemAddress.def          |   0
 symbols/src/{ => network/raknet}/extra.h      |   1 -
 symbols/src/{ => recipes}/FurnaceRecipes.def  |   0
 symbols/src/{ => recipes}/Recipes.def         |   0
 symbols/src/{ => recipes}/Recipes_Type.def    |   0
 symbols/src/{ => tile}/GrassTile.def          |   0
 symbols/src/{ => tile}/HeavyTile.def          |   0
 symbols/src/{ => tile}/LeafTile.def           |   0
 symbols/src/{ => tile}/LiquidTile.def         |   0
 symbols/src/{ => tile}/StemTile.def           |   0
 symbols/src/{ => tile}/TallGrass.def          |   0
 symbols/src/{ => tile}/Tile.def               |   0
 symbols/src/{ => tile}/TileRenderer.def       |   0
 symbols/src/{ => tile}/Tile_SoundType.def     |   0
 .../src/{ => tile/entity}/ChestTileEntity.def |   2 +-
 .../{ => tile/entity}/FurnaceTileEntity.def   |   0
 .../src/{ => tile/entity}/SignTileEntity.def  |   0
 symbols/src/{ => tile/entity}/TileEntity.def  |   0
 130 files changed, 143 insertions(+), 140 deletions(-)
 delete mode 100644 symbols/src/Container.def
 delete mode 100644 symbols/src/TripodCameraRenderer.def
 rename symbols/src/{ => api}/CommandServer.def (100%)
 rename symbols/src/{ => api}/ConnectedClient.def (100%)
 rename symbols/src/{ => api}/OffsetPosTranslator.def (100%)
 rename symbols/src/{ => app-platform}/AppPlatform.def (100%)
 rename symbols/src/{ => app-platform}/AppPlatform_linux.def (100%)
 rename symbols/src/{ => app-platform}/AppPlatform_readAssetFile_return_value.def (100%)
 rename symbols/src/{ => entity}/AgableMob.def (100%)
 rename symbols/src/{ => entity}/Animal.def (100%)
 rename symbols/src/{ => entity}/Arrow.def (100%)
 rename symbols/src/{ => entity}/Entity.def (100%)
 rename symbols/src/{ => entity}/EntityFactory.def (100%)
 rename symbols/src/{ => entity}/EntityRenderDispatcher.def (100%)
 rename symbols/src/{ => entity}/EntityRenderer.def (100%)
 rename symbols/src/{ => entity}/HumanoidMobRenderer.def (100%)
 rename symbols/src/{ => entity}/HumanoidModel.def (100%)
 rename symbols/src/{ => entity}/ItemEntity.def (100%)
 rename symbols/src/{ => entity}/Mob.def (100%)
 rename symbols/src/{ => entity}/MobFactory.def (100%)
 rename symbols/src/{ => entity}/MobRenderer.def (100%)
 rename symbols/src/{ => entity}/PathfinderMob.def (100%)
 rename symbols/src/{ => entity}/PrimedTnt.def (100%)
 rename symbols/src/{ => entity}/Sheep.def (100%)
 create mode 100644 symbols/src/entity/TripodCameraRenderer.def
 rename symbols/src/{ => entity/player}/LocalPlayer.def (100%)
 rename symbols/src/{ => entity/player}/Player.def (100%)
 rename symbols/src/{ => entity/player}/PlayerRenderer.def (100%)
 rename symbols/src/{ => entity/player}/RemotePlayer.def (100%)
 rename symbols/src/{ => entity/player}/ServerPlayer.def (100%)
 rename symbols/src/{ => game}/GameRenderer.def (100%)
 rename symbols/src/{ => game}/Minecraft.def (100%)
 rename symbols/src/{ => game}/NinecraftApp.def (100%)
 rename symbols/src/{ => game/mode}/CreatorMode.def (100%)
 rename symbols/src/{ => game/mode}/GameMode.def (100%)
 rename symbols/src/{ => game/mode}/SurvivalMode.def (100%)
 rename symbols/src/{ => game/options}/Options.def (100%)
 rename symbols/src/{ => game/options}/OptionsFile.def (100%)
 rename symbols/src/{ => game/options}/Options_Option.def (100%)
 rename symbols/src/{ => gui}/Font.def (100%)
 rename symbols/src/{ => gui/components}/Button.def (100%)
 rename symbols/src/{ => gui/components}/Gui.def (100%)
 rename symbols/src/{ => gui/components}/GuiComponent.def (100%)
 rename symbols/src/{ => gui/components}/ImageButton.def (100%)
 rename symbols/src/{ => gui/components}/OptionButton.def (100%)
 rename symbols/src/{ => gui/components}/OptionsPane.def (100%)
 rename symbols/src/{ => gui/screens}/FurnaceScreen.def (100%)
 rename symbols/src/{ => gui/screens}/InBedScreen.def (100%)
 rename symbols/src/{ => gui/screens}/OptionsScreen.def (100%)
 rename symbols/src/{ => gui/screens}/PauseScreen.def (100%)
 rename symbols/src/{ => gui/screens}/ProgressScreen.def (100%)
 rename symbols/src/{ => gui/screens}/Screen.def (83%)
 rename symbols/src/{ => gui/screens}/SelectWorldScreen.def (100%)
 rename symbols/src/{ => gui/screens}/SimpleChooseLevelScreen.def (100%)
 rename symbols/src/{ => gui/screens}/StartMenuScreen.def (100%)
 rename symbols/src/{ => gui/screens}/TextEditScreen.def (100%)
 rename symbols/src/{ => gui/screens}/Touch_IngameBlockSelectionScreen.def (100%)
 rename symbols/src/{ => gui/screens}/Touch_SelectWorldScreen.def (100%)
 rename symbols/src/{ => gui/screens}/WorkbenchScreen.def (100%)
 rename symbols/src/{ => input}/IBuildInput.def (100%)
 rename symbols/src/{ => input}/Mouse.def (100%)
 rename symbols/src/{ => input}/MouseBuildInput.def (100%)
 rename symbols/src/{ => item}/AuxDataTileItem.def (100%)
 rename symbols/src/{ => item}/Item.def (100%)
 rename symbols/src/{ => item}/ItemInstance.def (100%)
 rename symbols/src/{ => item}/ItemRenderer.def (100%)
 rename symbols/src/{ => item}/TileItem.def (100%)
 rename symbols/src/{ => level}/Biome.def (100%)
 rename symbols/src/{ => level}/ChunkSource.def (100%)
 rename symbols/src/{ => level}/ExternalFileLevelStorageSource.def (100%)
 rename symbols/src/{ => level}/Level.def (83%)
 rename symbols/src/{ => level}/LevelData.def (100%)
 rename symbols/src/{ => level}/LevelRenderer.def (100%)
 rename symbols/src/{ => level}/LevelSettings.def (100%)
 rename symbols/src/{ => level}/LevelSource.def (100%)
 rename symbols/src/{ => level}/LevelStorageSource.def (100%)
 rename symbols/src/{ => level}/Material.def (100%)
 rename symbols/src/{ => level}/ParticleEngine.def (100%)
 rename symbols/src/{ => level}/RandomLevelSource.def (100%)
 rename symbols/src/{ => level}/ServerLevel.def (100%)
 create mode 100644 symbols/src/level/container/Container.def
 rename symbols/src/{ => level/container}/ContainerMenu.def (100%)
 rename symbols/src/{ => level/container}/FillingContainer.def (74%)
 rename symbols/src/{ => level/container}/Inventory.def (100%)
 rename symbols/src/{ => level/feature}/LargeCaveFeature.def (100%)
 rename symbols/src/{ => level/feature}/LargeFeature.def (100%)
 rename symbols/src/{ => misc}/AABB.def (100%)
 rename symbols/src/{ => misc}/Common.def (100%)
 rename symbols/src/{ => misc}/Config.def (100%)
 rename symbols/src/{ => misc}/HitResult.def (100%)
 rename symbols/src/{ => misc}/ModelPart.def (100%)
 rename symbols/src/{ => misc}/PerfRenderer.def (100%)
 rename symbols/src/{ => misc}/SoundEngine.def (100%)
 rename symbols/src/{ => misc}/Strings.def (100%)
 rename symbols/src/{ => misc}/Tesselator.def (100%)
 rename symbols/src/{ => misc}/Texture.def (100%)
 rename symbols/src/{ => misc}/Textures.def (100%)
 rename symbols/src/{ => misc}/Vec3.def (100%)
 rename symbols/src/{ => network}/NetEventCallback.def (100%)
 rename symbols/src/{ => network}/PingedCompatibleServer.def (100%)
 rename symbols/src/{ => network}/RakNetInstance.def (100%)
 rename symbols/src/{ => network}/ServerSideNetworkHandler.def (100%)
 rename symbols/src/{ => network/packet}/ChatPacket.def (100%)
 rename symbols/src/{ => network/packet}/LoginPacket.def (100%)
 rename symbols/src/{ => network/packet}/Packet.def (100%)
 rename symbols/src/{ => network/packet}/StartGamePacket.def (100%)
 rename symbols/src/{ => network/raknet}/RakNet_RakNetGUID.def (100%)
 rename symbols/src/{ => network/raknet}/RakNet_RakPeer.def (100%)
 rename symbols/src/{ => network/raknet}/RakNet_RakString.def (100%)
 rename symbols/src/{ => network/raknet}/RakNet_RakString_SharedString.def (100%)
 rename symbols/src/{ => network/raknet}/RakNet_SystemAddress.def (100%)
 rename symbols/src/{ => network/raknet}/extra.h (97%)
 rename symbols/src/{ => recipes}/FurnaceRecipes.def (100%)
 rename symbols/src/{ => recipes}/Recipes.def (100%)
 rename symbols/src/{ => recipes}/Recipes_Type.def (100%)
 rename symbols/src/{ => tile}/GrassTile.def (100%)
 rename symbols/src/{ => tile}/HeavyTile.def (100%)
 rename symbols/src/{ => tile}/LeafTile.def (100%)
 rename symbols/src/{ => tile}/LiquidTile.def (100%)
 rename symbols/src/{ => tile}/StemTile.def (100%)
 rename symbols/src/{ => tile}/TallGrass.def (100%)
 rename symbols/src/{ => tile}/Tile.def (100%)
 rename symbols/src/{ => tile}/TileRenderer.def (100%)
 rename symbols/src/{ => tile}/Tile_SoundType.def (100%)
 rename symbols/src/{ => tile/entity}/ChestTileEntity.def (52%)
 rename symbols/src/{ => tile/entity}/FurnaceTileEntity.def (100%)
 rename symbols/src/{ => tile/entity}/SignTileEntity.def (100%)
 rename symbols/src/{ => tile/entity}/TileEntity.def (100%)

diff --git a/dependencies/symbol-processor/src b/dependencies/symbol-processor/src
index 00b223a..63ad204 160000
--- a/dependencies/symbol-processor/src
+++ b/dependencies/symbol-processor/src
@@ -1 +1 @@
-Subproject commit 00b223a6adb8808b34f49371b6f2f30c182f147a
+Subproject commit 63ad20456c858068fb2762359695021a76fad851
diff --git a/symbols/CMakeLists.txt b/symbols/CMakeLists.txt
index d90eae6..1bd2875 100644
--- a/symbols/CMakeLists.txt
+++ b/symbols/CMakeLists.txt
@@ -2,132 +2,132 @@ project(symbols)
 
 # Definition Files
 set(SRC
-    src/LeafTile.def
-    src/ServerPlayer.def
-    src/Tile.def
-    src/Material.def
-    src/RakNetInstance.def
-    src/LiquidTile.def
-    src/LoginPacket.def
-    src/ChestTileEntity.def
-    src/InBedScreen.def
-    src/LevelSource.def
-    src/TallGrass.def
-    src/Player.def
-    src/ImageButton.def
-    src/Strings.def
-    src/ExternalFileLevelStorageSource.def
-    src/TileEntity.def
-    src/ItemRenderer.def
-    src/ModelPart.def
-    src/Biome.def
-    src/SimpleChooseLevelScreen.def
-    src/PauseScreen.def
-    src/Tesselator.def
-    src/AABB.def
-    src/AppPlatform.def
-    src/Minecraft.def
-    src/OptionsFile.def
-    src/EntityRenderer.def
-    src/RakNet_RakString_SharedString.def
-    src/ChunkSource.def
-    src/Vec3.def
-    src/NetEventCallback.def
-    src/PathfinderMob.def
-    src/Level.def
-    src/RakNet_RakString.def
-    src/StemTile.def
-    src/LevelRenderer.def
-    src/FillingContainer.def
-    src/HumanoidModel.def
-    src/TripodCameraRenderer.def
-    src/FurnaceScreen.def
-    src/HitResult.def
-    src/Container.def
-    src/PerfRenderer.def
-    src/ParticleEngine.def
-    src/PlayerRenderer.def
-    src/GameMode.def
-    src/Font.def
-    src/RemotePlayer.def
-    src/EntityRenderDispatcher.def
-    src/Texture.def
-    src/MobRenderer.def
-    src/LargeFeature.def
-    src/ContainerMenu.def
-    src/Textures.def
-    src/FurnaceTileEntity.def
-    src/TileRenderer.def
-    src/GrassTile.def
-    src/WorkbenchScreen.def
-    src/Packet.def
-    src/RandomLevelSource.def
-    src/SelectWorldScreen.def
-    src/AuxDataTileItem.def
-    src/OptionButton.def
-    src/Touch_IngameBlockSelectionScreen.def
-    src/OptionsPane.def
-    src/HeavyTile.def
-    src/Options.def
-    src/AppPlatform_linux.def
-    src/StartGamePacket.def
-    src/IBuildInput.def
-    src/ItemInstance.def
-    src/SoundEngine.def
-    src/GuiComponent.def
-    src/NinecraftApp.def
-    src/Mob.def
-    src/MouseBuildInput.def
-    src/FurnaceRecipes.def
-    src/Recipes.def
-    src/Button.def
-    src/ChatPacket.def
-    src/LevelData.def
-    src/ServerSideNetworkHandler.def
-    src/LargeCaveFeature.def
-    src/Screen.def
-    src/CreatorMode.def
-    src/HumanoidMobRenderer.def
-    src/OptionsScreen.def
-    src/Gui.def
-    src/Recipes_Type.def
-    src/Inventory.def
-    src/Common.def
-    src/CommandServer.def
-    src/RakNet_SystemAddress.def
-    src/LevelSettings.def
-    src/ServerLevel.def
-    src/Item.def
-    src/extra.h
-    src/Entity.def
-    src/RakNet_RakNetGUID.def
-    src/RakNet_RakPeer.def
-    src/Config.def
-    src/ConnectedClient.def
-    src/Mouse.def
-    src/GameRenderer.def
-    src/SurvivalMode.def
-    src/AppPlatform_readAssetFile_return_value.def
-    src/TextEditScreen.def
-    src/StartMenuScreen.def
-    src/ProgressScreen.def
-    src/LocalPlayer.def
-    src/Touch_SelectWorldScreen.def
-    src/TileItem.def
-    src/Tile_SoundType.def
-    src/Options_Option.def
-    src/LevelStorageSource.def
-    src/SignTileEntity.def
-    src/AgableMob.def
-    src/PrimedTnt.def
-    src/ItemEntity.def
-    src/Arrow.def
-    src/OffsetPosTranslator.def
-    src/EntityFactory.def
-    src/MobFactory.def
-    src/Animal.def
-    src/Sheep.def
-    src/PingedCompatibleServer.def
+    src/game/options/Options_Option.def
+    src/game/options/OptionsFile.def
+    src/game/options/Options.def
+    src/game/Minecraft.def
+    src/game/mode/GameMode.def
+    src/game/mode/CreatorMode.def
+    src/game/mode/SurvivalMode.def
+    src/game/NinecraftApp.def
+    src/game/GameRenderer.def
+    src/network/RakNetInstance.def
+    src/network/PingedCompatibleServer.def
+    src/network/NetEventCallback.def
+    src/network/raknet/RakNet_RakString_SharedString.def
+    src/network/raknet/RakNet_RakString.def
+    src/network/raknet/RakNet_SystemAddress.def
+    src/network/raknet/extra.h
+    src/network/raknet/RakNet_RakNetGUID.def
+    src/network/raknet/RakNet_RakPeer.def
+    src/network/ServerSideNetworkHandler.def
+    src/network/packet/LoginPacket.def
+    src/network/packet/Packet.def
+    src/network/packet/StartGamePacket.def
+    src/network/packet/ChatPacket.def
+    src/entity/EntityFactory.def
+    src/entity/PrimedTnt.def
+    src/entity/EntityRenderer.def
+    src/entity/Sheep.def
+    src/entity/PathfinderMob.def
+    src/entity/HumanoidModel.def
+    src/entity/TripodCameraRenderer.def
+    src/entity/MobFactory.def
+    src/entity/EntityRenderDispatcher.def
+    src/entity/MobRenderer.def
+    src/entity/AgableMob.def
+    src/entity/Animal.def
+    src/entity/Mob.def
+    src/entity/player/ServerPlayer.def
+    src/entity/player/Player.def
+    src/entity/player/PlayerRenderer.def
+    src/entity/player/RemotePlayer.def
+    src/entity/player/LocalPlayer.def
+    src/entity/HumanoidMobRenderer.def
+    src/entity/Entity.def
+    src/entity/ItemEntity.def
+    src/entity/Arrow.def
+    src/level/container/FillingContainer.def
+    src/level/container/Container.def
+    src/level/container/ContainerMenu.def
+    src/level/container/Inventory.def
+    src/level/feature/LargeFeature.def
+    src/level/feature/LargeCaveFeature.def
+    src/level/Material.def
+    src/level/LevelSource.def
+    src/level/ExternalFileLevelStorageSource.def
+    src/level/Biome.def
+    src/level/ChunkSource.def
+    src/level/Level.def
+    src/level/LevelRenderer.def
+    src/level/LevelStorageSource.def
+    src/level/ParticleEngine.def
+    src/level/RandomLevelSource.def
+    src/level/LevelData.def
+    src/level/LevelSettings.def
+    src/level/ServerLevel.def
+    src/item/ItemRenderer.def
+    src/item/AuxDataTileItem.def
+    src/item/ItemInstance.def
+    src/item/Item.def
+    src/item/TileItem.def
+    src/api/OffsetPosTranslator.def
+    src/api/CommandServer.def
+    src/api/ConnectedClient.def
+    src/gui/screens/InBedScreen.def
+    src/gui/screens/SimpleChooseLevelScreen.def
+    src/gui/screens/PauseScreen.def
+    src/gui/screens/FurnaceScreen.def
+    src/gui/screens/WorkbenchScreen.def
+    src/gui/screens/SelectWorldScreen.def
+    src/gui/screens/Touch_IngameBlockSelectionScreen.def
+    src/gui/screens/Screen.def
+    src/gui/screens/OptionsScreen.def
+    src/gui/screens/TextEditScreen.def
+    src/gui/screens/StartMenuScreen.def
+    src/gui/screens/ProgressScreen.def
+    src/gui/screens/Touch_SelectWorldScreen.def
+    src/gui/Font.def
+    src/gui/components/ImageButton.def
+    src/gui/components/OptionButton.def
+    src/gui/components/OptionsPane.def
+    src/gui/components/GuiComponent.def
+    src/gui/components/Button.def
+    src/gui/components/Gui.def
+    src/app-platform/AppPlatform.def
+    src/app-platform/AppPlatform_linux.def
+    src/app-platform/AppPlatform_readAssetFile_return_value.def
+    src/tile/LeafTile.def
+    src/tile/Tile.def
+    src/tile/LiquidTile.def
+    src/tile/TallGrass.def
+    src/tile/entity/ChestTileEntity.def
+    src/tile/entity/TileEntity.def
+    src/tile/entity/FurnaceTileEntity.def
+    src/tile/entity/SignTileEntity.def
+    src/tile/StemTile.def
+    src/tile/Tile_SoundType.def
+    src/tile/TileRenderer.def
+    src/tile/GrassTile.def
+    src/tile/HeavyTile.def
+    src/misc/Strings.def
+    src/misc/ModelPart.def
+    src/misc/Tesselator.def
+    src/misc/AABB.def
+    src/misc/Vec3.def
+    src/misc/HitResult.def
+    src/misc/PerfRenderer.def
+    src/misc/Texture.def
+    src/misc/Textures.def
+    src/misc/SoundEngine.def
+    src/misc/Common.def
+    src/misc/Config.def
+    src/input/IBuildInput.def
+    src/input/MouseBuildInput.def
+    src/input/Mouse.def
+    src/recipes/FurnaceRecipes.def
+    src/recipes/Recipes.def
+    src/recipes/Recipes_Type.def
 )
 # Resolve Definition Files
 set(RESOLVED_SRC "")
diff --git a/symbols/src/Container.def b/symbols/src/Container.def
deleted file mode 100644
index 50e7db8..0000000
--- a/symbols/src/Container.def
+++ /dev/null
@@ -1,2 +0,0 @@
-virtual-method void startOpen() = 0x24;
-virtual-method void stopOpen() = 0x28;
diff --git a/symbols/src/TripodCameraRenderer.def b/symbols/src/TripodCameraRenderer.def
deleted file mode 100644
index 1463265..0000000
--- a/symbols/src/TripodCameraRenderer.def
+++ /dev/null
@@ -1,3 +0,0 @@
-size 0x178;
-
-constructor () = 0x6583c;
\ No newline at end of file
diff --git a/symbols/src/CommandServer.def b/symbols/src/api/CommandServer.def
similarity index 100%
rename from symbols/src/CommandServer.def
rename to symbols/src/api/CommandServer.def
diff --git a/symbols/src/ConnectedClient.def b/symbols/src/api/ConnectedClient.def
similarity index 100%
rename from symbols/src/ConnectedClient.def
rename to symbols/src/api/ConnectedClient.def
diff --git a/symbols/src/OffsetPosTranslator.def b/symbols/src/api/OffsetPosTranslator.def
similarity index 100%
rename from symbols/src/OffsetPosTranslator.def
rename to symbols/src/api/OffsetPosTranslator.def
diff --git a/symbols/src/AppPlatform.def b/symbols/src/app-platform/AppPlatform.def
similarity index 100%
rename from symbols/src/AppPlatform.def
rename to symbols/src/app-platform/AppPlatform.def
diff --git a/symbols/src/AppPlatform_linux.def b/symbols/src/app-platform/AppPlatform_linux.def
similarity index 100%
rename from symbols/src/AppPlatform_linux.def
rename to symbols/src/app-platform/AppPlatform_linux.def
diff --git a/symbols/src/AppPlatform_readAssetFile_return_value.def b/symbols/src/app-platform/AppPlatform_readAssetFile_return_value.def
similarity index 100%
rename from symbols/src/AppPlatform_readAssetFile_return_value.def
rename to symbols/src/app-platform/AppPlatform_readAssetFile_return_value.def
diff --git a/symbols/src/AgableMob.def b/symbols/src/entity/AgableMob.def
similarity index 100%
rename from symbols/src/AgableMob.def
rename to symbols/src/entity/AgableMob.def
diff --git a/symbols/src/Animal.def b/symbols/src/entity/Animal.def
similarity index 100%
rename from symbols/src/Animal.def
rename to symbols/src/entity/Animal.def
diff --git a/symbols/src/Arrow.def b/symbols/src/entity/Arrow.def
similarity index 100%
rename from symbols/src/Arrow.def
rename to symbols/src/entity/Arrow.def
diff --git a/symbols/src/Entity.def b/symbols/src/entity/Entity.def
similarity index 100%
rename from symbols/src/Entity.def
rename to symbols/src/entity/Entity.def
diff --git a/symbols/src/EntityFactory.def b/symbols/src/entity/EntityFactory.def
similarity index 100%
rename from symbols/src/EntityFactory.def
rename to symbols/src/entity/EntityFactory.def
diff --git a/symbols/src/EntityRenderDispatcher.def b/symbols/src/entity/EntityRenderDispatcher.def
similarity index 100%
rename from symbols/src/EntityRenderDispatcher.def
rename to symbols/src/entity/EntityRenderDispatcher.def
diff --git a/symbols/src/EntityRenderer.def b/symbols/src/entity/EntityRenderer.def
similarity index 100%
rename from symbols/src/EntityRenderer.def
rename to symbols/src/entity/EntityRenderer.def
diff --git a/symbols/src/HumanoidMobRenderer.def b/symbols/src/entity/HumanoidMobRenderer.def
similarity index 100%
rename from symbols/src/HumanoidMobRenderer.def
rename to symbols/src/entity/HumanoidMobRenderer.def
diff --git a/symbols/src/HumanoidModel.def b/symbols/src/entity/HumanoidModel.def
similarity index 100%
rename from symbols/src/HumanoidModel.def
rename to symbols/src/entity/HumanoidModel.def
diff --git a/symbols/src/ItemEntity.def b/symbols/src/entity/ItemEntity.def
similarity index 100%
rename from symbols/src/ItemEntity.def
rename to symbols/src/entity/ItemEntity.def
diff --git a/symbols/src/Mob.def b/symbols/src/entity/Mob.def
similarity index 100%
rename from symbols/src/Mob.def
rename to symbols/src/entity/Mob.def
diff --git a/symbols/src/MobFactory.def b/symbols/src/entity/MobFactory.def
similarity index 100%
rename from symbols/src/MobFactory.def
rename to symbols/src/entity/MobFactory.def
diff --git a/symbols/src/MobRenderer.def b/symbols/src/entity/MobRenderer.def
similarity index 100%
rename from symbols/src/MobRenderer.def
rename to symbols/src/entity/MobRenderer.def
diff --git a/symbols/src/PathfinderMob.def b/symbols/src/entity/PathfinderMob.def
similarity index 100%
rename from symbols/src/PathfinderMob.def
rename to symbols/src/entity/PathfinderMob.def
diff --git a/symbols/src/PrimedTnt.def b/symbols/src/entity/PrimedTnt.def
similarity index 100%
rename from symbols/src/PrimedTnt.def
rename to symbols/src/entity/PrimedTnt.def
diff --git a/symbols/src/Sheep.def b/symbols/src/entity/Sheep.def
similarity index 100%
rename from symbols/src/Sheep.def
rename to symbols/src/entity/Sheep.def
diff --git a/symbols/src/entity/TripodCameraRenderer.def b/symbols/src/entity/TripodCameraRenderer.def
new file mode 100644
index 0000000..8756f4a
--- /dev/null
+++ b/symbols/src/entity/TripodCameraRenderer.def
@@ -0,0 +1,5 @@
+size 0x178;
+
+extends EntityRenderer;
+
+constructor () = 0x6583c;
diff --git a/symbols/src/LocalPlayer.def b/symbols/src/entity/player/LocalPlayer.def
similarity index 100%
rename from symbols/src/LocalPlayer.def
rename to symbols/src/entity/player/LocalPlayer.def
diff --git a/symbols/src/Player.def b/symbols/src/entity/player/Player.def
similarity index 100%
rename from symbols/src/Player.def
rename to symbols/src/entity/player/Player.def
diff --git a/symbols/src/PlayerRenderer.def b/symbols/src/entity/player/PlayerRenderer.def
similarity index 100%
rename from symbols/src/PlayerRenderer.def
rename to symbols/src/entity/player/PlayerRenderer.def
diff --git a/symbols/src/RemotePlayer.def b/symbols/src/entity/player/RemotePlayer.def
similarity index 100%
rename from symbols/src/RemotePlayer.def
rename to symbols/src/entity/player/RemotePlayer.def
diff --git a/symbols/src/ServerPlayer.def b/symbols/src/entity/player/ServerPlayer.def
similarity index 100%
rename from symbols/src/ServerPlayer.def
rename to symbols/src/entity/player/ServerPlayer.def
diff --git a/symbols/src/GameRenderer.def b/symbols/src/game/GameRenderer.def
similarity index 100%
rename from symbols/src/GameRenderer.def
rename to symbols/src/game/GameRenderer.def
diff --git a/symbols/src/Minecraft.def b/symbols/src/game/Minecraft.def
similarity index 100%
rename from symbols/src/Minecraft.def
rename to symbols/src/game/Minecraft.def
diff --git a/symbols/src/NinecraftApp.def b/symbols/src/game/NinecraftApp.def
similarity index 100%
rename from symbols/src/NinecraftApp.def
rename to symbols/src/game/NinecraftApp.def
diff --git a/symbols/src/CreatorMode.def b/symbols/src/game/mode/CreatorMode.def
similarity index 100%
rename from symbols/src/CreatorMode.def
rename to symbols/src/game/mode/CreatorMode.def
diff --git a/symbols/src/GameMode.def b/symbols/src/game/mode/GameMode.def
similarity index 100%
rename from symbols/src/GameMode.def
rename to symbols/src/game/mode/GameMode.def
diff --git a/symbols/src/SurvivalMode.def b/symbols/src/game/mode/SurvivalMode.def
similarity index 100%
rename from symbols/src/SurvivalMode.def
rename to symbols/src/game/mode/SurvivalMode.def
diff --git a/symbols/src/Options.def b/symbols/src/game/options/Options.def
similarity index 100%
rename from symbols/src/Options.def
rename to symbols/src/game/options/Options.def
diff --git a/symbols/src/OptionsFile.def b/symbols/src/game/options/OptionsFile.def
similarity index 100%
rename from symbols/src/OptionsFile.def
rename to symbols/src/game/options/OptionsFile.def
diff --git a/symbols/src/Options_Option.def b/symbols/src/game/options/Options_Option.def
similarity index 100%
rename from symbols/src/Options_Option.def
rename to symbols/src/game/options/Options_Option.def
diff --git a/symbols/src/Font.def b/symbols/src/gui/Font.def
similarity index 100%
rename from symbols/src/Font.def
rename to symbols/src/gui/Font.def
diff --git a/symbols/src/Button.def b/symbols/src/gui/components/Button.def
similarity index 100%
rename from symbols/src/Button.def
rename to symbols/src/gui/components/Button.def
diff --git a/symbols/src/Gui.def b/symbols/src/gui/components/Gui.def
similarity index 100%
rename from symbols/src/Gui.def
rename to symbols/src/gui/components/Gui.def
diff --git a/symbols/src/GuiComponent.def b/symbols/src/gui/components/GuiComponent.def
similarity index 100%
rename from symbols/src/GuiComponent.def
rename to symbols/src/gui/components/GuiComponent.def
diff --git a/symbols/src/ImageButton.def b/symbols/src/gui/components/ImageButton.def
similarity index 100%
rename from symbols/src/ImageButton.def
rename to symbols/src/gui/components/ImageButton.def
diff --git a/symbols/src/OptionButton.def b/symbols/src/gui/components/OptionButton.def
similarity index 100%
rename from symbols/src/OptionButton.def
rename to symbols/src/gui/components/OptionButton.def
diff --git a/symbols/src/OptionsPane.def b/symbols/src/gui/components/OptionsPane.def
similarity index 100%
rename from symbols/src/OptionsPane.def
rename to symbols/src/gui/components/OptionsPane.def
diff --git a/symbols/src/FurnaceScreen.def b/symbols/src/gui/screens/FurnaceScreen.def
similarity index 100%
rename from symbols/src/FurnaceScreen.def
rename to symbols/src/gui/screens/FurnaceScreen.def
diff --git a/symbols/src/InBedScreen.def b/symbols/src/gui/screens/InBedScreen.def
similarity index 100%
rename from symbols/src/InBedScreen.def
rename to symbols/src/gui/screens/InBedScreen.def
diff --git a/symbols/src/OptionsScreen.def b/symbols/src/gui/screens/OptionsScreen.def
similarity index 100%
rename from symbols/src/OptionsScreen.def
rename to symbols/src/gui/screens/OptionsScreen.def
diff --git a/symbols/src/PauseScreen.def b/symbols/src/gui/screens/PauseScreen.def
similarity index 100%
rename from symbols/src/PauseScreen.def
rename to symbols/src/gui/screens/PauseScreen.def
diff --git a/symbols/src/ProgressScreen.def b/symbols/src/gui/screens/ProgressScreen.def
similarity index 100%
rename from symbols/src/ProgressScreen.def
rename to symbols/src/gui/screens/ProgressScreen.def
diff --git a/symbols/src/Screen.def b/symbols/src/gui/screens/Screen.def
similarity index 83%
rename from symbols/src/Screen.def
rename to symbols/src/gui/screens/Screen.def
index df30850..c02051d 100644
--- a/symbols/src/Screen.def
+++ b/symbols/src/gui/screens/Screen.def
@@ -12,8 +12,8 @@ virtual-method void buttonClicked(Button *button) = 0x60;
 virtual-method void init() = 0xc;
 
 property Minecraft *minecraft = 0x14;
-property std::vector<Button*> rendered_buttons = 0x18;
-property std::vector<Button*> selectable_buttons = 0x30;
+property std::vector<Button *> rendered_buttons = 0x18;
+property std::vector<Button *> selectable_buttons = 0x30;
 property int width = 0x8;
 property int height = 0xc;
 property bool passthrough_input = 0x10;
diff --git a/symbols/src/SelectWorldScreen.def b/symbols/src/gui/screens/SelectWorldScreen.def
similarity index 100%
rename from symbols/src/SelectWorldScreen.def
rename to symbols/src/gui/screens/SelectWorldScreen.def
diff --git a/symbols/src/SimpleChooseLevelScreen.def b/symbols/src/gui/screens/SimpleChooseLevelScreen.def
similarity index 100%
rename from symbols/src/SimpleChooseLevelScreen.def
rename to symbols/src/gui/screens/SimpleChooseLevelScreen.def
diff --git a/symbols/src/StartMenuScreen.def b/symbols/src/gui/screens/StartMenuScreen.def
similarity index 100%
rename from symbols/src/StartMenuScreen.def
rename to symbols/src/gui/screens/StartMenuScreen.def
diff --git a/symbols/src/TextEditScreen.def b/symbols/src/gui/screens/TextEditScreen.def
similarity index 100%
rename from symbols/src/TextEditScreen.def
rename to symbols/src/gui/screens/TextEditScreen.def
diff --git a/symbols/src/Touch_IngameBlockSelectionScreen.def b/symbols/src/gui/screens/Touch_IngameBlockSelectionScreen.def
similarity index 100%
rename from symbols/src/Touch_IngameBlockSelectionScreen.def
rename to symbols/src/gui/screens/Touch_IngameBlockSelectionScreen.def
diff --git a/symbols/src/Touch_SelectWorldScreen.def b/symbols/src/gui/screens/Touch_SelectWorldScreen.def
similarity index 100%
rename from symbols/src/Touch_SelectWorldScreen.def
rename to symbols/src/gui/screens/Touch_SelectWorldScreen.def
diff --git a/symbols/src/WorkbenchScreen.def b/symbols/src/gui/screens/WorkbenchScreen.def
similarity index 100%
rename from symbols/src/WorkbenchScreen.def
rename to symbols/src/gui/screens/WorkbenchScreen.def
diff --git a/symbols/src/IBuildInput.def b/symbols/src/input/IBuildInput.def
similarity index 100%
rename from symbols/src/IBuildInput.def
rename to symbols/src/input/IBuildInput.def
diff --git a/symbols/src/Mouse.def b/symbols/src/input/Mouse.def
similarity index 100%
rename from symbols/src/Mouse.def
rename to symbols/src/input/Mouse.def
diff --git a/symbols/src/MouseBuildInput.def b/symbols/src/input/MouseBuildInput.def
similarity index 100%
rename from symbols/src/MouseBuildInput.def
rename to symbols/src/input/MouseBuildInput.def
diff --git a/symbols/src/AuxDataTileItem.def b/symbols/src/item/AuxDataTileItem.def
similarity index 100%
rename from symbols/src/AuxDataTileItem.def
rename to symbols/src/item/AuxDataTileItem.def
diff --git a/symbols/src/Item.def b/symbols/src/item/Item.def
similarity index 100%
rename from symbols/src/Item.def
rename to symbols/src/item/Item.def
diff --git a/symbols/src/ItemInstance.def b/symbols/src/item/ItemInstance.def
similarity index 100%
rename from symbols/src/ItemInstance.def
rename to symbols/src/item/ItemInstance.def
diff --git a/symbols/src/ItemRenderer.def b/symbols/src/item/ItemRenderer.def
similarity index 100%
rename from symbols/src/ItemRenderer.def
rename to symbols/src/item/ItemRenderer.def
diff --git a/symbols/src/TileItem.def b/symbols/src/item/TileItem.def
similarity index 100%
rename from symbols/src/TileItem.def
rename to symbols/src/item/TileItem.def
diff --git a/symbols/src/Biome.def b/symbols/src/level/Biome.def
similarity index 100%
rename from symbols/src/Biome.def
rename to symbols/src/level/Biome.def
diff --git a/symbols/src/ChunkSource.def b/symbols/src/level/ChunkSource.def
similarity index 100%
rename from symbols/src/ChunkSource.def
rename to symbols/src/level/ChunkSource.def
diff --git a/symbols/src/ExternalFileLevelStorageSource.def b/symbols/src/level/ExternalFileLevelStorageSource.def
similarity index 100%
rename from symbols/src/ExternalFileLevelStorageSource.def
rename to symbols/src/level/ExternalFileLevelStorageSource.def
diff --git a/symbols/src/Level.def b/symbols/src/level/Level.def
similarity index 83%
rename from symbols/src/Level.def
rename to symbols/src/level/Level.def
index fc5b045..5923df7 100644
--- a/symbols/src/Level.def
+++ b/symbols/src/level/Level.def
@@ -9,5 +9,5 @@ method void addParticle(std::string *particle, float x, float y, float z, float
 method Entity *getEntity(int id) = 0xa45a4;
 method bool addEntity(Entity *entity) = 0xa7cbc;
 
-property std::vector<Player*> players = 0x60;
-property std::vector<Entity*> entities = 0x20;
+property std::vector<Player *> players = 0x60;
+property std::vector<Entity *> entities = 0x20;
diff --git a/symbols/src/LevelData.def b/symbols/src/level/LevelData.def
similarity index 100%
rename from symbols/src/LevelData.def
rename to symbols/src/level/LevelData.def
diff --git a/symbols/src/LevelRenderer.def b/symbols/src/level/LevelRenderer.def
similarity index 100%
rename from symbols/src/LevelRenderer.def
rename to symbols/src/level/LevelRenderer.def
diff --git a/symbols/src/LevelSettings.def b/symbols/src/level/LevelSettings.def
similarity index 100%
rename from symbols/src/LevelSettings.def
rename to symbols/src/level/LevelSettings.def
diff --git a/symbols/src/LevelSource.def b/symbols/src/level/LevelSource.def
similarity index 100%
rename from symbols/src/LevelSource.def
rename to symbols/src/level/LevelSource.def
diff --git a/symbols/src/LevelStorageSource.def b/symbols/src/level/LevelStorageSource.def
similarity index 100%
rename from symbols/src/LevelStorageSource.def
rename to symbols/src/level/LevelStorageSource.def
diff --git a/symbols/src/Material.def b/symbols/src/level/Material.def
similarity index 100%
rename from symbols/src/Material.def
rename to symbols/src/level/Material.def
diff --git a/symbols/src/ParticleEngine.def b/symbols/src/level/ParticleEngine.def
similarity index 100%
rename from symbols/src/ParticleEngine.def
rename to symbols/src/level/ParticleEngine.def
diff --git a/symbols/src/RandomLevelSource.def b/symbols/src/level/RandomLevelSource.def
similarity index 100%
rename from symbols/src/RandomLevelSource.def
rename to symbols/src/level/RandomLevelSource.def
diff --git a/symbols/src/ServerLevel.def b/symbols/src/level/ServerLevel.def
similarity index 100%
rename from symbols/src/ServerLevel.def
rename to symbols/src/level/ServerLevel.def
diff --git a/symbols/src/level/container/Container.def b/symbols/src/level/container/Container.def
new file mode 100644
index 0000000..3b89373
--- /dev/null
+++ b/symbols/src/level/container/Container.def
@@ -0,0 +1,4 @@
+virtual-method void startOpen() = 0x24;
+virtual-method void stopOpen() = 0x28;
+virtual-method ItemInstance *getItem(int slot) = 0x8;
+virtual-method void setItem(int slot, ItemInstance *item_instance) = 0xc;
diff --git a/symbols/src/ContainerMenu.def b/symbols/src/level/container/ContainerMenu.def
similarity index 100%
rename from symbols/src/ContainerMenu.def
rename to symbols/src/level/container/ContainerMenu.def
diff --git a/symbols/src/FillingContainer.def b/symbols/src/level/container/FillingContainer.def
similarity index 74%
rename from symbols/src/FillingContainer.def
rename to symbols/src/level/container/FillingContainer.def
index 80418ab..377fc4e 100644
--- a/symbols/src/FillingContainer.def
+++ b/symbols/src/level/container/FillingContainer.def
@@ -1,6 +1,6 @@
+extends Container;
+
 method void addItem(ItemInstance *item_instance) = 0x92aa0;
-virtual-method ItemInstance *getItem(int slot) = 0x8;
-virtual-method void setItem(int slot, ItemInstance *item_instance) = 0xc;
 virtual-method bool add(ItemInstance *item_instance) = 0x30;
 method void clearSlot(int slot) = 0x922f8;
 method void release(int slot) = 0x92058;
diff --git a/symbols/src/Inventory.def b/symbols/src/level/container/Inventory.def
similarity index 100%
rename from symbols/src/Inventory.def
rename to symbols/src/level/container/Inventory.def
diff --git a/symbols/src/LargeCaveFeature.def b/symbols/src/level/feature/LargeCaveFeature.def
similarity index 100%
rename from symbols/src/LargeCaveFeature.def
rename to symbols/src/level/feature/LargeCaveFeature.def
diff --git a/symbols/src/LargeFeature.def b/symbols/src/level/feature/LargeFeature.def
similarity index 100%
rename from symbols/src/LargeFeature.def
rename to symbols/src/level/feature/LargeFeature.def
diff --git a/symbols/src/AABB.def b/symbols/src/misc/AABB.def
similarity index 100%
rename from symbols/src/AABB.def
rename to symbols/src/misc/AABB.def
diff --git a/symbols/src/Common.def b/symbols/src/misc/Common.def
similarity index 100%
rename from symbols/src/Common.def
rename to symbols/src/misc/Common.def
diff --git a/symbols/src/Config.def b/symbols/src/misc/Config.def
similarity index 100%
rename from symbols/src/Config.def
rename to symbols/src/misc/Config.def
diff --git a/symbols/src/HitResult.def b/symbols/src/misc/HitResult.def
similarity index 100%
rename from symbols/src/HitResult.def
rename to symbols/src/misc/HitResult.def
diff --git a/symbols/src/ModelPart.def b/symbols/src/misc/ModelPart.def
similarity index 100%
rename from symbols/src/ModelPart.def
rename to symbols/src/misc/ModelPart.def
diff --git a/symbols/src/PerfRenderer.def b/symbols/src/misc/PerfRenderer.def
similarity index 100%
rename from symbols/src/PerfRenderer.def
rename to symbols/src/misc/PerfRenderer.def
diff --git a/symbols/src/SoundEngine.def b/symbols/src/misc/SoundEngine.def
similarity index 100%
rename from symbols/src/SoundEngine.def
rename to symbols/src/misc/SoundEngine.def
diff --git a/symbols/src/Strings.def b/symbols/src/misc/Strings.def
similarity index 100%
rename from symbols/src/Strings.def
rename to symbols/src/misc/Strings.def
diff --git a/symbols/src/Tesselator.def b/symbols/src/misc/Tesselator.def
similarity index 100%
rename from symbols/src/Tesselator.def
rename to symbols/src/misc/Tesselator.def
diff --git a/symbols/src/Texture.def b/symbols/src/misc/Texture.def
similarity index 100%
rename from symbols/src/Texture.def
rename to symbols/src/misc/Texture.def
diff --git a/symbols/src/Textures.def b/symbols/src/misc/Textures.def
similarity index 100%
rename from symbols/src/Textures.def
rename to symbols/src/misc/Textures.def
diff --git a/symbols/src/Vec3.def b/symbols/src/misc/Vec3.def
similarity index 100%
rename from symbols/src/Vec3.def
rename to symbols/src/misc/Vec3.def
diff --git a/symbols/src/NetEventCallback.def b/symbols/src/network/NetEventCallback.def
similarity index 100%
rename from symbols/src/NetEventCallback.def
rename to symbols/src/network/NetEventCallback.def
diff --git a/symbols/src/PingedCompatibleServer.def b/symbols/src/network/PingedCompatibleServer.def
similarity index 100%
rename from symbols/src/PingedCompatibleServer.def
rename to symbols/src/network/PingedCompatibleServer.def
diff --git a/symbols/src/RakNetInstance.def b/symbols/src/network/RakNetInstance.def
similarity index 100%
rename from symbols/src/RakNetInstance.def
rename to symbols/src/network/RakNetInstance.def
diff --git a/symbols/src/ServerSideNetworkHandler.def b/symbols/src/network/ServerSideNetworkHandler.def
similarity index 100%
rename from symbols/src/ServerSideNetworkHandler.def
rename to symbols/src/network/ServerSideNetworkHandler.def
diff --git a/symbols/src/ChatPacket.def b/symbols/src/network/packet/ChatPacket.def
similarity index 100%
rename from symbols/src/ChatPacket.def
rename to symbols/src/network/packet/ChatPacket.def
diff --git a/symbols/src/LoginPacket.def b/symbols/src/network/packet/LoginPacket.def
similarity index 100%
rename from symbols/src/LoginPacket.def
rename to symbols/src/network/packet/LoginPacket.def
diff --git a/symbols/src/Packet.def b/symbols/src/network/packet/Packet.def
similarity index 100%
rename from symbols/src/Packet.def
rename to symbols/src/network/packet/Packet.def
diff --git a/symbols/src/StartGamePacket.def b/symbols/src/network/packet/StartGamePacket.def
similarity index 100%
rename from symbols/src/StartGamePacket.def
rename to symbols/src/network/packet/StartGamePacket.def
diff --git a/symbols/src/RakNet_RakNetGUID.def b/symbols/src/network/raknet/RakNet_RakNetGUID.def
similarity index 100%
rename from symbols/src/RakNet_RakNetGUID.def
rename to symbols/src/network/raknet/RakNet_RakNetGUID.def
diff --git a/symbols/src/RakNet_RakPeer.def b/symbols/src/network/raknet/RakNet_RakPeer.def
similarity index 100%
rename from symbols/src/RakNet_RakPeer.def
rename to symbols/src/network/raknet/RakNet_RakPeer.def
diff --git a/symbols/src/RakNet_RakString.def b/symbols/src/network/raknet/RakNet_RakString.def
similarity index 100%
rename from symbols/src/RakNet_RakString.def
rename to symbols/src/network/raknet/RakNet_RakString.def
diff --git a/symbols/src/RakNet_RakString_SharedString.def b/symbols/src/network/raknet/RakNet_RakString_SharedString.def
similarity index 100%
rename from symbols/src/RakNet_RakString_SharedString.def
rename to symbols/src/network/raknet/RakNet_RakString_SharedString.def
diff --git a/symbols/src/RakNet_SystemAddress.def b/symbols/src/network/raknet/RakNet_SystemAddress.def
similarity index 100%
rename from symbols/src/RakNet_SystemAddress.def
rename to symbols/src/network/raknet/RakNet_SystemAddress.def
diff --git a/symbols/src/extra.h b/symbols/src/network/raknet/extra.h
similarity index 97%
rename from symbols/src/extra.h
rename to symbols/src/network/raknet/extra.h
index 20e2233..6afcd74 100644
--- a/symbols/src/extra.h
+++ b/symbols/src/network/raknet/extra.h
@@ -1,4 +1,3 @@
-// RakNet
 typedef enum {
     RAKNET_STARTED = 0,
     RAKNET_ALREADY_STARTED,
diff --git a/symbols/src/FurnaceRecipes.def b/symbols/src/recipes/FurnaceRecipes.def
similarity index 100%
rename from symbols/src/FurnaceRecipes.def
rename to symbols/src/recipes/FurnaceRecipes.def
diff --git a/symbols/src/Recipes.def b/symbols/src/recipes/Recipes.def
similarity index 100%
rename from symbols/src/Recipes.def
rename to symbols/src/recipes/Recipes.def
diff --git a/symbols/src/Recipes_Type.def b/symbols/src/recipes/Recipes_Type.def
similarity index 100%
rename from symbols/src/Recipes_Type.def
rename to symbols/src/recipes/Recipes_Type.def
diff --git a/symbols/src/GrassTile.def b/symbols/src/tile/GrassTile.def
similarity index 100%
rename from symbols/src/GrassTile.def
rename to symbols/src/tile/GrassTile.def
diff --git a/symbols/src/HeavyTile.def b/symbols/src/tile/HeavyTile.def
similarity index 100%
rename from symbols/src/HeavyTile.def
rename to symbols/src/tile/HeavyTile.def
diff --git a/symbols/src/LeafTile.def b/symbols/src/tile/LeafTile.def
similarity index 100%
rename from symbols/src/LeafTile.def
rename to symbols/src/tile/LeafTile.def
diff --git a/symbols/src/LiquidTile.def b/symbols/src/tile/LiquidTile.def
similarity index 100%
rename from symbols/src/LiquidTile.def
rename to symbols/src/tile/LiquidTile.def
diff --git a/symbols/src/StemTile.def b/symbols/src/tile/StemTile.def
similarity index 100%
rename from symbols/src/StemTile.def
rename to symbols/src/tile/StemTile.def
diff --git a/symbols/src/TallGrass.def b/symbols/src/tile/TallGrass.def
similarity index 100%
rename from symbols/src/TallGrass.def
rename to symbols/src/tile/TallGrass.def
diff --git a/symbols/src/Tile.def b/symbols/src/tile/Tile.def
similarity index 100%
rename from symbols/src/Tile.def
rename to symbols/src/tile/Tile.def
diff --git a/symbols/src/TileRenderer.def b/symbols/src/tile/TileRenderer.def
similarity index 100%
rename from symbols/src/TileRenderer.def
rename to symbols/src/tile/TileRenderer.def
diff --git a/symbols/src/Tile_SoundType.def b/symbols/src/tile/Tile_SoundType.def
similarity index 100%
rename from symbols/src/Tile_SoundType.def
rename to symbols/src/tile/Tile_SoundType.def
diff --git a/symbols/src/ChestTileEntity.def b/symbols/src/tile/entity/ChestTileEntity.def
similarity index 52%
rename from symbols/src/ChestTileEntity.def
rename to symbols/src/tile/entity/ChestTileEntity.def
index 3a24d93..decdfa0 100644
--- a/symbols/src/ChestTileEntity.def
+++ b/symbols/src/tile/entity/ChestTileEntity.def
@@ -2,4 +2,4 @@ extends TileEntity;
 
 constructor () = 0xcfa78;
 
-property Container container = 0x30;
+property FillingContainer container = 0x30;
diff --git a/symbols/src/FurnaceTileEntity.def b/symbols/src/tile/entity/FurnaceTileEntity.def
similarity index 100%
rename from symbols/src/FurnaceTileEntity.def
rename to symbols/src/tile/entity/FurnaceTileEntity.def
diff --git a/symbols/src/SignTileEntity.def b/symbols/src/tile/entity/SignTileEntity.def
similarity index 100%
rename from symbols/src/SignTileEntity.def
rename to symbols/src/tile/entity/SignTileEntity.def
diff --git a/symbols/src/TileEntity.def b/symbols/src/tile/entity/TileEntity.def
similarity index 100%
rename from symbols/src/TileEntity.def
rename to symbols/src/tile/entity/TileEntity.def