78 files changed, 252 insertions, 240 deletions

diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 0dcdeb3db..e52125532 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -403,6 +403,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\source\Doors.h"
+				>
+			</File>
+			<File
 				RelativePath="..\source\Enchantments.cpp"
 				>
 			</File>
@@ -503,6 +507,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\source\Ladder.h"
+				>
+			</File>
+			<File
 				RelativePath="..\source\LeakFinder.cpp"
 				>
 				<FileConfiguration
@@ -679,6 +687,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\source\Sign.h"
+				>
+			</File>
+			<File
 				RelativePath="..\source\StackWalker.cpp"
 				>
 				<FileConfiguration
@@ -985,71 +997,59 @@
 				Name="Entities"
 				>
 				<File
-					RelativePath="..\source\Doors.h"
-					>
-				</File>
-				<File
-					RelativePath="..\source\Entity.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\source\Entity.h"
-					>
-				</File>
-				<File
-					RelativePath="..\source\FallingBlock.cpp"
+					RelativePath="..\source\Entities\Entity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\FallingBlock.h"
+					RelativePath="..\source\Entities\Entity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Ladder.h"
+					RelativePath="..\source\Entities\FallingBlock.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Minecart.cpp"
+					RelativePath="..\source\Entities\FallingBlock.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Minecart.h"
+					RelativePath="..\source\Entities\Minecart.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Pawn.cpp"
+					RelativePath="..\source\Entities\Minecart.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Pawn.h"
+					RelativePath="..\source\Entities\Pawn.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Pickup.cpp"
+					RelativePath="..\source\Entities\Pawn.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Pickup.h"
+					RelativePath="..\source\Entities\Pickup.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Player.cpp"
+					RelativePath="..\source\Entities\Pickup.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Player.h"
+					RelativePath="..\source\Entities\Player.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Sign.h"
+					RelativePath="..\source\Entities\Player.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\TNTEntity.cpp"
+					RelativePath="..\source\Entities\TNTEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\TNTEntity.h"
+					RelativePath="..\source\Entities\TNTEntity.h"
 					>
 				</File>
 			</Filter>
diff --git a/source/AllToLua.pkg b/source/AllToLua.pkg
index 41cbab0f7..98c58ed0a 100644
--- a/source/AllToLua.pkg
+++ b/source/AllToLua.pkg
@@ -24,9 +24,9 @@ $cfile "LuaFunctions.h"
 $cfile "StringMap.h"
 $cfile "ChatColor.h"
 $cfile "ClientHandle.h"
-$cfile "Entity.h"
-$cfile "Pawn.h"
-$cfile "Player.h"
+$cfile "Entities/Entity.h"
+$cfile "Entities/Pawn.h"
+$cfile "Entities/Player.h"
 $cfile "PluginManager.h"
 $cfile "Plugin.h"
 $cfile "PluginLua.h"
@@ -45,7 +45,7 @@ $cfile "BlockEntities/DropperEntity.h"
 $cfile "BlockEntities/FurnaceEntity.h"
 $cfile "WebAdmin.h"
 $cfile "WebPlugin.h"
-$cfile "Pickup.h"
+$cfile "Entities/Pickup.h"
 $cfile "Root.h"
 $cfile "Vector3f.h"
 $cfile "Vector3d.h"
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index 95c8b7274..3ab85d223 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/19/13 09:36:55.
+** Generated automatically by tolua++-1.0.92 on 08/19/13 10:28:26.
 */
 
 #ifndef __cplusplus
@@ -24,9 +24,9 @@ TOLUA_API int  tolua_AllToLua_open (lua_State* tolua_S);
 #include "StringMap.h"
 #include "ChatColor.h"
 #include "ClientHandle.h"
-#include "Entity.h"
-#include "Pawn.h"
-#include "Player.h"
+#include "Entities/Entity.h"
+#include "Entities/Pawn.h"
+#include "Entities/Player.h"
 #include "PluginManager.h"
 #include "Plugin.h"
 #include "PluginLua.h"
@@ -45,7 +45,7 @@ TOLUA_API int  tolua_AllToLua_open (lua_State* tolua_S);
 #include "BlockEntities/FurnaceEntity.h"
 #include "WebAdmin.h"
 #include "WebPlugin.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "Root.h"
 #include "Vector3f.h"
 #include "Vector3d.h"
diff --git a/source/Bindings.h b/source/Bindings.h
index b4c918ec4..c0448f943 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/19/13 09:36:55.
+** Generated automatically by tolua++-1.0.92 on 08/19/13 10:28:26.
 */
 
 /* Exported function */
diff --git a/source/BlockEntities/ChestEntity.cpp b/source/BlockEntities/ChestEntity.cpp
index d5cd076be..59193829d 100644
--- a/source/BlockEntities/ChestEntity.cpp
+++ b/source/BlockEntities/ChestEntity.cpp
@@ -3,9 +3,8 @@
 
 #include "ChestEntity.h"
 #include "../Item.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../UI/Window.h"
-#include "../Noise.h"
 #include <json/json.h>
 
 
diff --git a/source/BlockEntities/DispenserEntity.cpp b/source/BlockEntities/DispenserEntity.cpp
index f2c542c37..7edaa8a14 100644
--- a/source/BlockEntities/DispenserEntity.cpp
+++ b/source/BlockEntities/DispenserEntity.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "DispenserEntity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Simulator/FluidSimulator.h"
 #include "../Chunk.h"
 
diff --git a/source/BlockEntities/DropSpenserEntity.cpp b/source/BlockEntities/DropSpenserEntity.cpp
index eb8257a21..a9fcdab17 100644
--- a/source/BlockEntities/DropSpenserEntity.cpp
+++ b/source/BlockEntities/DropSpenserEntity.cpp
@@ -6,7 +6,7 @@
 
 #include "Globals.h"
 #include "DropSpenserEntity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Chunk.h"
 
 
diff --git a/source/BlockEntities/DropperEntity.cpp b/source/BlockEntities/DropperEntity.cpp
index 44d679e02..61127cec1 100644
--- a/source/BlockEntities/DropperEntity.cpp
+++ b/source/BlockEntities/DropperEntity.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "DropperEntity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Simulator/FluidSimulator.h"
 
 
diff --git a/source/BlockEntities/FurnaceEntity.cpp b/source/BlockEntities/FurnaceEntity.cpp
index 6cac8573d..2f548d003 100644
--- a/source/BlockEntities/FurnaceEntity.cpp
+++ b/source/BlockEntities/FurnaceEntity.cpp
@@ -3,7 +3,7 @@
 
 #include "FurnaceEntity.h"
 #include "../UI/Window.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Root.h"
 #include "../Chunk.h"
 #include <json/json.h>
diff --git a/source/BlockEntities/HopperEntity.cpp b/source/BlockEntities/HopperEntity.cpp
index 6fdff0e70..c3d7ed3ba 100644
--- a/source/BlockEntities/HopperEntity.cpp
+++ b/source/BlockEntities/HopperEntity.cpp
@@ -6,7 +6,7 @@
 #include "Globals.h"
 #include "HopperEntity.h"
 #include "../Chunk.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../PluginManager.h"
 #include "ChestEntity.h"
 #include "DropSpenserEntity.h"
diff --git a/source/BlockEntities/JukeboxEntity.h b/source/BlockEntities/JukeboxEntity.h
index 74d40ecef..38574c945 100644
--- a/source/BlockEntities/JukeboxEntity.h
+++ b/source/BlockEntities/JukeboxEntity.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/BlockEntities/SignEntity.cpp b/source/BlockEntities/SignEntity.cpp
index 91cbb5a5e..2c160e603 100644
--- a/source/BlockEntities/SignEntity.cpp
+++ b/source/BlockEntities/SignEntity.cpp
@@ -3,7 +3,7 @@
 
 #include "SignEntity.h"
 
-#include "../Player.h"
+#include "../Entities/Player.h"
 // #include "ClientHandle.h"
 // #include "World.h"
 // #include "Root.h"
diff --git a/source/Blocks/BlockBed.h b/source/Blocks/BlockBed.h
index 8286ceb11..0bf1cfc0f 100644
--- a/source/Blocks/BlockBed.h
+++ b/source/Blocks/BlockBed.h
@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Blocks/BlockChest.h b/source/Blocks/BlockChest.h
index 8164942a3..488c58ac5 100644
--- a/source/Blocks/BlockChest.h
+++ b/source/Blocks/BlockChest.h
@@ -4,7 +4,7 @@
 #include "BlockEntity.h"
 #include "../World.h"
 #include "../BlockArea.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Blocks/BlockDoor.cpp b/source/Blocks/BlockDoor.cpp
index b2fe273c5..267486c47 100644
--- a/source/Blocks/BlockDoor.cpp
+++ b/source/Blocks/BlockDoor.cpp
@@ -4,7 +4,7 @@
 #include "../Item.h"
 #include "../World.h"
 #include "../Doors.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Blocks/BlockDoor.h b/source/Blocks/BlockDoor.h
index 19701ffc9..4978fee38 100644
--- a/source/Blocks/BlockDoor.h
+++ b/source/Blocks/BlockDoor.h
@@ -4,7 +4,7 @@
 #include "BlockHandler.h"
 #include "../World.h"
 #include "../Doors.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Blocks/BlockFurnace.h b/source/Blocks/BlockFurnace.h
index b358a1d71..fe35893d5 100644
--- a/source/Blocks/BlockFurnace.h
+++ b/source/Blocks/BlockFurnace.h
@@ -4,7 +4,7 @@
 #include "BlockEntity.h"
 #include "../World.h"
 #include "../Piston.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Blocks/BlockLever.cpp b/source/Blocks/BlockLever.cpp
index 6dbff10c1..f2ca1805a 100644
--- a/source/Blocks/BlockLever.cpp
+++ b/source/Blocks/BlockLever.cpp
@@ -3,7 +3,7 @@
 #include "BlockLever.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Simulator/RedstoneSimulator.h"
 
 
diff --git a/source/Blocks/BlockPiston.cpp b/source/Blocks/BlockPiston.cpp
index 1bfac3ca1..d5750ebdd 100644
--- a/source/Blocks/BlockPiston.cpp
+++ b/source/Blocks/BlockPiston.cpp
@@ -3,7 +3,7 @@
 #include "BlockPiston.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Piston.h"
 
 
diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp
index 9857dd223..3bc879435 100644
--- a/source/Blocks/BlockRedstoneRepeater.cpp
+++ b/source/Blocks/BlockRedstoneRepeater.cpp
@@ -3,7 +3,6 @@
 #include "BlockRedstoneRepeater.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Player.h"
 #include "../Simulator/RedstoneSimulator.h"
 
 
diff --git a/source/Blocks/BlockSign.h b/source/Blocks/BlockSign.h
index 09fa721b6..e6426180f 100644
--- a/source/Blocks/BlockSign.h
+++ b/source/Blocks/BlockSign.h
@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Blocks/BlockWorkbench.h b/source/Blocks/BlockWorkbench.h
index 60aa1791b..a2cc6119c 100644
--- a/source/Blocks/BlockWorkbench.h
+++ b/source/Blocks/BlockWorkbench.h
@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../UI/Window.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Chunk.cpp b/source/Chunk.cpp
index 145bcc8c1..e17e4bebc 100644
--- a/source/Chunk.cpp
+++ b/source/Chunk.cpp
@@ -20,12 +20,12 @@
 #include "BlockEntities/JukeboxEntity.h"
 #include "BlockEntities/NoteEntity.h"
 #include "BlockEntities/SignEntity.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "Item.h"
 #include "Noise.h"
 #include "Root.h"
 #include "MersenneTwister.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "BlockArea.h"
 #include "PluginManager.h"
 #include "Blocks/BlockHandler.h"
diff --git a/source/Chunk.h b/source/Chunk.h
index 16cda056c..6e8fe5cbf 100644
--- a/source/Chunk.h
+++ b/source/Chunk.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "Entity.h"
+#include "Entities/Entity.h"
 #include "ChunkDef.h"
 
 #include "Simulator/FireSimulator.h"
diff --git a/source/ChunkMap.cpp b/source/ChunkMap.cpp
index cd4955077..a15f3aed1 100644
--- a/source/ChunkMap.cpp
+++ b/source/ChunkMap.cpp
@@ -4,15 +4,14 @@
 #include "ChunkMap.h"
 #include "World.h"
 #include "Root.h"
-#include "Player.h"
-#include "BlockID.h"
+#include "Entities/Player.h"
 #include "Item.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "Chunk.h"
 #include "Generating/Trees.h"  // used in cChunkMap::ReplaceTreeBlocks() for tree block discrimination
 #include "BlockArea.h"
 #include "PluginManager.h"
-#include "TNTEntity.h"
+#include "Entities/TNTEntity.h"
 
 #ifndef _WIN32
 	#include <cstdlib> // abs
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index 4372d052c..07d580085 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -3,9 +3,9 @@
 #include "ClientHandle.h"
 #include "Server.h"
 #include "World.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "PluginManager.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Inventory.h"
 #include "BlockEntities/ChestEntity.h"
 #include "BlockEntities/SignEntity.h"
@@ -20,7 +20,6 @@
 #include "Items/ItemHandler.h"
 #include "Blocks/BlockHandler.h"
 
-#include "Tracer.h"
 #include "Vector3f.h"
 #include "Vector3d.h"
 
diff --git a/source/Entity.cpp b/source/Entities/Entity.cpp
index 8afdfdb95..19a65ef4e 100644
--- a/source/Entity.cpp
+++ b/source/Entities/Entity.cpp
@@ -2,17 +2,17 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Entity.h"
-#include "World.h"
-#include "Server.h"
-#include "Root.h"
-#include "Vector3d.h"
-#include "Matrix4f.h"
-#include "ReferenceManager.h"
-#include "ClientHandle.h"
-#include "Tracer.h"
-#include "Chunk.h"
-#include "Simulator/FluidSimulator.h"
-#include "PluginManager.h"
+#include "../World.h"
+#include "../Server.h"
+#include "../Root.h"
+#include "../Vector3d.h"
+#include "../Matrix4f.h"
+#include "../ReferenceManager.h"
+#include "../ClientHandle.h"
+#include "../Chunk.h"
+#include "../Simulator/FluidSimulator.h"
+#include "../PluginManager.h"
+#include "../Tracer.h"
 
 
 
diff --git a/source/Entity.h b/source/Entities/Entity.h
index c9d26e1a1..820405cb9 100644
--- a/source/Entity.h
+++ b/source/Entities/Entity.h
@@ -1,9 +1,9 @@
 
 #pragma once
 
-#include "Item.h"
-#include "Vector3d.h"
-#include "Vector3f.h"
+#include "../Item.h"
+#include "../Vector3d.h"
+#include "../Vector3f.h"
 
 
 
diff --git a/source/FallingBlock.cpp b/source/Entities/FallingBlock.cpp
index 05766ae01..237327975 100644
--- a/source/FallingBlock.cpp
+++ b/source/Entities/FallingBlock.cpp
@@ -1,10 +1,10 @@
 #include "Globals.h"
 
 #include "FallingBlock.h"
-#include "World.h"
-#include "ClientHandle.h"
-#include "Simulator/SandSimulator.h"
-#include "Chunk.h"
+#include "../World.h"
+#include "../ClientHandle.h"
+#include "../Simulator/SandSimulator.h"
+#include "../Chunk.h"
 
 
 
diff --git a/source/FallingBlock.h b/source/Entities/FallingBlock.h
index 492931fa3..13931f061 100644
--- a/source/FallingBlock.h
+++ b/source/Entities/FallingBlock.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Entity.h"
-#include "Defines.h"
 
 
 
diff --git a/source/Minecart.cpp b/source/Entities/Minecart.cpp
index 8b9c201ad..3e6069237 100644
--- a/source/Minecart.cpp
+++ b/source/Entities/Minecart.cpp
@@ -5,8 +5,8 @@
 
 #include "Globals.h"
 #include "Minecart.h"
-#include "World.h"
-#include "ClientHandle.h"
+#include "../World.h"
+#include "../ClientHandle.h"
 #include "Player.h"
 
 
diff --git a/source/Minecart.h b/source/Entities/Minecart.h
index d78739fc5..91336673d 100644
--- a/source/Minecart.h
+++ b/source/Entities/Minecart.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "Entity.h"
-#include "Item.h"
+#include "../Item.h"
 
 
 
diff --git a/source/Pawn.cpp b/source/Entities/Pawn.cpp
index b58c2b544..fffefd538 100644
--- a/source/Pawn.cpp
+++ b/source/Entities/Pawn.cpp
@@ -2,14 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Pawn.h"
-#include "Root.h"
-#include "Server.h"
-#include "World.h"
-#include "Player.h"
-#include "PluginManager.h"
-#include "Vector3d.h"
-#include "BlockID.h"
-#include "Defines.h"
 
 
 
diff --git a/source/Pawn.h b/source/Entities/Pawn.h
index b1b8c71ec..e76337d86 100644
--- a/source/Pawn.h
+++ b/source/Entities/Pawn.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Entity.h"
-#include "Item.h"
 
 
 
diff --git a/source/Pickup.cpp b/source/Entities/Pickup.cpp
index 217af969c..0417b861d 100644
--- a/source/Pickup.cpp
+++ b/source/Entities/Pickup.cpp
@@ -6,20 +6,19 @@
 #endif
 
 #include "Pickup.h"
-#include "ClientHandle.h"
-#include "Inventory.h"
-#include "World.h"
-#include "Simulator/FluidSimulator.h"
-#include "Server.h"
+#include "../ClientHandle.h"
+#include "../Inventory.h"
+#include "../World.h"
+#include "../Simulator/FluidSimulator.h"
+#include "../Server.h"
 #include "Player.h"
-#include "PluginManager.h"
-#include "Item.h"
-#include "Root.h"
-#include "Tracer.h"
-#include "Chunk.h"
-
-#include "Vector3d.h"
-#include "Vector3f.h"
+#include "../PluginManager.h"
+#include "../Item.h"
+#include "../Root.h"
+#include "../Chunk.h"
+
+#include "../Vector3d.h"
+#include "../Vector3f.h"
 
 
 
diff --git a/source/Pickup.h b/source/Entities/Pickup.h
index dcdc02137..1f32c97b5 100644
--- a/source/Pickup.h
+++ b/source/Entities/Pickup.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "Entity.h"
-#include "Item.h"
+#include "../Item.h"
 
 
 
diff --git a/source/Player.cpp b/source/Entities/Player.cpp
index 13009dad8..8ad071453 100644
--- a/source/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -2,30 +2,30 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Player.h"
-#include "Server.h"
-#include "ClientHandle.h"
-#include "UI/Window.h"
-#include "UI/WindowOwner.h"
-#include "World.h"
+#include "../Server.h"
+#include "../ClientHandle.h"
+#include "../UI/Window.h"
+#include "../UI/WindowOwner.h"
+#include "../World.h"
 #include "Pickup.h"
-#include "PluginManager.h"
-#include "BlockEntities/BlockEntity.h"
-#include "GroupManager.h"
-#include "Group.h"
-#include "ChatColor.h"
-#include "Item.h"
-#include "Tracer.h"
-#include "Root.h"
-#include "OSSupport/MakeDir.h"
-#include "OSSupport/Timer.h"
-#include "MersenneTwister.h"
-#include "Chunk.h"
-#include "Items/ItemHandler.h"
-
-#include "Vector3d.h"
-#include "Vector3f.h"
-
-#include "../iniFile/iniFile.h"
+#include "../PluginManager.h"
+#include "../BlockEntities/BlockEntity.h"
+#include "../GroupManager.h"
+#include "../Group.h"
+#include "../ChatColor.h"
+#include "../Item.h"
+#include "../Tracer.h"
+#include "../Root.h"
+#include "../OSSupport/MakeDir.h"
+#include "../OSSupport/Timer.h"
+#include "../MersenneTwister.h"
+#include "../Chunk.h"
+#include "../Items/ItemHandler.h"
+
+#include "../Vector3d.h"
+#include "../Vector3f.h"
+
+#include "../../iniFile/iniFile.h"
 #include <json/json.h>
 
 #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x))
diff --git a/source/Player.h b/source/Entities/Player.h
index 2a1797c79..62595f980 100644
--- a/source/Player.h
+++ b/source/Entities/Player.h
@@ -2,8 +2,8 @@
 #pragma once
 
 #include "Pawn.h"
-#include "Inventory.h"
-#include "Defines.h"
+#include "../Inventory.h"
+#include "../Defines.h"
 
 
 
diff --git a/source/TNTEntity.cpp b/source/Entities/TNTEntity.cpp
index 60625667d..43a0dea09 100644
--- a/source/TNTEntity.cpp
+++ b/source/Entities/TNTEntity.cpp
@@ -1,8 +1,8 @@
 #include "Globals.h"
 
 #include "TNTEntity.h"
-#include "World.h"
-#include "ClientHandle.h"
+#include "../World.h"
+#include "../ClientHandle.h"
 
 
 
diff --git a/source/TNTEntity.h b/source/Entities/TNTEntity.h
index e3eae24f2..ae6fc75e2 100644
--- a/source/TNTEntity.h
+++ b/source/Entities/TNTEntity.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Entity.h"
-#include "Defines.h"
 
 
 
diff --git a/source/Inventory.cpp b/source/Inventory.cpp
index 74294e80e..c104db4c7 100644
--- a/source/Inventory.cpp
+++ b/source/Inventory.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Inventory.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "ClientHandle.h"
 #include "UI/Window.h"
 #include "Item.h"
diff --git a/source/Items/ItemDye.h b/source/Items/ItemDye.h
index 984d452b7..99b8d2543 100644
--- a/source/Items/ItemDye.h
+++ b/source/Items/ItemDye.h
@@ -3,7 +3,7 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp
index a831bb713..66d36e1a6 100644
--- a/source/Items/ItemHandler.cpp
+++ b/source/Items/ItemHandler.cpp
@@ -3,7 +3,7 @@
 #include "ItemHandler.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../FastRandom.h"
 
 // Handlers:
diff --git a/source/Items/ItemHoe.h b/source/Items/ItemHoe.h
index 577463f21..7b6b3e6ac 100644
--- a/source/Items/ItemHoe.h
+++ b/source/Items/ItemHoe.h
@@ -3,9 +3,14 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
-class cItemHoeHandler : public cItemHandler
+
+
+
+
+class cItemHoeHandler :
+	public cItemHandler
 {
 public:
 	cItemHoeHandler(int a_ItemType)
@@ -28,4 +33,8 @@ public:
 		}
 		return false;
 	}
-};
\ No newline at end of file
+} ;
+
+
+
+
diff --git a/source/Items/ItemLighter.h b/source/Items/ItemLighter.h
index cf7822832..39534c7b1 100644
--- a/source/Items/ItemLighter.h
+++ b/source/Items/ItemLighter.h
@@ -3,8 +3,8 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
-#include "../TNTEntity.h"
+#include "../Entities/Player.h"
+#include "../Entities/TNTEntity.h"
 
 
 
diff --git a/source/Items/ItemMinecart.h b/source/Items/ItemMinecart.h
index df970638e..f8eb31a49 100644
--- a/source/Items/ItemMinecart.h
+++ b/source/Items/ItemMinecart.h
@@ -9,8 +9,7 @@
 
 #pragma once
 
-// Not needed, we're being included only from ItemHandler.cpp which already has this file: #include "ItemHandler.h"
-#include "../Minecart.h"
+#include "../Entities/Minecart.h"
 
 
 
diff --git a/source/Items/ItemPickaxe.h b/source/Items/ItemPickaxe.h
index 1a2c205c0..bde7f0905 100644
--- a/source/Items/ItemPickaxe.h
+++ b/source/Items/ItemPickaxe.h
@@ -3,9 +3,10 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
-class cItemPickaxeHandler : public cItemHandler
+class cItemPickaxeHandler :
+	public cItemHandler
 {
 public:
 	cItemPickaxeHandler(int a_ItemType)
@@ -36,41 +37,56 @@ public:
 	{
 		switch(a_BlockType)
 		{
-		case E_BLOCK_OBSIDIAN:
-			return PickaxeLevel() >= 4;
-		case E_BLOCK_DIAMOND_BLOCK:
-		case E_BLOCK_DIAMOND_ORE:
-		case E_BLOCK_GOLD_BLOCK:
-		case E_BLOCK_GOLD_ORE:
-		case E_BLOCK_REDSTONE_ORE:
-		case E_BLOCK_REDSTONE_ORE_GLOWING:
-		case E_BLOCK_EMERALD_ORE:
-			return PickaxeLevel() >= 3;
-		case E_BLOCK_IRON_BLOCK:
-		case E_BLOCK_IRON_ORE:
-		case E_BLOCK_LAPIS_ORE:
-		case E_BLOCK_LAPIS_BLOCK:
-			return PickaxeLevel() >= 2;
-		case E_BLOCK_COAL_ORE:
-		case E_BLOCK_STONE:
-		case E_BLOCK_COBBLESTONE:
-		case E_BLOCK_END_STONE:
-		case E_BLOCK_MOSSY_COBBLESTONE:
-		case E_BLOCK_SANDSTONE_STAIRS:
-		case E_BLOCK_SANDSTONE:
-		case E_BLOCK_STONE_BRICKS:
-		case E_BLOCK_NETHER_BRICK:
-		case E_BLOCK_NETHERRACK:
-		case E_BLOCK_STONE_SLAB:
-		case E_BLOCK_DOUBLE_STONE_SLAB:
-		case E_BLOCK_STONE_PRESSURE_PLATE:
-		case E_BLOCK_BRICK:
-		case E_BLOCK_COBBLESTONE_STAIRS:
-		case E_BLOCK_STONE_BRICK_STAIRS:
-		case E_BLOCK_NETHER_BRICK_STAIRS:
-		case E_BLOCK_CAULDRON:
-			return PickaxeLevel() >= 1;
+			case E_BLOCK_OBSIDIAN:
+			{
+				return PickaxeLevel() >= 4;
+			}
+			
+			case E_BLOCK_DIAMOND_BLOCK:
+			case E_BLOCK_DIAMOND_ORE:
+			case E_BLOCK_GOLD_BLOCK:
+			case E_BLOCK_GOLD_ORE:
+			case E_BLOCK_REDSTONE_ORE:
+			case E_BLOCK_REDSTONE_ORE_GLOWING:
+			case E_BLOCK_EMERALD_ORE:
+			{
+				return PickaxeLevel() >= 3;
+			}
+			
+			case E_BLOCK_IRON_BLOCK:
+			case E_BLOCK_IRON_ORE:
+			case E_BLOCK_LAPIS_ORE:
+			case E_BLOCK_LAPIS_BLOCK:
+			{
+				return PickaxeLevel() >= 2;
+			}
+			
+			case E_BLOCK_COAL_ORE:
+			case E_BLOCK_STONE:
+			case E_BLOCK_COBBLESTONE:
+			case E_BLOCK_END_STONE:
+			case E_BLOCK_MOSSY_COBBLESTONE:
+			case E_BLOCK_SANDSTONE_STAIRS:
+			case E_BLOCK_SANDSTONE:
+			case E_BLOCK_STONE_BRICKS:
+			case E_BLOCK_NETHER_BRICK:
+			case E_BLOCK_NETHERRACK:
+			case E_BLOCK_STONE_SLAB:
+			case E_BLOCK_DOUBLE_STONE_SLAB:
+			case E_BLOCK_STONE_PRESSURE_PLATE:
+			case E_BLOCK_BRICK:
+			case E_BLOCK_COBBLESTONE_STAIRS:
+			case E_BLOCK_STONE_BRICK_STAIRS:
+			case E_BLOCK_NETHER_BRICK_STAIRS:
+			case E_BLOCK_CAULDRON:
+			{
+				return PickaxeLevel() >= 1;
+			}
 		}
 		return false;
 	}
-};
\ No newline at end of file
+} ;
+
+
+
+
diff --git a/source/Items/ItemShears.h b/source/Items/ItemShears.h
index a904dd1ae..663fa0170 100644
--- a/source/Items/ItemShears.h
+++ b/source/Items/ItemShears.h
@@ -3,7 +3,7 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Items/ItemShovel.h b/source/Items/ItemShovel.h
index a26e7d34e..d0625ef1c 100644
--- a/source/Items/ItemShovel.h
+++ b/source/Items/ItemShovel.h
@@ -3,7 +3,7 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 #include "../Blocks/BlockHandler.h"
 
diff --git a/source/Items/ItemSpawnEgg.h b/source/Items/ItemSpawnEgg.h
index 5ba0c0ad5..26dd15b7d 100644
--- a/source/Items/ItemSpawnEgg.h
+++ b/source/Items/ItemSpawnEgg.h
@@ -3,7 +3,7 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Items/ItemSword.h b/source/Items/ItemSword.h
index 15351b55c..a7c1d2432 100644
--- a/source/Items/ItemSword.h
+++ b/source/Items/ItemSword.h
@@ -3,9 +3,14 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
-class cItemSwordHandler : public cItemHandler
+
+
+
+
+class cItemSwordHandler :
+	public cItemHandler
 {
 public:
 	cItemSwordHandler(int a_ItemType)
@@ -18,4 +23,8 @@ public:
 	{
 		return (a_BlockType == E_BLOCK_COBWEB);
 	}
-};
\ No newline at end of file
+} ;
+
+
+
+
diff --git a/source/LuaWindow.cpp b/source/LuaWindow.cpp
index 7cfd60048..a0609f746 100644
--- a/source/LuaWindow.cpp
+++ b/source/LuaWindow.cpp
@@ -7,7 +7,7 @@
 #include "LuaWindow.h"
 #include "UI/SlotArea.h"
 #include "PluginLua.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "lauxlib.h"  // Needed for LUA_REFNIL
 
 
diff --git a/source/ManualBindings.cpp b/source/ManualBindings.cpp
index 3384beaa3..c975997a5 100644
--- a/source/ManualBindings.cpp
+++ b/source/ManualBindings.cpp
@@ -9,7 +9,7 @@
 #include "Plugin.h"
 #include "PluginLua.h"
 #include "PluginManager.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "WebAdmin.h"
 #include "StringMap.h"
 #include "ClientHandle.h"
diff --git a/source/Mobs/AggressiveMonster.cpp b/source/Mobs/AggressiveMonster.cpp
index b266fc502..2eae772d7 100644
--- a/source/Mobs/AggressiveMonster.cpp
+++ b/source/Mobs/AggressiveMonster.cpp
@@ -5,7 +5,7 @@
 
 #include "../World.h"
 #include "../Vector3f.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../MersenneTwister.h"
 
 
diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp
index 706649cb2..9ae91f1e0 100644
--- a/source/Mobs/Monster.cpp
+++ b/source/Mobs/Monster.cpp
@@ -6,7 +6,7 @@
 #include "../Server.h"
 #include "../ClientHandle.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Defines.h"
 #include "../MonsterConfig.h"
 #include "../MersenneTwister.h"
diff --git a/source/Mobs/Monster.h b/source/Mobs/Monster.h
index b821285a0..755678d39 100644
--- a/source/Mobs/Monster.h
+++ b/source/Mobs/Monster.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "../Pawn.h"
+#include "../Entities/Pawn.h"
 #include "../Defines.h"
 #include "../BlockID.h"
 #include "../Item.h"
diff --git a/source/Mobs/PassiveAggressiveMonster.cpp b/source/Mobs/PassiveAggressiveMonster.cpp
index f1e231a09..e473137a9 100644
--- a/source/Mobs/PassiveAggressiveMonster.cpp
+++ b/source/Mobs/PassiveAggressiveMonster.cpp
@@ -3,7 +3,7 @@
 
 #include "PassiveAggressiveMonster.h"
 
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/Piston.cpp b/source/Piston.cpp
index 57fe305c2..d6ea01803 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -2,12 +2,11 @@
 
 #include "Piston.h"
 #include "ChunkDef.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "Item.h"
 #include "Root.h"
 #include "ClientHandle.h"
 #include "World.h"
-#include "BlockID.h"
 #include "Server.h"
 #include "Blocks/BlockHandler.h"
 
diff --git a/source/Plugin.cpp b/source/Plugin.cpp
index 9e844bfc6..229b997cd 100644
--- a/source/Plugin.cpp
+++ b/source/Plugin.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Plugin.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "World.h"
 #include "CommandOutput.h"
 #include "Mobs/Monster.h"
diff --git a/source/PluginManager.cpp b/source/PluginManager.cpp
index f7efaf291..e6ff3e6e2 100644
--- a/source/PluginManager.cpp
+++ b/source/PluginManager.cpp
@@ -12,7 +12,7 @@
 
 #include "../iniFile/iniFile.h"
 #include "tolua++.h"
-#include "Player.h"
+#include "Entities/Player.h"
 
 
 
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 6f79ed12c..c4c15819d 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -16,15 +16,15 @@ Documentation:
 #include "../ClientHandle.h"
 #include "../World.h"
 #include "ChunkDataSerializer.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "../Mobs/Monster.h"
-#include "../Pickup.h"
-#include "../Player.h"
+#include "../Entities/Pickup.h"
+#include "../Entities/Player.h"
 #include "../ChatColor.h"
 #include "../UI/Window.h"
 #include "../Root.h"
 #include "../Server.h"
-#include "../FallingBlock.h"
+#include "../Entities/FallingBlock.h"
 
 
 
diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 5bf456ce3..2e5c305cc 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -12,10 +12,10 @@
 #include "../../CryptoPP/randpool.h"
 #include "../Item.h"
 #include "ChunkDataSerializer.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Mobs/Monster.h"
 #include "../UI/Window.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
 #include "../WorldStorage/FastNBT.h"
 #include "../StringCompression.h"
 
diff --git a/source/Protocol/Protocol14x.cpp b/source/Protocol/Protocol14x.cpp
index 35fe0ce1c..881a55717 100644
--- a/source/Protocol/Protocol14x.cpp
+++ b/source/Protocol/Protocol14x.cpp
@@ -19,11 +19,11 @@ Implements the 1.4.x protocol classes representing these protocols:
 #include "../../CryptoPP/randpool.h"
 #include "../Item.h"
 #include "ChunkDataSerializer.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Mobs/Monster.h"
 #include "../UI/Window.h"
-#include "../Pickup.h"
-#include "../FallingBlock.h"
+#include "../Entities/Pickup.h"
+#include "../Entities/FallingBlock.h"
 
 
 
diff --git a/source/Protocol/Protocol16x.cpp b/source/Protocol/Protocol16x.cpp
index 4e8fd1887..3a640da21 100644
--- a/source/Protocol/Protocol16x.cpp
+++ b/source/Protocol/Protocol16x.cpp
@@ -13,8 +13,8 @@ Implements the 1.6.x protocol classes:
 #include "Globals.h"
 #include "Protocol16x.h"
 #include "../ClientHandle.h"
-#include "../Entity.h"
-#include "../Player.h"
+#include "../Entities/Entity.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/source/ReferenceManager.cpp b/source/ReferenceManager.cpp
index 259e3a1a0..6a9ed0e43 100644
--- a/source/ReferenceManager.cpp
+++ b/source/ReferenceManager.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "ReferenceManager.h"
-#include "Entity.h"
+#include "Entities/Entity.h"
 
 
 
diff --git a/source/Root.cpp b/source/Root.cpp
index d07cc1ee7..3933535f1 100644
--- a/source/Root.cpp
+++ b/source/Root.cpp
@@ -10,7 +10,7 @@
 #include "CraftingRecipes.h"
 #include "PluginManager.h"
 #include "MonsterConfig.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Blocks/BlockHandler.h"
 #include "Items/ItemHandler.h"
 #include "Chunk.h"
diff --git a/source/Server.cpp b/source/Server.cpp
index c43ee83d2..9c1e06c81 100644
--- a/source/Server.cpp
+++ b/source/Server.cpp
@@ -13,11 +13,10 @@
 #include "PluginManager.h"
 #include "GroupManager.h"
 #include "ChatColor.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Inventory.h"
 #include "Item.h"
 #include "FurnaceRecipe.h"
-#include "Tracer.h"
 #include "WebAdmin.h"
 #include "Protocol/ProtocolRecognizer.h"
 #include "CommandOutput.h"
diff --git a/source/Simulator/RedstoneSimulator.cpp b/source/Simulator/RedstoneSimulator.cpp
index 6d1415265..615e36a49 100644
--- a/source/Simulator/RedstoneSimulator.cpp
+++ b/source/Simulator/RedstoneSimulator.cpp
@@ -8,7 +8,7 @@
 #include "../World.h"
 #include "../BlockID.h"
 #include "../Chunk.h"
-#include "../TNTEntity.h"
+#include "../Entities/TNTEntity.h"
 
 
 
diff --git a/source/Simulator/SandSimulator.cpp b/source/Simulator/SandSimulator.cpp
index e6026be83..f4f0cdc80 100644
--- a/source/Simulator/SandSimulator.cpp
+++ b/source/Simulator/SandSimulator.cpp
@@ -5,7 +5,7 @@
 #include "../World.h"
 #include "../BlockID.h"
 #include "../Defines.h"
-#include "../FallingBlock.h"
+#include "../Entities/FallingBlock.h"
 #include "../Chunk.h"
 
 
diff --git a/source/Tracer.cpp b/source/Tracer.cpp
index 444ab821a..6d37f2ed8 100644
--- a/source/Tracer.cpp
+++ b/source/Tracer.cpp
@@ -8,10 +8,7 @@
 #include "Vector3i.h"
 #include "Vector3d.h"
 
-#include "BlockID.h"
-#include "Entity.h"
-
-#include "Defines.h"
+#include "Entities/Entity.h"
 
 #ifndef _WIN32
 	#include <stdlib.h> // abs()
diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp
index d255e0cd9..9213d4ff8 100644
--- a/source/UI/SlotArea.cpp
+++ b/source/UI/SlotArea.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "SlotArea.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../BlockEntities/ChestEntity.h"
 #include "../BlockEntities/DropSpenserEntity.h"
 #include "../BlockEntities/FurnaceEntity.h"
diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp
index 786ae6ed1..2794abe22 100644
--- a/source/UI/Window.cpp
+++ b/source/UI/Window.cpp
@@ -5,8 +5,8 @@
 #include "SlotArea.h"
 #include "../Item.h"
 #include "../ClientHandle.h"
-#include "../Player.h"
-#include "../Pickup.h"
+#include "../Entities/Player.h"
+#include "../Entities/Pickup.h"
 #include "../Inventory.h"
 #include "../Items/ItemHandler.h"
 #include "../BlockEntities/ChestEntity.h"
diff --git a/source/UI/WindowOwner.h b/source/UI/WindowOwner.h
index b7cbadf01..d41abf66d 100644
--- a/source/UI/WindowOwner.h
+++ b/source/UI/WindowOwner.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "../BlockEntities/BlockEntity.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "Window.h"
 
 /*
diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp
index 788bf664e..77a5865d3 100644
--- a/source/WebAdmin.cpp
+++ b/source/WebAdmin.cpp
@@ -10,7 +10,7 @@
 #include "Plugin.h"
 
 #include "World.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Server.h"
 #include "Root.h"
 
diff --git a/source/World.cpp b/source/World.cpp
index 2485a1154..8f9b3924f 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -5,8 +5,8 @@
 #include "World.h"
 #include "ChunkDef.h"
 #include "ClientHandle.h"
-#include "Pickup.h"
-#include "Player.h"
+#include "Entities/Pickup.h"
+#include "Entities/Player.h"
 #include "Server.h"
 #include "Item.h"
 #include "Root.h"
@@ -50,13 +50,13 @@
 
 #include "OSSupport/MakeDir.h"
 #include "MersenneTwister.h"
-#include "Tracer.h"
 #include "Generating/Trees.h"
 #include "PluginManager.h"
 #include "Blocks/BlockHandler.h"
 #include "Vector3d.h"
-#include "TNTEntity.h"
+#include "Entities/TNTEntity.h"
 
+#include "Tracer.h"
 #include "tolua++.h"
 
 // DEBUG: Test out the cLineBlockTracer class by tracing a few lines:
diff --git a/source/WorldStorage/NBTChunkSerializer.cpp b/source/WorldStorage/NBTChunkSerializer.cpp
index fe8630318..706e913ef 100644
--- a/source/WorldStorage/NBTChunkSerializer.cpp
+++ b/source/WorldStorage/NBTChunkSerializer.cpp
@@ -15,13 +15,13 @@
 #include "../BlockEntities/SignEntity.h"
 #include "../ItemGrid.h"
 #include "../StringCompression.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "../OSSupport/MakeDir.h"
 #include "FastNBT.h"
-#include "../FallingBlock.h"
-#include "../Minecart.h"
+#include "../Entities/FallingBlock.h"
+#include "../Entities/Minecart.h"
 #include "../Mobs/Monster.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
 
 
 
diff --git a/source/WorldStorage/WSSAnvil.cpp b/source/WorldStorage/WSSAnvil.cpp
index efa0e9d3e..72d583e2b 100644
--- a/source/WorldStorage/WSSAnvil.cpp
+++ b/source/WorldStorage/WSSAnvil.cpp
@@ -20,13 +20,13 @@
 #include "../Item.h"
 #include "../ItemGrid.h"
 #include "../StringCompression.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "../OSSupport/MakeDir.h"
 #include "FastNBT.h"
-#include "../FallingBlock.h"
-#include "../Minecart.h"
+#include "../Entities/FallingBlock.h"
+#include "../Entities/Minecart.h"
 #include "../Mobs/Monster.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
 
 
 
diff --git a/source/WorldStorage/WorldStorage.cpp b/source/WorldStorage/WorldStorage.cpp
index 7ff5ae8e8..f290ec128 100644
--- a/source/WorldStorage/WorldStorage.cpp
+++ b/source/WorldStorage/WorldStorage.cpp
@@ -11,7 +11,7 @@
 #include "WSSAnvil.h"
 #include "../World.h"
 #include "../Generating/ChunkGenerator.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "../BlockEntities/BlockEntity.h"