2 files changed, 224 insertions, 254 deletions

diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index cafb18701..dfbe8380a 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -281,184 +281,204 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

-				RelativePath="..\source\BlockArea.cpp"

+				RelativePath="..\source\Authenticator.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\BlockArea.h"

+				RelativePath="..\source\Authenticator.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\BlockID.cpp"

+				RelativePath="..\source\BlockArea.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\BlockID.h"

+				RelativePath="..\source\BlockArea.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\ByteBuffer.cpp"

+				RelativePath="..\source\BlockID.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\ByteBuffer.h"

+				RelativePath="..\source\BlockID.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cAuthenticator.cpp"

+				RelativePath="..\source\ByteBuffer.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cAuthenticator.h"

+				RelativePath="..\source\ByteBuffer.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cChatColor.cpp"

+				RelativePath="..\source\ChatColor.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cChatColor.h"

+				RelativePath="..\source\ChatColor.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cChunk.cpp"

+				RelativePath="..\source\Chunk.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cChunk.h"

+				RelativePath="..\source\Chunk.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cChunk.inl.h"

+				RelativePath="..\source\Chunk.inl.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cChunkMap.cpp"

+				RelativePath="..\source\ChunkDef.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cChunkMap.h"

+				RelativePath="..\source\ChunkMap.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cClientHandle.cpp"

+				RelativePath="..\source\ChunkMap.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cClientHandle.h"

+				RelativePath="..\source\ChunkSender.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cCuboid.cpp"

+				RelativePath="..\source\ChunkSender.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cCuboid.h"

+				RelativePath="..\source\ClientHandle.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cFileFormatUpdater.cpp"

+				RelativePath="..\source\ClientHandle.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cFileFormatUpdater.h"

+				RelativePath="..\source\CraftingRecipes.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cFurnaceRecipe.cpp"

+				RelativePath="..\source\CraftingRecipes.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cFurnaceRecipe.h"

+				RelativePath="..\source\Cuboid.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cGroup.cpp"

+				RelativePath="..\source\Cuboid.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cGroup.h"

+				RelativePath="..\source\Defines.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cGroupManager.cpp"

+				RelativePath="..\source\Endianness.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cGroupManager.h"

+				RelativePath="..\source\FurnaceRecipe.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cHeartBeat.cpp"

+				RelativePath="..\source\FurnaceRecipe.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cHeartBeat.h"

+				RelativePath="..\source\Globals.cpp"

 				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release profiled|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\source\ChunkDef.h"

+				RelativePath="..\source\Globals.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\ChunkSender.cpp"

+				RelativePath="..\source\Group.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\ChunkSender.h"

+				RelativePath="..\source\Group.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cInventory.cpp"

+				RelativePath="..\source\GroupManager.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cInventory.h"

+				RelativePath="..\source\GroupManager.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cLog.cpp"

+				RelativePath="..\source\HeartBeat.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cLog.h"

+				RelativePath="..\source\HeartBeat.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cMCLogger.cpp"

+				RelativePath="..\source\Inventory.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cMCLogger.h"

+				RelativePath="..\source\Inventory.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cMonsterConfig.cpp"

+				RelativePath="..\source\Item.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cMonsterConfig.h"

+				RelativePath="..\source\Item.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cNoise.cpp"

+				RelativePath="..\source\LeakFinder.cpp"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						EnableIntrinsicFunctions="true"

-						FavorSizeOrSpeed="1"

-						OmitFramePointers="true"

-						BasicRuntimeChecks="0"

 						UsePrecompiledHeader="0"

-						DebugInformationFormat="3"

+						WarningLevel="3"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="Release|Win32"

+					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -467,6 +487,7 @@
 				</FileConfiguration>

 				<FileConfiguration

 					Name="Release profiled|Win32"

+					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -475,151 +496,107 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\source\cNoise.h"

-				>

-			</File>

-			<File

-				RelativePath="..\source\cNoise.inc"

-				>

-			</File>

-			<File

-				RelativePath="..\source\cPiston.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\source\cPiston.h"

-				>

-			</File>

-			<File

-				RelativePath="..\source\CraftingRecipes.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\source\CraftingRecipes.h"

+				RelativePath="..\source\LeakFinder.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cRedstone.cpp"

+				RelativePath="..\source\LightingThread.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cRedstone.h"

+				RelativePath="..\source\LightingThread.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cReferenceManager.cpp"

+				RelativePath="..\source\Log.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cReferenceManager.h"

+				RelativePath="..\source\Log.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cRoot.cpp"

+				RelativePath="..\source\main.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cRoot.h"

+				RelativePath="..\source\Matrix4f.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cServer.cpp"

+				RelativePath="..\source\Matrix4f.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cServer.h"

+				RelativePath="..\source\MCLogger.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cSimulator.cpp"

+				RelativePath="..\source\MCLogger.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cSimulator.h"

+				RelativePath="..\source\MemoryLeak.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cSimulatorManager.cpp"

+				RelativePath="..\source\MersenneTwister.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cSimulatorManager.h"

+				RelativePath="..\source\MonsterConfig.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cTracer.cpp"

+				RelativePath="..\source\MonsterConfig.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cTracer.h"

+				RelativePath="..\source\Noise.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cWebAdmin.cpp"

+				RelativePath="..\source\Noise.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cWebAdmin.h"

+				RelativePath="..\source\Noise.inc"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cWebPlugin.cpp"

+				RelativePath="..\source\Piston.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cWebPlugin.h"

+				RelativePath="..\source\Piston.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cWorld.cpp"

+				RelativePath="..\source\ReferenceManager.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\cWorld.h"

+				RelativePath="..\source\ReferenceManager.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Defines.h"

+				RelativePath="..\source\Root.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Endianness.h"

+				RelativePath="..\source\Root.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Globals.cpp"

+				RelativePath="..\source\Server.cpp"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release profiled|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\source\Globals.h"

+				RelativePath="..\source\Server.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\LeakFinder.cpp"

+				RelativePath="..\source\StackWalker.cpp"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -650,110 +627,79 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\source\LeakFinder.h"

-				>

-			</File>

-			<File

-				RelativePath="..\source\LightingThread.cpp"

+				RelativePath="..\source\StackWalker.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\LightingThread.h"

+				RelativePath="..\source\StringCompression.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\main.cpp"

+				RelativePath="..\source\StringCompression.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Matrix4f.cpp"

+				RelativePath="..\source\StringUtils.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Matrix4f.h"

+				RelativePath="..\source\StringUtils.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\MemoryLeak.h"

+				RelativePath="..\source\Tracer.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\MersenneTwister.h"

+				RelativePath="..\source\Tracer.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\StackWalker.cpp"

+				RelativePath="..\source\Vector3d.cpp"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-						WarningLevel="3"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release profiled|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\source\StackWalker.h"

+				RelativePath="..\source\Vector3d.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\StringCompression.cpp"

+				RelativePath="..\source\Vector3f.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\StringCompression.h"

+				RelativePath="..\source\Vector3f.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\StringUtils.cpp"

+				RelativePath="..\source\Vector3i.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\StringUtils.h"

+				RelativePath="..\source\Vector3i.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Vector3d.cpp"

+				RelativePath="..\source\WebAdmin.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Vector3d.h"

+				RelativePath="..\source\WebAdmin.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Vector3f.cpp"

+				RelativePath="..\source\WebPlugin.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Vector3f.h"

+				RelativePath="..\source\WebPlugin.h"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Vector3i.cpp"

+				RelativePath="..\source\World.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\source\Vector3i.h"

+				RelativePath="..\source\World.h"

 				>

 			</File>

 			<Filter

@@ -924,107 +870,95 @@
 				Name="Entities"

 				>

 				<File

-					RelativePath="..\source\cBlockEntity.h"

-					>

-				</File>

-				<File

-					RelativePath="..\source\cChestEntity.cpp"

+					RelativePath="..\source\BlockEntity.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cChestEntity.h"

+					RelativePath="..\source\ChestEntity.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cDoors.h"

+					RelativePath="..\source\ChestEntity.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cEntity.cpp"

+					RelativePath="..\source\Doors.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cEntity.h"

+					RelativePath="..\source\Entity.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cFurnaceEntity.cpp"

+					RelativePath="..\source\Entity.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cFurnaceEntity.h"

+					RelativePath="..\source\FurnaceEntity.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cItem.cpp"

+					RelativePath="..\source\FurnaceEntity.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cItem.h"

+					RelativePath="..\source\Ladder.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cLadder.h"

+					RelativePath="..\source\NoteEntity.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cNoteEntity.cpp"

+					RelativePath="..\source\NoteEntity.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cNoteEntity.h"

+					RelativePath="..\source\Pawn.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPawn.cpp"

+					RelativePath="..\source\Pawn.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPawn.h"

+					RelativePath="..\source\Pickup.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPickup.cpp"

+					RelativePath="..\source\Pickup.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPickup.h"

+					RelativePath="..\source\Player.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlayer.cpp"

+					RelativePath="..\source\Player.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlayer.h"

+					RelativePath="..\source\Sign.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cSign.h"

+					RelativePath="..\source\SignEntity.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cSignEntity.cpp"

+					RelativePath="..\source\SignEntity.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cSignEntity.h"

+					RelativePath="..\source\Stairs.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cStairs.h"

+					RelativePath="..\source\Torch.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cStep.h"

-					>

-				</File>

-				<File

-					RelativePath="..\source\cTorch.h"

-					>

-				</File>

-				<File

-					RelativePath="..\source\cVine.h"

+					RelativePath="..\source\Vine.h"

 					>

 				</File>

 			</Filter>

@@ -1056,51 +990,75 @@
 				Name="Physics"

 				>

 				<File

-					RelativePath="..\source\cFireSimulator.cpp"

+					RelativePath="..\source\FireSimulator.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\source\FireSimulator.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cFireSimulator.h"

+					RelativePath="..\source\FluidSimulator.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cFluidSimulator.cpp"

+					RelativePath="..\source\FluidSimulator.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cFluidSimulator.h"

+					RelativePath="..\source\LavaSimulator.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cLavaSimulator.cpp"

+					RelativePath="..\source\LavaSimulator.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cLavaSimulator.h"

+					RelativePath="..\source\Redstone.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cRedstoneSimulator.cpp"

+					RelativePath="..\source\Redstone.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cRedstoneSimulator.h"

+					RelativePath="..\source\RedstoneSimulator.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cSandSimulator.cpp"

+					RelativePath="..\source\RedstoneSimulator.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cSandSimulator.h"

+					RelativePath="..\source\SandSimulator.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cWaterSimulator.cpp"

+					RelativePath="..\source\SandSimulator.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cWaterSimulator.h"

+					RelativePath="..\source\Simulator.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\source\Simulator.h"

+					>

+				</File>

+				<File

+					RelativePath="..\source\SimulatorManager.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\source\SimulatorManager.h"

+					>

+				</File>

+				<File

+					RelativePath="..\source\WaterSimulator.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\source\WaterSimulator.h"

 					>

 				</File>

 			</Filter>

@@ -1429,91 +1387,91 @@
 					>

 				</File>

 				<File

-					RelativePath="..\source\cLuaChunk.cpp"

+					RelativePath="..\source\LuaChunk.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cLuaChunk.h"

+					RelativePath="..\source\LuaChunk.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cLuaCommandBinder.cpp"

+					RelativePath="..\source\LuaCommandBinder.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cLuaCommandBinder.h"

+					RelativePath="..\source\LuaCommandBinder.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlugin.cpp"

+					RelativePath="..\source\LuaFunctions.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlugin.h"

+					RelativePath="..\source\LuaItems.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlugin_Lua.cpp"

+					RelativePath="..\source\ManualBindings.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlugin_Lua.h"

+					RelativePath="..\source\ManualBindings.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlugin_NewLua.cpp"

+					RelativePath="..\source\Plugin.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlugin_NewLua.h"

+					RelativePath="..\source\Plugin.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlugin_Squirrel.cpp"

+					RelativePath="..\source\Plugin_Lua.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPlugin_Squirrel.h"

+					RelativePath="..\source\Plugin_Lua.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPluginManager.cpp"

+					RelativePath="..\source\Plugin_NewLua.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cPluginManager.h"

+					RelativePath="..\source\Plugin_NewLua.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cSquirrelCommandBinder.cpp"

+					RelativePath="..\source\Plugin_Squirrel.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cSquirrelCommandBinder.h"

+					RelativePath="..\source\Plugin_Squirrel.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cStringMap.cpp"

+					RelativePath="..\source\PluginManager.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\cStringMap.h"

+					RelativePath="..\source\PluginManager.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\LuaFunctions.h"

+					RelativePath="..\source\SquirrelCommandBinder.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\LuaItems.h"

+					RelativePath="..\source\SquirrelCommandBinder.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\ManualBindings.cpp"

+					RelativePath="..\source\StringMap.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\ManualBindings.h"

+					RelativePath="..\source\StringMap.h"

 					>

 				</File>

 				<File

@@ -1528,11 +1486,11 @@
 					Name="Squirrel"

 					>

 					<File

-						RelativePath="..\source\squirrelbindings\cSquirrelBaseClass.h"

+						RelativePath="..\source\squirrelbindings\SquirrelArray.h"

 						>

 					</File>

 					<File

-						RelativePath="..\source\squirrelbindings\SquirrelArray.h"

+						RelativePath="..\source\squirrelbindings\SquirrelBaseClass.h"

 						>

 					</File>

 					<File

@@ -1720,14 +1678,6 @@
 				Name="Blocks"

 				>

 				<File

-					RelativePath="..\source\blocks\Block.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\source\blocks\Block.h"

-					>

-				</File>

-				<File

 					RelativePath="..\source\blocks\BlockCactus.h"

 					>

 				</File>

@@ -1788,6 +1738,14 @@
 					>

 				</File>

 				<File

+					RelativePath="..\source\blocks\BlockHandler.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\source\blocks\BlockHandler.h"

+					>

+				</File>

+				<File

 					RelativePath="..\source\blocks\BlockIce.h"

 					>

 				</File>

@@ -1908,27 +1866,31 @@
 				Name="Items"

 				>

 				<File

-					RelativePath="..\source\items\Item.cpp"

+					RelativePath="..\source\items\ItemBucket.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\items\Item.h"

+					RelativePath="..\source\items\ItemCloth.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\items\ItemBucket.h"

+					RelativePath="..\source\items\ItemDoor.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\items\ItemCloth.h"

+					RelativePath="..\source\items\ItemDye.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\items\ItemDoor.h"

+					RelativePath="..\source\items\ItemFood.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\items\ItemDye.h"

+					RelativePath="..\source\items\ItemHandler.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\source\items\ItemHandler.h"

 					>

 				</File>

 				<File

@@ -1952,6 +1914,10 @@
 					>

 				</File>

 				<File

+					RelativePath="..\source\items\ItemRedstoneRepeater.h"

+					>

+				</File>

+				<File

 					RelativePath="..\source\items\ItemSapling.h"

 					>

 				</File>

@@ -1968,6 +1934,10 @@
 					>

 				</File>

 				<File

+					RelativePath="..\source\items\ItemSign.h"

+					>

+				</File>

+				<File

 					RelativePath="..\source\items\ItemSlab.h"

 					>

 				</File>

diff --git a/VC2008/WebServer.vcproj b/VC2008/WebServer.vcproj
index 460f0920c..078100bfd 100644
--- a/VC2008/WebServer.vcproj
+++ b/VC2008/WebServer.vcproj
@@ -222,11 +222,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\WebServer\cEvents.cpp"

+				RelativePath="..\WebServer\Events.cpp"

 				>

 			</File>

 			<File

-				RelativePath="..\WebServer\cEvents.h"

+				RelativePath="..\WebServer\Events.h"

 				>

 			</File>

 			<File