diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h
index 0549e6647..d2d1ecd14 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h	
@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+
 
 class CommandBlockEntity;
 
diff --git a/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp
index 96e6d3edd..cdc2e221c 100644
--- a/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp	
+++ b/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp	
@@ -20,7 +20,7 @@
 #include "minecraft/world/item/crafting/Recipes.h"
 #include "minecraft/world/item/crafting/Recipy.h"
 #include "minecraft/world/level/Level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
 // #include "Social/SocialManager.h"
diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp
index 5c07dc3a3..4487fb1df 100644
--- a/targets/minecraft/client/gui/Gui.cpp
+++ b/targets/minecraft/client/gui/Gui.cpp
@@ -36,7 +36,7 @@
 #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 #include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "minecraft/client/resources/ResourceLocation.h"
-#include "minecraft/net.minecraft.h"
+
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/effect/MobEffect.h"
@@ -44,17 +44,17 @@
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
-#include "minecraft/world/food/net.minecraft.world.food.h"
+
 #include "minecraft/world/item/ItemInstance.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
+
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/PortalTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/net.minecraft.world.h"
+
+
 #include "strings.h"
 
 ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =
diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.h b/targets/minecraft/client/gui/achievement/AchievementScreen.h
index f82e5d702..1b4d35934 100644
--- a/targets/minecraft/client/gui/achievement/AchievementScreen.h
+++ b/targets/minecraft/client/gui/achievement/AchievementScreen.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "minecraft/client/gui/Screen.h"
 #include "minecraft/stats/Achievements.h"
-#include "minecraft/stats/net.minecraft.stats.h"
+
 
 class StatsCounter;
 
diff --git a/targets/minecraft/client/gui/inventory/BeaconPowerButton.h b/targets/minecraft/client/gui/inventory/BeaconPowerButton.h
index 6752a727c..9a6750239 100644
--- a/targets/minecraft/client/gui/inventory/BeaconPowerButton.h
+++ b/targets/minecraft/client/gui/inventory/BeaconPowerButton.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "AbstractBeaconButton.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
+
 
 class BeaconScreen;
 
diff --git a/targets/minecraft/client/gui/inventory/BeaconScreen.h b/targets/minecraft/client/gui/inventory/BeaconScreen.h
index 725b232cd..4a977ac58 100644
--- a/targets/minecraft/client/gui/inventory/BeaconScreen.h
+++ b/targets/minecraft/client/gui/inventory/BeaconScreen.h
@@ -4,7 +4,7 @@
 
 #include "AbstractContainerScreen.h"
 #include "minecraft/world/inventory/BeaconMenu.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+
 
 class BeaconConfirmButton;
 class BeaconCancelButton;
diff --git a/targets/minecraft/client/gui/inventory/BrewingStandScreen.h b/targets/minecraft/client/gui/inventory/BrewingStandScreen.h
index 145eb526c..45f4a16bc 100644
--- a/targets/minecraft/client/gui/inventory/BrewingStandScreen.h
+++ b/targets/minecraft/client/gui/inventory/BrewingStandScreen.h
@@ -4,7 +4,7 @@
 
 #include "AbstractContainerScreen.h"
 #include "minecraft/world/inventory/BrewingStandMenu.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+
 
 class BrewingStandMenu;
 class BrewingStandTileEntity;
diff --git a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.h b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.h
index f0674e751..c543c563b 100644
--- a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.h
+++ b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.h
@@ -2,7 +2,7 @@
 #include <memory>
 
 #include "AbstractContainerScreen.h"
-#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+
 
 class Container;
 class EntityHorse;
diff --git a/targets/minecraft/client/gui/inventory/MerchantScreen.h b/targets/minecraft/client/gui/inventory/MerchantScreen.h
index 3dca14de4..698fc394c 100644
--- a/targets/minecraft/client/gui/inventory/MerchantScreen.h
+++ b/targets/minecraft/client/gui/inventory/MerchantScreen.h
@@ -4,7 +4,7 @@
 
 #include "AbstractContainerScreen.h"
 #include "minecraft/world/inventory/MerchantMenu.h"
-#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
+
 
 class TradeSwitchButton;
 class Inventory;
diff --git a/targets/minecraft/client/level/DemoLevel.h b/targets/minecraft/client/level/DemoLevel.h
index 3c2582086..d768251c9 100644
--- a/targets/minecraft/client/level/DemoLevel.h
+++ b/targets/minecraft/client/level/DemoLevel.h
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "minecraft/world/level/Level.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
 
 class Dimension;
 class LevelSettings;
diff --git a/targets/minecraft/client/multiplayer/ClientConnection.h b/targets/minecraft/client/multiplayer/ClientConnection.h
index 7104ec292..10358fd8a 100644
--- a/targets/minecraft/client/multiplayer/ClientConnection.h
+++ b/targets/minecraft/client/multiplayer/ClientConnection.h
@@ -7,7 +7,7 @@
 
 #include "4J_Storage.h"
 #include "minecraft/network/Connection.h"
-#include "minecraft/network/net.minecraft.network.h"
+
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/network/packet/PacketListener.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h
index 232170ae2..fc45641ae 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h
+++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h
@@ -5,9 +5,9 @@
 
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
+
 #include "minecraft/world/level/levelgen/RandomLevelSource.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
 
 class ServerChunkCache;
 class Level;
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.h b/targets/minecraft/client/multiplayer/MultiPlayerLevel.h
index b5d9749a7..7f0193bdb 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.h
+++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.h
@@ -10,9 +10,9 @@
 #include "console_helpers/HashExtension.h"
 #include "java/JavaIntHash.h"
 #include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
+
 #include "minecraft/world/level/Level.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
 
 class ClientConnection;
 class MultiPlayerChunkCache;
diff --git a/targets/minecraft/client/player/LocalPlayer.h b/targets/minecraft/client/player/LocalPlayer.h
index 48445f947..d449f6c66 100644
--- a/targets/minecraft/client/player/LocalPlayer.h
+++ b/targets/minecraft/client/player/LocalPlayer.h
@@ -9,7 +9,7 @@
 #include "minecraft/commands/CommandsEnum.h"
 #include "minecraft/util/SmoothFloat.h"
 #include "minecraft/world/entity/player/Player.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+
 
 class Level;
 class User;
diff --git a/targets/minecraft/client/player/RemotePlayer.h b/targets/minecraft/client/player/RemotePlayer.h
index ebdf2745f..278e24aff 100644
--- a/targets/minecraft/client/player/RemotePlayer.h
+++ b/targets/minecraft/client/player/RemotePlayer.h
@@ -6,7 +6,7 @@
 #include "minecraft/commands/CommandsEnum.h"
 #include "minecraft/util/SmoothFloat.h"
 #include "minecraft/world/entity/player/Player.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+
 
 class Input;
 class Level;
diff --git a/targets/minecraft/commands/common/net.minecraft.commands.common.h b/targets/minecraft/commands/common/net.minecraft.commands.common.h
deleted file mode 100644
index 83b0dca5c..000000000
--- a/targets/minecraft/commands/common/net.minecraft.commands.common.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "DefaultGameModeCommand.h"
-#include "EffectCommand.h"
-#include "EnchantItemCommand.h"
-#include "ExperienceCommand.h"
-#include "GameModeCommand.h"
-#include "GiveItemCommand.h"
-#include "KillCommand.h"
-#include "TimeCommand.h"
-#include "ToggleDownfallCommand.h"
\ No newline at end of file
diff --git a/targets/minecraft/commands/net.minecraft.commands.h b/targets/minecraft/commands/net.minecraft.commands.h
deleted file mode 100644
index 9701ce8b4..000000000
--- a/targets/minecraft/commands/net.minecraft.commands.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "AdminLogCommand.h"
-#include "Command.h"
-#include "CommandDispatcher.h"
-#include "CommandSender.h"
-#include "CommandsEnum.h"
\ No newline at end of file
diff --git a/targets/minecraft/core/net.minecraft.core.h b/targets/minecraft/core/net.minecraft.core.h
deleted file mode 100644
index df1bf3056..000000000
--- a/targets/minecraft/core/net.minecraft.core.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "AbstractProjectileDispenseBehavior.h"
-#include "Behavior.h"
-#include "BehaviorRegistry.h"
-#include "BlockSource.h"
-#include "BlockSourceImpl.h"
-#include "DefaultDispenseItemBehavior.h"
-#include "DispenseItemBehavior.h"
-#include "FacingEnum.h"
-#include "ItemDispenseBehaviors.h"
-#include "LocatableSource.h"
-#include "Location.h"
-#include "Position.h"
-#include "PositionImpl.h"
-#include "Source.h"
\ No newline at end of file
diff --git a/targets/minecraft/locale/net.minecraft.locale.h b/targets/minecraft/locale/net.minecraft.locale.h
deleted file mode 100644
index a818fcf8a..000000000
--- a/targets/minecraft/locale/net.minecraft.locale.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "I18n.h"
-#include "Language.h"
\ No newline at end of file
diff --git a/targets/minecraft/net.minecraft.h b/targets/minecraft/net.minecraft.h
deleted file mode 100644
index 065408d09..000000000
--- a/targets/minecraft/net.minecraft.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "Direction.h"
-#include "Facing.h"
-#include "Pos.h"
-#include "SharedConstants.h"
\ No newline at end of file
diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h
index ccc525bc9..0acf36a24 100644
--- a/targets/minecraft/network/Connection.h
+++ b/targets/minecraft/network/Connection.h
@@ -14,7 +14,7 @@
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/System.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
-#include "minecraft/network/packet/net.minecraft.network.packet.h"
+
 
 class DataInputStream;
 class DataOutputStream;
diff --git a/targets/minecraft/network/net.minecraft.network.h b/targets/minecraft/network/net.minecraft.network.h
deleted file mode 100644
index cbeae4751..000000000
--- a/targets/minecraft/network/net.minecraft.network.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "Connection.h"
\ No newline at end of file
diff --git a/targets/minecraft/network/packet/net.minecraft.network.packet.h b/targets/minecraft/network/packet/net.minecraft.network.packet.h
deleted file mode 100644
index 4a9a10943..000000000
--- a/targets/minecraft/network/packet/net.minecraft.network.packet.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include "AddEntityPacket.h"
-#include "AddGlobalEntityPacket.h"
-#include "AddMobPacket.h"
-#include "AddPaintingPacket.h"
-#include "AddPlayerPacket.h"
-#include "AnimatePacket.h"
-#include "AwardStatPacket.h"
-#include "BlockRegionUpdatePacket.h"
-#include "ChatPacket.h"
-#include "ChunkTilesUpdatePacket.h"
-#include "ChunkVisibilityPacket.h"
-#include "ComplexItemDataPacket.h"
-#include "ContainerAckPacket.h"
-#include "ContainerClickPacket.h"
-#include "ContainerClosePacket.h"
-#include "ContainerOpenPacket.h"
-#include "ContainerSetContentPacket.h"
-#include "ContainerSetDataPacket.h"
-#include "ContainerSetSlotPacket.h"
-#include "DisconnectPacket.h"
-#include "EntityActionAtPositionPacket.h"
-#include "EntityEventPacket.h"
-#include "ExplodePacket.h"
-#include "GameEventPacket.h"
-#include "InteractPacket.h"
-#include "KeepAlivePacket.h"
-#include "LevelEventPacket.h"
-#include "LoginPacket.h"
-#include "MoveEntityPacket.h"
-#include "MoveEntityPacketSmall.h"
-#include "MovePlayerPacket.h"
-#include "Packet.h"
-#include "PacketListener.h"
-#include "PlayerActionPacket.h"
-#include "PlayerCommandPacket.h"
-#include "PlayerInputPacket.h"
-#include "PreLoginPacket.h"
-#include "RemoveEntitiesPacket.h"
-#include "RespawnPacket.h"
-#include "SetCarriedItemPacket.h"
-#include "SetEntityDataPacket.h"
-#include "SetEntityLinkPacket.h"
-#include "SetEntityMotionPacket.h"
-#include "SetEquippedItemPacket.h"
-#include "SetHealthPacket.h"
-#include "SetSpawnPositionPacket.h"
-#include "SetTimePacket.h"
-#include "SignUpdatePacket.h"
-#include "TakeItemEntityPacket.h"
-#include "TeleportEntityPacket.h"
-#include "TileEventPacket.h"
-#include "TileUpdatePacket.h"
-#include "UseItemPacket.h"
-
-// 1.8.2 Added
-#include "AddExperienceOrbPacket.h"
-#include "GetInfoPacket.h"
-#include "PlayerInfoPacket.h"
-#include "RemoveMobEffectPacket.h"
-#include "SetCreativeModeSlotPacket.h"
-#include "SetExperiencePacket.h"
-#include "UpdateMobEffectPacket.h"
-
-// 1.0.1 Added
-#include "ContainerButtonClickPacket.h"
-#include "TileEntityDataPacket.h"
-
-// 1.1 Added (TU9)
-#include "CustomPayloadPacket.h"
-
-// 1.2.3
-#include "RotateHeadPacket.h"
-
-// 1.3.2
-#include "ChatAutoCompletePacket.h"
-#include "ClientCommandPacket.h"
-#include "ClientInformationPacket.h"
-#include "ClientProtocolPacket.h"
-#include "LevelSoundPacket.h"
-#include "PlayerAbilitiesPacket.h"
-#include "ServerAuthDataPacket.h"
-#include "TileDestructionPacket.h"
-
-// 1.6.4
-#include "LevelParticlesPacket.h"
-#include "SetDisplayObjectivePacket.h"
-#include "SetObjectivePacket.h"
-#include "SetPlayerTeamPacket.h"
-#include "SetScorePacket.h"
-#include "TileEditorOpenPacket.h"
-#include "UpdateAttributesPacket.h"
-
-// 4J Added
-#include "ChunkVisibilityAreaPacket.h"
-#include "CraftItemPacket.h"
-#include "DebugOptionsPacket.h"
-#include "GameCommandPacket.h"
-#include "KickPlayerPacket.h"
-#include "ServerSettingsChangedPacket.h"
-#include "TextureAndGeometryChangePacket.h"
-#include "TextureAndGeometryPacket.h"
-#include "TextureChangePacket.h"
-#include "TexturePacket.h"
-#include "TradeItemPacket.h"
-#include "UpdateGameRuleProgressPacket.h"
-#include "UpdateProgressPacket.h"
-#include "XZPacket.h"
diff --git a/targets/minecraft/server/DispenserBootstrap.h b/targets/minecraft/server/DispenserBootstrap.h
index 695676b59..1693e23d0 100644
--- a/targets/minecraft/server/DispenserBootstrap.h
+++ b/targets/minecraft/server/DispenserBootstrap.h
@@ -1,6 +1,9 @@
 #pragma once
-#include "minecraft/core/net.minecraft.core.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
+
+#include "minecraft/core/BehaviorRegistry.h"
+#include "minecraft/core/ItemDispenseBehaviors.h"
+#include "minecraft/world/item/Item.h"
+#include "minecraft/world/item/PotionItem.h"
 #include "minecraft/world/level/tile/DispenserTile.h"
 #include "minecraft/world/level/tile/LevelEvent.h"
 
diff --git a/targets/minecraft/server/level/CreativeMode.cpp b/targets/minecraft/server/level/CreativeMode.cpp
index bb790202d..200ddf34b 100644
--- a/targets/minecraft/server/level/CreativeMode.cpp
+++ b/targets/minecraft/server/level/CreativeMode.cpp
@@ -3,11 +3,11 @@
 
 #include "minecraft/client/User.h"
 #include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+
+
+
+
+
 
 CreativeMode::CreativeMode(Minecraft* minecraft) : GameMode(minecraft) {
     destroyDelay = 0;
diff --git a/targets/minecraft/server/level/DemoMode.cpp b/targets/minecraft/server/level/DemoMode.cpp
index fc0ddf008..a7a75767f 100644
--- a/targets/minecraft/server/level/DemoMode.cpp
+++ b/targets/minecraft/server/level/DemoMode.cpp
@@ -1,7 +1,7 @@
 
 #include "DemoMode.h"
 
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
 
 DemoMode::DemoMode(Minecraft* minecraft) : SurvivalMode(minecraft) {
     demoHasEnded = false;
diff --git a/targets/minecraft/server/level/GameMode.cpp b/targets/minecraft/server/level/GameMode.cpp
index 3791be7e4..23eb4c5d6 100644
--- a/targets/minecraft/server/level/GameMode.cpp
+++ b/targets/minecraft/server/level/GameMode.cpp
@@ -3,13 +3,13 @@
 
 #include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+
+
+
+
+
+
+
 
 GameMode::GameMode(Minecraft* minecraft) {
     instaBuild = false;  // 4J - added
diff --git a/targets/minecraft/server/level/ServerChunkCache.h b/targets/minecraft/server/level/ServerChunkCache.h
index ae0ea79fd..32b9e1c47 100644
--- a/targets/minecraft/server/level/ServerChunkCache.h
+++ b/targets/minecraft/server/level/ServerChunkCache.h
@@ -11,8 +11,8 @@
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 #include "minecraft/world/level/levelgen/RandomLevelSource.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
+
+
 
 class ServerLevel;
 class ChunkStorage;
diff --git a/targets/minecraft/server/level/ServerLevel.h b/targets/minecraft/server/level/ServerLevel.h
index dacc0aa15..8e717a776 100644
--- a/targets/minecraft/server/level/ServerLevel.h
+++ b/targets/minecraft/server/level/ServerLevel.h
@@ -19,7 +19,7 @@
 #include "minecraft/world/level/TickNextTickData.h"
 #include "minecraft/world/level/TileEventData.h"
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
 
 class ServerChunkCache;
 class MinecraftServer;
diff --git a/targets/minecraft/server/level/ServerPlayer.h b/targets/minecraft/server/level/ServerPlayer.h
index 6c8fcc716..e5f983869 100644
--- a/targets/minecraft/server/level/ServerPlayer.h
+++ b/targets/minecraft/server/level/ServerPlayer.h
@@ -12,8 +12,9 @@
 #include "minecraft/commands/CommandsEnum.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/world/entity/player/Player.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h"
+
+
 #include "minecraft/world/level/ChunkPos.h"
 
 class PlayerConnection;
diff --git a/targets/minecraft/server/level/SurvivalMode.cpp b/targets/minecraft/server/level/SurvivalMode.cpp
index 780c30e41..9105d2259 100644
--- a/targets/minecraft/server/level/SurvivalMode.cpp
+++ b/targets/minecraft/server/level/SurvivalMode.cpp
@@ -5,10 +5,10 @@
 #include "minecraft/client/ClientConstants.h"
 #include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+
+
+
+
 
 SurvivalMode::SurvivalMode(Minecraft* minecraft) : GameMode(minecraft) {
     // 4J - added initialisers
diff --git a/targets/minecraft/stats/net.minecraft.stats.h b/targets/minecraft/stats/net.minecraft.stats.h
deleted file mode 100644
index 52cc4afc0..000000000
--- a/targets/minecraft/stats/net.minecraft.stats.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "Achievement.h"
-#include "Achievements.h"
-#include "DescFormatter.h"
-#include "GeneralStat.h"
-#include "ItemStat.h"
-#include "Stat.h"
-#include "StatFormatter.h"
-#include "Stats.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/damageSource/net.minecraft.world.damagesource.h b/targets/minecraft/world/damageSource/net.minecraft.world.damagesource.h
deleted file mode 100644
index df0ccd8f6..000000000
--- a/targets/minecraft/world/damageSource/net.minecraft.world.damagesource.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "CombatEntry.h"
-#include "CombatTracker.h"
-#include "DamageSource.h"
-#include "EntityDamageSource.h"
-#include "IndirectEntityDamageSource.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/effect/net.minecraft.world.effect.h b/targets/minecraft/world/effect/net.minecraft.world.effect.h
deleted file mode 100644
index eb307dbb8..000000000
--- a/targets/minecraft/world/effect/net.minecraft.world.effect.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "AbsoptionMobEffect.h"
-#include "AttackDamageMobEffect.h"
-#include "HealthBoostMobEffect.h"
-#include "InstantaneousMobEffect.h"
-#include "MobEffect.h"
-#include "MobEffectInstance.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h b/targets/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h
deleted file mode 100644
index 783f48b57..000000000
--- a/targets/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "Attribute.h"
-#include "AttributeInstance.h"
-#include "AttributeModifier.h"
-#include "BaseAttribute.h"
-#include "BaseAttributeMap.h"
-#include "ModifiableAttributeInstance.h"
-#include "RangedAttribute.h"
-#include "ServersideAttributeMap.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h b/targets/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h
deleted file mode 100644
index 2c00c0c07..000000000
--- a/targets/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "BodyControl.h"
-#include "Control.h"
-#include "JumpControl.h"
-#include "LookControl.h"
-#include "MoveControl.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h b/targets/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h
deleted file mode 100644
index e93067309..000000000
--- a/targets/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "AvoidPlayerGoal.h"
-#include "BegGoal.h"
-#include "BreakDoorGoal.h"
-#include "BreedGoal.h"
-#include "ControlledByPlayerGoal.h"
-#include "DoorInteractGoal.h"
-#include "EatTileGoal.h"
-#include "FleeSunGoal.h"
-#include "FloatGoal.h"
-#include "FollowOwnerGoal.h"
-#include "FollowParentGoal.h"
-#include "Goal.h"
-#include "GoalSelector.h"
-#include "InteractGoal.h"
-#include "LeapAtTargetGoal.h"
-#include "LookAtPlayerGoal.h"
-#include "LookAtTradingPlayerGoal.h"
-#include "MakeLoveGoal.h"
-#include "MeleeAttackGoal.h"
-#include "MoveIndoorsGoal.h"
-#include "MoveThroughVillageGoal.h"
-#include "MoveTowardsRestrictionGoal.h"
-#include "MoveTowardsTargetGoal.h"
-#include "OcelotAttackGoal.h"
-#include "OcelotSitOnTileGoal.h"
-#include "OfferFlowerGoal.h"
-#include "OpenDoorGoal.h"
-#include "PanicGoal.h"
-#include "PlayGoal.h"
-#include "RandomLookAroundGoal.h"
-#include "RandomStrollGoal.h"
-#include "RangedAttackGoal.h"
-#include "RestrictOpenDoorGoal.h"
-#include "RestrictSunGoal.h"
-#include "RunAroundLikeCrazyGoal.h"
-#include "SitGoal.h"
-#include "SwellGoal.h"
-#include "TakeFlowerGoal.h"
-#include "TemptGoal.h"
-#include "TradeWithPlayerGoal.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h b/targets/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h
deleted file mode 100644
index fecd00384..000000000
--- a/targets/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "DefendVillageTargetGoal.h"
-#include "HurtByTargetGoal.h"
-#include "NearestAttackableTargetGoal.h"
-#include "NonTameRandomTargetGoal.h"
-#include "OwnerHurtByTargetGoal.h"
-#include "OwnerHurtTargetGoal.h"
-#include "TargetGoal.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h b/targets/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h
deleted file mode 100644
index ca7e39ff7..000000000
--- a/targets/minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "PathNavigation.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/sensing/net.minecraft.world.entity.ai.sensing.h b/targets/minecraft/world/entity/ai/sensing/net.minecraft.world.entity.ai.sensing.h
deleted file mode 100644
index 20410c95b..000000000
--- a/targets/minecraft/world/entity/ai/sensing/net.minecraft.world.entity.ai.sensing.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "Sensing.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/util/net.minecraft.world.entity.ai.util.h b/targets/minecraft/world/entity/ai/util/net.minecraft.world.entity.ai.util.h
deleted file mode 100644
index de67b5be9..000000000
--- a/targets/minecraft/world/entity/ai/util/net.minecraft.world.entity.ai.util.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "RandomPos.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h b/targets/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h
deleted file mode 100644
index 0bccb3428..000000000
--- a/targets/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "DoorInfo.h"
-#include "Village.h"
-#include "VillageSiege.h"
-#include "Villages.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h b/targets/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h
deleted file mode 100644
index 924d413a6..000000000
--- a/targets/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "AmbientCreature.h"
-#include "Bat.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h b/targets/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h
deleted file mode 100644
index 2bcb81f15..000000000
--- a/targets/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "Animal.h"
-#include "Chicken.h"
-#include "Cow.h"
-#include "Pig.h"
-#include "Sheep.h"
-#include "Squid.h"
-#include "WaterAnimal.h"
-#include "Wolf.h"
-
-// 1.0.1
-#include "Golem.h"
-#include "MushroomCow.h"
-#include "SnowMan.h"
-
-// 1.2.3
-#include "Ocelot.h"
-#include "VillagerGolem.h"
-
-// 1.6.4
-#include "EntityHorse.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h b/targets/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h
deleted file mode 100644
index 89ca950f8..000000000
--- a/targets/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "EnderCrystal.h"
-#include "EnderDragon.h"
-#include "minecraft/world/level/levelgen/feature/NetherSphereFeature.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h b/targets/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h
deleted file mode 100644
index 764092017..000000000
--- a/targets/minecraft/world/entity/boss/net.minecraft.world.entity.boss.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "BossMob.h"
-#include "MultiEntityMob.h"
-#include "MultiEntityMobPart.h"
diff --git a/targets/minecraft/world/entity/global/LightningBolt.h b/targets/minecraft/world/entity/global/LightningBolt.h
index 3d876a9e6..b9a24565f 100644
--- a/targets/minecraft/world/entity/global/LightningBolt.h
+++ b/targets/minecraft/world/entity/global/LightningBolt.h
@@ -4,7 +4,7 @@
 
 #include "GlobalEntity.h"
 #include "java/Class.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+
 
 class Level;
 
diff --git a/targets/minecraft/world/entity/global/net.minecraft.world.entity.global.h b/targets/minecraft/world/entity/global/net.minecraft.world.entity.global.h
deleted file mode 100644
index 51123d90e..000000000
--- a/targets/minecraft/world/entity/global/net.minecraft.world.entity.global.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "GlobalEntity.h"
-#include "LightningBolt.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/item/net.minecraft.world.entity.item.h b/targets/minecraft/world/entity/item/net.minecraft.world.entity.item.h
deleted file mode 100644
index 8b797ad14..000000000
--- a/targets/minecraft/world/entity/item/net.minecraft.world.entity.item.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Boat.h"
-#include "FallingTile.h"
-#include "ItemEntity.h"
-#include "Minecart.h"
-#include "MinecartChest.h"
-#include "MinecartContainer.h"
-#include "MinecartFurnace.h"
-#include "MinecartHopper.h"
-#include "MinecartRideable.h"
-#include "MinecartSpawner.h"
-#include "MinecartTNT.h"
-#include "PrimedTnt.h"
diff --git a/targets/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h b/targets/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h
deleted file mode 100644
index 4ef4336dd..000000000
--- a/targets/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "Creeper.h"
-#include "Enemy.h"
-#include "Ghast.h"
-#include "Giant.h"
-#include "Monster.h"
-#include "PigZombie.h"
-#include "Skeleton.h"
-#include "Slime.h"
-#include "Spider.h"
-#include "Zombie.h"
-
-// 1.8.2
-#include "CaveSpider.h"
-#include "EnderMan.h"
-#include "Silverfish.h"
-
-// 1.0.1
-#include "Blaze.h"
-#include "LavaSlime.h"
-
-// 1.6.4
-#include "RangedAttackMob.h"
-#include "SharedMonsterAttributes.h"
-#include "Witch.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/net.minecraft.world.entity.h b/targets/minecraft/world/entity/net.minecraft.world.entity.h
deleted file mode 100644
index 534103de1..000000000
--- a/targets/minecraft/world/entity/net.minecraft.world.entity.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "Creature.h"
-#include "Entity.h"
-#include "EntityEvent.h"
-#include "EntityIO.h"
-#include "EntityPos.h"
-#include "FlyingMob.h"
-#include "Mob.h"
-#include "MobCategory.h"
-#include "Painting.h"
-#include "PathfinderMob.h"
-#include "SyncedEntityData.h"
-
-// 1.8.2
-#include "DelayedRelease.h"
-#include "ExperienceOrb.h"
-
-// 1.0.1
-#include "MobType.h"
-
-// TU9
-#include "ItemFrame.h"
-
-// 1.2.3
-#include "AgeableMob.h"
-#include "TamableAnimal.h"
-
-// 1.6.4
-#include "EntitySelector.h"
-#include "LeashFenceKnotEntity.h"
-#include "LivingEntity.h"
-#include "MobGroupData.h"
-#include "OwnableEntity.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h b/targets/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h
deleted file mode 100644
index 90c1258a8..000000000
--- a/targets/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "ClientSideMerchant.h"
-#include "Npc.h"
-#include "Villager.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/player/net.minecraft.world.entity.player.h b/targets/minecraft/world/entity/player/net.minecraft.world.entity.player.h
deleted file mode 100644
index 3e78834c6..000000000
--- a/targets/minecraft/world/entity/player/net.minecraft.world.entity.player.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "Abilities.h"
-#include "Inventory.h"
-#include "Player.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h b/targets/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h
deleted file mode 100644
index 814bce5bf..000000000
--- a/targets/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "Arrow.h"
-#include "Fireball.h"
-#include "FishingHook.h"
-#include "Snowball.h"
-#include "ThrownEgg.h"
-
-// 1.0.1
-#include "EyeOfEnderSignal.h"
-#include "SmallFireball.h"
-#include "Throwable.h"
-#include "ThrownEnderpearl.h"
-#include "ThrownExpBottle.h"  // Brought forward from 1.2
-#include "ThrownPotion.h"
-
-// Added TU 9
-#include "DragonFireball.h"
-
-// 1.6.4
-#include "FireworksRocketEntity.h"
-#include "LargeFireball.h"
-#include "Projectile.h"
-#include "WitherSkull.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/food/net.minecraft.world.food.h b/targets/minecraft/world/food/net.minecraft.world.food.h
deleted file mode 100644
index 91b1916a8..000000000
--- a/targets/minecraft/world/food/net.minecraft.world.food.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "FoodConstants.h"
-#include "FoodData.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/inventory/net.minecraft.world.inventory.h b/targets/minecraft/world/inventory/net.minecraft.world.inventory.h
deleted file mode 100644
index 3d6d38f04..000000000
--- a/targets/minecraft/world/inventory/net.minecraft.world.inventory.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "AbstractContainerMenu.h"
-#include "AnimalChest.h"
-#include "AnvilMenu.h"
-#include "ArmorSlot.h"
-#include "BeaconMenu.h"
-#include "BrewingStandMenu.h"
-#include "ContainerMenu.h"
-#include "CraftingContainer.h"
-#include "CraftingMenu.h"
-#include "EnchantmentContainer.h"
-#include "EnchantmentMenu.h"
-#include "EnchantmentSlot.h"
-#include "FireworksMenu.h"
-#include "FurnaceMenu.h"
-#include "FurnaceResultSlot.h"
-#include "HopperMenu.h"
-#include "HorseInventoryMenu.h"
-#include "InventoryMenu.h"
-#include "MenuBackup.h"
-#include "MerchantContainer.h"
-#include "MerchantMenu.h"
-#include "MerchantResultSlot.h"
-#include "PlayerEnderChestContainer.h"
-#include "RepairContainer.h"
-#include "RepairResultSlot.h"
-#include "ResultContainer.h"
-#include "ResultSlot.h"
-#include "Slot.h"
-#include "TrapMenu.h"
-#include "net.minecraft.world.inventory.ContainerListener.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h b/targets/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h
deleted file mode 100644
index fe69821fb..000000000
--- a/targets/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "PotionBrewing.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h b/targets/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h
deleted file mode 100644
index 1bc8b2d02..000000000
--- a/targets/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "ArmorDyeRecipe.h"
-#include "ArmorRecipes.h"
-#include "ClothDyeRecipes.h"
-#include "FireworksRecipe.h"
-#include "FoodRecipes.h"
-#include "FurnaceRecipes.h"
-#include "OreRecipes.h"
-#include "Recipes.h"
-#include "Recipy.h"
-#include "ShapedRecipy.h"
-#include "ShapelessRecipy.h"
-#include "StructureRecipes.h"
-#include "ToolRecipes.h"
-#include "WeaponRecipes.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h b/targets/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h
deleted file mode 100644
index 28ab0ac3a..000000000
--- a/targets/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "DamageEnchantment.h"
-#include "DigDurabilityEnchantment.h"
-#include "DiggingEnchantment.h"
-#include "Enchantment.h"
-#include "EnchantmentCategory.h"
-#include "EnchantmentHelper.h"
-#include "EnchantmentInstance.h"
-#include "FireAspectEnchantment.h"
-#include "KnockbackEnchantment.h"
-#include "LootBonusEnchantment.h"
-#include "OxygenEnchantment.h"
-#include "ProtectionEnchantment.h"
-#include "UntouchingEnchantment.h"
-#include "WaterWorkerEnchantment.h"
-
-// 4J Stu - Brought forward
-#include "ArrowDamageEnchantment.h"
-#include "ArrowFireEnchantment.h"
-#include "ArrowInfiniteEnchantment.h"
-#include "ArrowKnockbackEnchantment.h"
-#include "ThornsEnchantment.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/item/net.minecraft.world.item.h b/targets/minecraft/world/item/net.minecraft.world.item.h
deleted file mode 100644
index 1132a8b13..000000000
--- a/targets/minecraft/world/item/net.minecraft.world.item.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-#include "ArmorItem.h"
-#include "BedItem.h"
-#include "BoatItem.h"
-#include "BowItem.h"
-#include "BowlFoodItem.h"
-#include "BucketItem.h"
-#include "CoalItem.h"
-#include "ComplexItem.h"
-#include "DiggerItem.h"
-#include "DoorItem.h"
-#include "DyePowderItem.h"
-#include "EggItem.h"
-#include "FishingRodItem.h"
-#include "FlintAndSteelItem.h"
-#include "FoodItem.h"
-#include "HatchetItem.h"
-#include "HoeItem.h"
-#include "Item.h"
-#include "ItemInstance.h"
-#include "LeafTileItem.h"
-#include "MapItem.h"
-#include "MinecartItem.h"
-#include "WoolTileItem.h"
-// #include "PaintingItem.h"
-#include "PickaxeItem.h"
-#include "PistonTileItem.h"
-#include "PlanterTileItem.h"
-#include "RecordingItem.h"
-#include "RedStoneItem.h"
-#include "SaddleItem.h"
-#include "SaplingTileItem.h"
-#include "SeedItem.h"
-#include "ShearsItem.h"
-#include "ShovelItem.h"
-#include "SignItem.h"
-#include "SnowballItem.h"
-#include "StoneSlabTileItem.h"
-#include "TileItem.h"
-#include "WeaponItem.h"
-
-// 1.8.2
-#include "AuxDataTileItem.h"
-#include "ColoredTileItem.h"
-#include "UseAnim.h"
-
-// 1.0.1
-#include "BottleItem.h"
-#include "EnderEyeItem.h"
-#include "EnderpearlItem.h"
-#include "ExperienceItem.h"  // 4J Stu brought forward
-#include "GoldenAppleItem.h"
-#include "MilkBucketItem.h"
-#include "PotionItem.h"
-#include "Rarity.h"
-#include "WaterLilyTileItem.h"
-
-// TU9
-#include "FireChargeItem.h"
-#include "MultiTextureTileItem.h"
-#include "SpawnEggItem.h"
-#include "minecraft/world/entity/ItemFrame.h"
-
-// TU12
-#include "SkullItem.h"
-
-// TU14
-#include "AnvilTileItem.h"
-#include "BookItem.h"
-#include "CarrotOnAStickItem.h"
-#include "EnchantedBookItem.h"
-#include "SeedFoodItem.h"
-
-// 1.6.4
-#include "EmptyMapItem.h"
-#include "FireworksChargeItem.h"
-#include "FireworksItem.h"
-#include "LeashItem.h"
-#include "NameTagItem.h"
-#include "SimpleFoiledItem.h"
-#include "SnowItem.h"
-
-// 4J Added
-#include "ClockItem.h"
-#include "CompassItem.h"
-#include "minecraft/util/HtmlString.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/item/trading/net.minecraft.world.item.trading.h b/targets/minecraft/world/item/trading/net.minecraft.world.item.trading.h
deleted file mode 100644
index a705a1c07..000000000
--- a/targets/minecraft/world/item/trading/net.minecraft.world.item.trading.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "Merchant.h"
-#include "MerchantRecipe.h"
-#include "MerchantRecipeList.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/LevelType.h b/targets/minecraft/world/level/LevelType.h
index db9a998b9..353f833cb 100644
--- a/targets/minecraft/world/level/LevelType.h
+++ b/targets/minecraft/world/level/LevelType.h
@@ -1,8 +1,6 @@
 #pragma once
 #include <string>
 
-#include "net.minecraft.world.level.h"
-
 class LevelType {
 public:
     static LevelType* levelTypes[16];  // = new LevelType[16];
diff --git a/targets/minecraft/world/level/biome/BiomeSource.h b/targets/minecraft/world/level/biome/BiomeSource.h
index b49af35dc..c6b15c4bc 100644
--- a/targets/minecraft/world/level/biome/BiomeSource.h
+++ b/targets/minecraft/world/level/biome/BiomeSource.h
@@ -9,7 +9,7 @@
 #include "BiomeCache.h"
 #include "BiomeSource.h"
 #include "minecraft/world/level/biome/BiomeSource.h"
-#include "minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h"
+
 
 class ChunkPos;
 class Level;
diff --git a/targets/minecraft/world/level/biome/net.minecraft.world.level.biome.h b/targets/minecraft/world/level/biome/net.minecraft.world.level.biome.h
deleted file mode 100644
index 87682b0d1..000000000
--- a/targets/minecraft/world/level/biome/net.minecraft.world.level.biome.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "Biome.h"
-#include "BiomeSource.h"
-#include "FixedBiomeSource.h"
-#include "ForestBiome.h"
-#include "HellBiome.h"
-#include "IceBiome.h"
-#include "MushroomIslandBiome.h"
-#include "RainforestBiome.h"
-#include "SwampBiome.h"
-#include "TaigaBiome.h"
-#include "TheEndBiome.h"
-#include "TheEndBiomeDecorator.h"
-#include "WaterlilyFeature.h"
-#include "minecraft/world/level/LevelSource.h"
-
-// 1.8.2
-#include "BiomeCache.h"
-#include "BiomeDecorator.h"
-#include "DesertBiome.h"
-#include "ExtremeHillsBiome.h"
-#include "OceanBiome.h"
-#include "PlainsBiome.h"
-#include "RiverBiome.h"
-
-// 1.1
-#include "BeachBiome.h"
-
-// 1.2.3
-#include "JungleBiome.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h b/targets/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h
deleted file mode 100644
index d98bbe5cf..000000000
--- a/targets/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "BlockReplacements.h"
-#include "ChunkSource.h"
-#include "DataLayer.h"
-#include "EmptyLevelChunk.h"
-#include "LevelChunk.h"
-#include "ReadOnlyChunkCache.h"
diff --git a/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp
index 7e31908f3..3023cbf3b 100644
--- a/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp
+++ b/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp
@@ -1,7 +1,7 @@
 #include "MemoryChunkStorage.h"
 
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
+
 
 LevelChunk* MemoryChunkStorage::load(Level* level, int x,
                                      int z)  // throws IOException
diff --git a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp
index e7c1f4d3a..7a057560b 100644
--- a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp
+++ b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp
@@ -5,10 +5,10 @@
 #include "ZoneFile.h"
 #include "java/ByteBuffer.h"
 #include "java/File.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+
+
+
+
 
 // 4J Stu - There are changes to this class for 1.8.2, but since we never use it
 // anyway lets not worry about it
diff --git a/targets/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h b/targets/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h
deleted file mode 100644
index 900803f6e..000000000
--- a/targets/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "ChunkStorage.h"
-#include "ChunkStorageProfileDecorator.h"
-#include "McRegionChunkStorage.h"
-#include "MemoryChunkStorage.h"
-#include "NbtSlotFile.h"
-#include "OldChunkStorage.h"
-#include "RegionFile.h"
-#include "RegionFileCache.h"
-#include "ZoneFile.h"
-#include "ZoneIo.h"
-#include "ZonedChunkStorage.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h b/targets/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h
deleted file mode 100644
index 0c9f41c2a..000000000
--- a/targets/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "Dimension.h"
-#include "HellDimension.h"
-#include "NormalDimension.h"
-#include "TheEndDimension.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h b/targets/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h
deleted file mode 100644
index f45b4dc65..000000000
--- a/targets/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "BasicTreeFeature.h"
-#include "BirchFeature.h"
-#include "BonusChestFeature.h"
-#include "CactusFeature.h"
-#include "CaveFeature.h"
-#include "ClayFeature.h"
-#include "DeadBushFeature.h"
-#include "DesertWellFeature.h"
-#include "EndPodiumFeature.h"
-#include "Feature.h"
-#include "FlowerFeature.h"
-#include "GroundBushFeature.h"
-#include "HellFireFeature.h"
-#include "HellPortalFeature.h"
-#include "HellSpringFeature.h"
-#include "HouseFeature.h"
-#include "HugeMushroomFeature.h"
-#include "LakeFeature.h"
-#include "LightGemFeature.h"
-#include "MegaTreeFeature.h"
-#include "MonsterRoomFeature.h"
-#include "OreFeature.h"
-#include "PineFeature.h"
-#include "PumpkinFeature.h"
-#include "ReedsFeature.h"
-#include "SandFeature.h"
-#include "SpikeFeature.h"
-#include "SpringFeature.h"
-#include "SpruceFeature.h"
-#include "SwampTreeFeature.h"
-#include "TallGrassFeature.h"
-#include "TreeFeature.h"
-#include "VinesFeature.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/levelgen/flat/net.minecraft.world.level.levelgen.flat.h b/targets/minecraft/world/level/levelgen/flat/net.minecraft.world.level.levelgen.flat.h
deleted file mode 100644
index 92b8023c6..000000000
--- a/targets/minecraft/world/level/levelgen/flat/net.minecraft.world.level.levelgen.flat.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "FlatGeneratorInfo.h"
-#include "FlatLayerInfo.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h b/targets/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h
deleted file mode 100644
index 95eda9450..000000000
--- a/targets/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "CanyonFeature.h"
-#include "CustomLevelSource.h"
-#include "DungeonFeature.h"
-#include "FlatLevelSource.h"
-#include "HellFlatLevelSource.h"
-#include "HellRandomLevelSource.h"
-#include "LargeCaveFeature.h"
-#include "LargeFeature.h"
-#include "LargeHellCaveFeature.h"
-#include "RandomLevelSource.h"
-#include "TheEndLevelRandomLevelSource.h"
-#include "TownFeature.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp b/targets/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp
index 5e0839b9c..a317fe9e6 100644
--- a/targets/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp
@@ -1,9 +1,9 @@
 #include "SkyIslandDimension.h"
 
-#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
-#include "minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+
+
+
+
 
 void SkyIslandDimension::init() {
     biomeSource = new FixedBiomeSource(Biome::sky, 0.5f, 0);
diff --git a/targets/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h b/targets/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h
deleted file mode 100644
index a7a9e90bc..000000000
--- a/targets/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "BlockGenMethods.h"
-#include "BoundingBox.h"
-#include "MineShaftFeature.h"
-#include "MineShaftPieces.h"
-#include "MineShaftStart.h"
-#include "NetherBridgeFeature.h"
-#include "NetherBridgePieces.h"
-#include "RandomScatteredLargeFeature.h"
-#include "ScatteredFeaturePieces.h"
-#include "StrongholdFeature.h"
-#include "StrongholdPieces.h"
-#include "StructureFeature.h"
-#include "StructureFeatureIO.h"
-#include "StructureFeatureSavedData.h"
-#include "StructurePiece.h"
-#include "StructureStart.h"
-#include "VillageFeature.h"
-#include "VillagePieces.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h b/targets/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h
deleted file mode 100644
index a0f5bf1fa..000000000
--- a/targets/minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "Distort.h"
-#include "Emboss.h"
-#include "FastNoise.h"
-#include "ImprovedNoise.h"
-#include "PerlinNoise.h"
-#include "PerlinSimplexNoise.h"
-#include "Rotate.h"
-#include "Scale.h"
-#include "SimplexNoise.h"
-#include "Synth.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/material/net.minecraft.world.level.material.h b/targets/minecraft/world/level/material/net.minecraft.world.level.material.h
deleted file mode 100644
index 173ac53a1..000000000
--- a/targets/minecraft/world/level/material/net.minecraft.world.level.material.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "DecorationMaterial.h"
-#include "GasMaterial.h"
-#include "LiquidMaterial.h"
-#include "Material.h"
-#include "MaterialColor.h"
-#include "PortalMaterial.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/net.minecraft.world.level.h b/targets/minecraft/world/level/net.minecraft.world.level.h
deleted file mode 100644
index a70217450..000000000
--- a/targets/minecraft/world/level/net.minecraft.world.level.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "BaseMobSpawner.h"
-#include "BlockDestructionProgress.h"
-#include "Calendar.h"
-#include "ChunkPos.h"
-#include "Coord.h"
-#include "Explosion.h"
-#include "FoliageColor.h"
-#include "GameRules.h"
-#include "GrassColor.h"
-#include "Level.h"
-#include "LevelConflictException.h"
-#include "LevelListener.h"
-#include "LevelSettings.h"
-#include "LevelSource.h"
-#include "LevelType.h"
-#include "LightLayer.h"
-#include "MobSpawner.h"
-#include "PortalForcer.h"
-#include "Region.h"
-#include "TickNextTickData.h"
-#include "TileEventData.h"
-#include "TilePos.h"
-#include "WaterColor.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h b/targets/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h
deleted file mode 100644
index b41a510d3..000000000
--- a/targets/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "AddIslandLayer.h"
-#include "AddMushroomIslandLayer.h"
-#include "AddSnowLayer.h"
-#include "BiomeInitLayer.h"
-#include "DownfallLayer.h"
-#include "DownfallMixerLayer.h"
-#include "FlatLayer.h"
-#include "FuzzyZoomLayer.h"
-#include "GrowMushroomIslandLayer.h"  // 4J added
-#include "IslandLayer.h"
-#include "Layer.h"
-#include "RiverInitLayer.h"
-#include "RiverLayer.h"
-#include "RiverMixerLayer.h"
-#include "ShoreLayer.h"
-#include "SmoothLayer.h"
-#include "SmoothZoomLayer.h"
-#include "TemperatureLayer.h"
-#include "TemperatureMixerLayer.h"
-#include "VoronoiZoom.h"
-#include "ZoomLayer.h"
-
-// 1.1.
-#include "RegionHillsLayer.h"
-#include "SwampRiversLayer.h"
diff --git a/targets/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h b/targets/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h
deleted file mode 100644
index acfbbea89..000000000
--- a/targets/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "BinaryHeap.h"
-#include "Node.h"
-#include "Path.h"
-#include "PathFinder.h"
diff --git a/targets/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h b/targets/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h
deleted file mode 100644
index 8e30ebfc8..000000000
--- a/targets/minecraft/world/level/redstone/net.minecraft.world.level.redstone.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "Redstone.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h b/targets/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h
deleted file mode 100644
index 5174cd3a7..000000000
--- a/targets/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "MapItemSavedData.h"
-#include "SavedData.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp b/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp
index e89c7fe9d..ddf855160 100644
--- a/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp
+++ b/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp
@@ -1,9 +1,9 @@
 #include "MemoryLevelStorage.h"
 
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
+
+
+
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h"
 #include "nbt/com.mojang.nbt.h"
 
diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorage.h b/targets/minecraft/world/level/storage/MemoryLevelStorage.h
index 51da696cc..c21eb097e 100644
--- a/targets/minecraft/world/level/storage/MemoryLevelStorage.h
+++ b/targets/minecraft/world/level/storage/MemoryLevelStorage.h
@@ -2,10 +2,10 @@
 
 #include "LevelStorage.h"
 #include "PlayerIO.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
+
+
+
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "nbt/com.mojang.nbt.h"
 
diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp b/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp
index 8ddc7c2e3..d06349fa5 100644
--- a/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp
+++ b/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp
@@ -2,7 +2,7 @@
 
 #include "LevelSummary.h"
 #include "MemoryLevelStorage.h"
-#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
+
 
 MemoryLevelStorageSource::MemoryLevelStorageSource() {}
 
diff --git a/targets/minecraft/world/level/storage/net.minecraft.world.level.storage.h b/targets/minecraft/world/level/storage/net.minecraft.world.level.storage.h
deleted file mode 100644
index 1ba7b8e8b..000000000
--- a/targets/minecraft/world/level/storage/net.minecraft.world.level.storage.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "DirectoryLevelStorage.h"
-#include "DirectoryLevelStorageSource.h"
-#include "LevelData.h"
-#include "LevelStorage.h"
-#include "LevelStorageProfilerDecorator.h"
-#include "LevelStorageSource.h"
-#include "LevelSummary.h"
-#include "McRegionLevelStorage.h"
-#include "McRegionLevelStorageSource.h"
-// #include "MemoryLevelStorage.h" // 4J removed as unused
-// #include "MemoryLevelStorageSource.h" // 4J removed as
-// unused
-#include "MockedLevelStorage.h"
-#include "PlayerIO.h"
-#include "SavedDataStorage.h"
diff --git a/targets/minecraft/world/level/tile/DispenserTile.h b/targets/minecraft/world/level/tile/DispenserTile.h
index 2b9624522..03583f27f 100644
--- a/targets/minecraft/world/level/tile/DispenserTile.h
+++ b/targets/minecraft/world/level/tile/DispenserTile.h
@@ -2,7 +2,7 @@
 #include <memory>
 
 #include "BaseEntityTile.h"
-#include "minecraft/core/net.minecraft.core.h"
+
 
 class Player;
 class Mob;
diff --git a/targets/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h b/targets/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h
deleted file mode 100644
index d5f0606af..000000000
--- a/targets/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "BeaconTileEntity.h"
-#include "BrewingStandTileEntity.h"
-#include "ChestTileEntity.h"
-#include "CommandBlockEntity.h"
-#include "ComparatorTileEntity.h"
-#include "DaylightDetectorTileEntity.h"
-#include "DispenserTileEntity.h"
-#include "DropperTileEntity.h"
-#include "EnchantmentTableTileEntity.h"
-#include "EnderChestTileEntity.h"
-#include "FurnaceTileEntity.h"
-#include "Hopper.h"
-#include "HopperTileEntity.h"
-#include "MobSpawnerTileEntity.h"
-#include "MusicTileEntity.h"
-#include "PistonMovingTileEntity.h"
-#include "SignTileEntity.h"
-#include "SkullTileEntity.h"
-#include "TheEndPortalTileEntity.h"
-#include "TileEntity.h"
diff --git a/targets/minecraft/world/level/tile/net.minecraft.world.level.tile.h b/targets/minecraft/world/level/tile/net.minecraft.world.level.tile.h
deleted file mode 100644
index 918613803..000000000
--- a/targets/minecraft/world/level/tile/net.minecraft.world.level.tile.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma once
-
-#include "AirTile.h"
-#include "AnvilTile.h"
-#include "BaseEntityTile.h"
-#include "BasePressurePlateTile.h"
-#include "BaseRailTile.h"
-#include "BeaconTile.h"
-#include "BedTile.h"
-#include "BookshelfTile.h"
-#include "BrewingStandTile.h"
-#include "ButtonTile.h"
-#include "CactusTile.h"
-#include "CakeTile.h"
-#include "CarrotTile.h"
-#include "CauldronTile.h"
-#include "ChestTile.h"
-#include "ClayTile.h"
-#include "CocoaTile.h"
-#include "ColoredTile.h"
-#include "CommandBlock.h"
-#include "ComparatorTile.h"
-#include "CoralTile.h"
-#include "CropTile.h"
-#include "DaylightDetectorTile.h"
-#include "DeadBushTile.h"
-#include "DetectorRailTile.h"
-#include "DiodeTile.h"
-#include "DirectionalTile.h"
-#include "DirtTile.h"
-#include "DispenserTile.h"
-#include "DoorTile.h"
-#include "DropperTile.h"
-#include "EggTile.h"
-#include "EnchantmentTableTile.h"
-#include "EnderChestTile.h"
-#include "EntityTile.h"
-#include "FarmTile.h"
-#include "FenceGateTile.h"
-#include "FenceTile.h"
-#include "FireTile.h"
-#include "FlowerPotTile.h"
-#include "FurnaceTile.h"
-#include "GlassTile.h"
-#include "GlowstoneTile.h"
-#include "GrassTile.h"
-#include "GravelTile.h"
-#include "HalfSlabTile.h"
-#include "HalfTransparentTile.h"
-#include "HayBlockTile.h"
-#include "HeavyTile.h"
-#include "HopperTile.h"
-#include "HugeMushroomTile.h"
-#include "IceTile.h"
-#include "JukeboxTile.h"
-#include "LadderTile.h"
-#include "LeafTile.h"
-#include "LevelEvent.h"
-#include "LeverTile.h"
-#include "LiquidTile.h"
-#include "LiquidTileDynamic.h"
-#include "LiquidTileStatic.h"
-#include "LockedChestTile.h"
-#include "MelonTile.h"
-#include "MetalTile.h"
-#include "MobSpawnerTile.h"
-#include "MushroomPlantTile.h"
-#include "MycelTile.h"
-#include "NetherWartTile.h"
-#include "NetherrackTile.h"
-#include "NotGateTile.h"
-#include "NoteBlockTile.h"
-#include "ObsidianTile.h"
-#include "OreTile.h"
-#include "PlantTile.h"
-#include "PortalTile.h"
-#include "PotatoTile.h"
-#include "PoweredMetalTile.h"
-#include "PoweredRailTile.h"
-#include "PressurePlateTile.h"
-#include "PumpkinTile.h"
-#include "QuartzBlockTile.h"
-#include "RailTile.h"
-#include "RedStoneDustTile.h"
-#include "RedStoneOreTile.h"
-#include "RedlightTile.h"
-#include "ReedTile.h"
-#include "RepeaterTile.h"
-#include "RotatedPillarTile.h"
-#include "SandStoneTile.h"
-#include "SaplingPlantTile.h"
-#include "SignTile.h"
-#include "SkullTile.h"
-#include "SmoothStoneBrickTile.h"
-#include "SnowTile.h"
-#include "SoulSandTile.h"
-#include "SpongeTile.h"
-#include "StainedGlassBlock.h"
-#include "StainedGlassPaneBlock.h"
-#include "StairTile.h"
-#include "StemTile.h"
-#include "StoneButtonTile.h"
-#include "StoneMonsterTile.h"
-#include "StoneSlabTile.h"
-#include "StoneTile.h"
-#include "TallGrassPlantTile.h"
-#include "TheEndPortalFrameTile.h"
-#include "ThinFenceTile.h"
-#include "Tile.h"
-#include "TntTile.h"
-#include "TopSnowTile.h"
-#include "TorchTile.h"
-#include "TransparentTile.h"
-#include "TrapDoorTile.h"
-#include "TreeTile.h"
-#include "TripWireSourceTile.h"
-#include "TripWireTile.h"
-#include "VineTile.h"
-#include "WallTile.h"
-#include "WaterLilyTile.h"
-#include "WebTile.h"
-#include "WeightedPressurePlateTile.h"
-#include "WoodButtonTile.h"
-#include "WoodSlabTile.h"
-#include "WoodTile.h"
-#include "WoolCarpetTile.h"
-#include "WorkbenchTile.h"
-#include "minecraft/world/level/tile/entity/TheEndPortalTile.h"
-#include "minecraft/world/level/tile/piston/PistonBaseTile.h"
-#include "minecraft/world/level/tile/piston/PistonExtensionTile.h"
diff --git a/targets/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h b/targets/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h
deleted file mode 100644
index be7272b06..000000000
--- a/targets/minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "PistonBaseTile.h"
-#include "PistonExtensionTile.h"
-#include "minecraft/world/level/tile/entity/PistonMovingTileEntity.h"
-#include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/net.minecraft.world.h b/targets/minecraft/world/net.minecraft.world.h
deleted file mode 100644
index 76da5855f..000000000
--- a/targets/minecraft/world/net.minecraft.world.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "CompoundContainer.h"
-#include "Container.h"
-#include "Difficulty.h"
-#include "MouseInventoryClickHandler.h"
-#include "SimpleContainer.h"
-#include "net.minecraft.world.ContainerListener.h"
-
-// TU10
-#include "FlippedIcon.h"
-#include "Icon.h"
-#include "IconRegister.h"
-#include "WorldlyContainer.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/phys/net.minecraft.world.phys.h b/targets/minecraft/world/phys/net.minecraft.world.phys.h
deleted file mode 100644
index 87f5bf980..000000000
--- a/targets/minecraft/world/phys/net.minecraft.world.phys.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include "AABB.h"
-#include "HitResult.h"
-#include "Vec3.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h b/targets/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h
deleted file mode 100644
index fd8c86400..000000000
--- a/targets/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "DummyCriteria.h"
-#include "HealthCriteria.h"
-#include "ObjectiveCriteria.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/scores/net.minecraft.world.scores.h b/targets/minecraft/world/scores/net.minecraft.world.scores.h
deleted file mode 100644
index 57cb7a333..000000000
--- a/targets/minecraft/world/scores/net.minecraft.world.scores.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "Objective.h"
-#include "PlayerTeam.h"
-#include "Score.h"
-#include "ScoreHolder.h"
-#include "Scoreboard.h"
-#include "ScoreboardSaveData.h"
-#include "Team.h"
\ No newline at end of file