1 files changed, 468 insertions, 496 deletions

diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj
index cd9f6eb4f..ad0a0c49a 100644
--- a/VC2013/MCServer.vcxproj
+++ b/VC2013/MCServer.vcxproj
@@ -64,7 +64,7 @@
     <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\MCServer\</OutDir>
+    <OutDir>Debug\</OutDir>
     <IntDir>Debug\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
@@ -83,7 +83,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalOptions>/MP /FS %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94,13 +94,10 @@
       <PrecompiledHeaderFile>Globals.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(ProjectDir)\..\MCServer\$(ProjectName).exe</OutputFile>
+      <OutputFile>$(ProjectDir)\..\MCServer\$(ProjectName)_debug.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -189,293 +186,293 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource_MCServer.h" />
-    <ClInclude Include="..\source\Authenticator.h" />
-    <ClInclude Include="..\source\BlockArea.h" />
-    <ClInclude Include="..\source\BlockID.h" />
-    <ClInclude Include="..\source\BlockTracer.h" />
-    <ClInclude Include="..\source\BoundingBox.h" />
-    <ClInclude Include="..\source\ByteBuffer.h" />
-    <ClInclude Include="..\source\ChatColor.h" />
-    <ClInclude Include="..\source\Chunk.h" />
-    <ClInclude Include="..\source\Chunk.inl.h" />
-    <ClInclude Include="..\source\ChunkDef.h" />
-    <ClInclude Include="..\source\ChunkMap.h" />
-    <ClInclude Include="..\source\ChunkSender.h" />
-    <ClInclude Include="..\source\ClientHandle.h" />
-    <ClInclude Include="..\source\CommandOutput.h" />
-    <ClInclude Include="..\source\CraftingRecipes.h" />
-    <ClInclude Include="..\source\Cuboid.h" />
-    <ClInclude Include="..\source\DeadlockDetect.h" />
-    <ClInclude Include="..\source\Defines.h" />
-    <ClInclude Include="..\source\Enchantments.h" />
-    <ClInclude Include="..\source\Endianness.h" />
-    <ClInclude Include="..\source\FastRandom.h" />
-    <ClInclude Include="..\source\FurnaceRecipe.h" />
-    <ClInclude Include="..\source\Globals.h" />
-    <ClInclude Include="..\source\Group.h" />
-    <ClInclude Include="..\source\GroupManager.h" />
-    <ClInclude Include="..\source\Inventory.h" />
-    <ClInclude Include="..\source\Item.h" />
-    <ClInclude Include="..\source\ItemGrid.h" />
-    <ClInclude Include="..\source\Ladder.h" />
-    <ClInclude Include="..\source\LeakFinder.h" />
-    <ClInclude Include="..\source\LightingThread.h" />
-    <ClInclude Include="..\source\LinearInterpolation.h" />
-    <ClInclude Include="..\source\LinearUpscale.h" />
-    <ClInclude Include="..\source\LineBlockTracer.h" />
-    <ClInclude Include="..\source\Log.h" />
-    <ClInclude Include="..\source\Matrix4f.h" />
-    <ClInclude Include="..\source\MCLogger.h" />
-    <ClInclude Include="..\source\MemoryLeak.h" />
-    <ClInclude Include="..\source\MersenneTwister.h" />
-    <ClInclude Include="..\source\MobCensus.h" />
-    <ClInclude Include="..\source\MobFamilyCollecter.h" />
-    <ClInclude Include="..\source\MobProximityCounter.h" />
-    <ClInclude Include="..\source\MobSpawner.h" />
-    <ClInclude Include="..\source\MonsterConfig.h" />
-    <ClInclude Include="..\source\Noise.h" />
-    <ClInclude Include="..\source\Piston.h" />
-    <ClInclude Include="..\source\ProbabDistrib.h" />
-    <ClInclude Include="..\source\RCONServer.h" />
-    <ClInclude Include="..\source\ReferenceManager.h" />
-    <ClInclude Include="..\source\Root.h" />
-    <ClInclude Include="..\source\Server.h" />
-    <ClInclude Include="..\source\Sign.h" />
-    <ClInclude Include="..\source\StackWalker.h" />
-    <ClInclude Include="..\source\StringCompression.h" />
-    <ClInclude Include="..\source\StringUtils.h" />
-    <ClInclude Include="..\source\Tracer.h" />
-    <ClInclude Include="..\source\Vector3d.h" />
-    <ClInclude Include="..\source\Vector3f.h" />
-    <ClInclude Include="..\source\Vector3i.h" />
-    <ClInclude Include="..\source\WebAdmin.h" />
-    <ClInclude Include="..\source\World.h" />
-    <ClInclude Include="..\source\Mobs\AggressiveMonster.h" />
-    <ClInclude Include="..\source\Mobs\Bat.h" />
-    <ClInclude Include="..\source\Mobs\Blaze.h" />
-    <ClInclude Include="..\source\Mobs\Cavespider.h" />
-    <ClInclude Include="..\source\Mobs\Chicken.h" />
-    <ClInclude Include="..\source\Mobs\Cow.h" />
-    <ClInclude Include="..\source\Mobs\Creeper.h" />
-    <ClInclude Include="..\source\Mobs\EnderDragon.h" />
-    <ClInclude Include="..\source\Mobs\Enderman.h" />
-    <ClInclude Include="..\source\Mobs\Ghast.h" />
-    <ClInclude Include="..\source\Mobs\Giant.h" />
-    <ClInclude Include="..\source\Mobs\Horse.h" />
-    <ClInclude Include="..\source\Mobs\IronGolem.h" />
-    <ClInclude Include="..\source\Mobs\MagmaCube.h" />
-    <ClInclude Include="..\source\Mobs\Monster.h" />
-    <ClInclude Include="..\source\Mobs\Mooshroom.h" />
-    <ClInclude Include="..\source\Mobs\Ocelot.h" />
-    <ClInclude Include="..\source\Mobs\PassiveAggressiveMonster.h" />
-    <ClInclude Include="..\source\Mobs\PassiveMonster.h" />
-    <ClInclude Include="..\source\Mobs\Pig.h" />
-    <ClInclude Include="..\source\Mobs\Sheep.h" />
-    <ClInclude Include="..\source\Mobs\Silverfish.h" />
-    <ClInclude Include="..\source\Mobs\Skeleton.h" />
-    <ClInclude Include="..\source\Mobs\Slime.h" />
-    <ClInclude Include="..\source\Mobs\SnowGolem.h" />
-    <ClInclude Include="..\source\Mobs\Spider.h" />
-    <ClInclude Include="..\source\Mobs\Squid.h" />
-    <ClInclude Include="..\source\Mobs\Villager.h" />
-    <ClInclude Include="..\source\Mobs\Witch.h" />
-    <ClInclude Include="..\source\Mobs\Wither.h" />
-    <ClInclude Include="..\source\Mobs\Wolf.h" />
-    <ClInclude Include="..\source\Mobs\Zombie.h" />
-    <ClInclude Include="..\source\Mobs\ZombiePigman.h" />
-    <ClInclude Include="..\source\Entities\Boat.h" />
-    <ClInclude Include="..\source\Entities\Entity.h" />
-    <ClInclude Include="..\source\Entities\FallingBlock.h" />
-    <ClInclude Include="..\source\Entities\Minecart.h" />
-    <ClInclude Include="..\source\Entities\Pawn.h" />
-    <ClInclude Include="..\source\Entities\Pickup.h" />
-    <ClInclude Include="..\source\Entities\Player.h" />
-    <ClInclude Include="..\source\Entities\ProjectileEntity.h" />
-    <ClInclude Include="..\source\Entities\TNTEntity.h" />
-    <ClInclude Include="..\source\UI\SlotArea.h" />
-    <ClInclude Include="..\source\UI\Window.h" />
-    <ClInclude Include="..\source\UI\WindowOwner.h" />
-    <ClInclude Include="..\source\Simulator\DelayedFluidSimulator.h" />
-    <ClInclude Include="..\source\Simulator\FireSimulator.h" />
-    <ClInclude Include="..\source\Simulator\FloodyFluidSimulator.h" />
-    <ClInclude Include="..\source\Simulator\FluidSimulator.h" />
-    <ClInclude Include="..\source\Simulator\NoopFluidSimulator.h" />
-    <ClInclude Include="..\source\Simulator\RedstoneSimulator.h" />
-    <ClInclude Include="..\source\Simulator\SandSimulator.h" />
-    <ClInclude Include="..\source\Simulator\Simulator.h" />
-    <ClInclude Include="..\source\Simulator\SimulatorManager.h" />
-    <ClInclude Include="..\source\Simulator\VaporizeFluidSimulator.h" />
-    <ClInclude Include="..\source\OSSupport\BlockingTCPLink.h" />
-    <ClInclude Include="..\source\OSSupport\CriticalSection.h" />
-    <ClInclude Include="..\source\OSSupport\Event.h" />
-    <ClInclude Include="..\source\OSSupport\File.h" />
-    <ClInclude Include="..\source\OSSupport\GZipFile.h" />
-    <ClInclude Include="..\source\OSSupport\IsThread.h" />
-    <ClInclude Include="..\source\OSSupport\ListenThread.h" />
-    <ClInclude Include="..\source\OSSupport\Semaphore.h" />
-    <ClInclude Include="..\source\OSSupport\Sleep.h" />
-    <ClInclude Include="..\source\OSSupport\Socket.h" />
-    <ClInclude Include="..\source\OSSupport\SocketThreads.h" />
-    <ClInclude Include="..\source\OSSupport\Thread.h" />
-    <ClInclude Include="..\source\OSSupport\Timer.h" />
+    <ClInclude Include="..\src\Authenticator.h" />
+    <ClInclude Include="..\src\BlockArea.h" />
+    <ClInclude Include="..\src\BlockID.h" />
+    <ClInclude Include="..\src\BlockTracer.h" />
+    <ClInclude Include="..\src\BoundingBox.h" />
+    <ClInclude Include="..\src\ByteBuffer.h" />
+    <ClInclude Include="..\src\ChatColor.h" />
+    <ClInclude Include="..\src\Chunk.h" />
+    <ClInclude Include="..\src\Chunk.inl.h" />
+    <ClInclude Include="..\src\ChunkDef.h" />
+    <ClInclude Include="..\src\ChunkMap.h" />
+    <ClInclude Include="..\src\ChunkSender.h" />
+    <ClInclude Include="..\src\ClientHandle.h" />
+    <ClInclude Include="..\src\CommandOutput.h" />
+    <ClInclude Include="..\src\CraftingRecipes.h" />
+    <ClInclude Include="..\src\Cuboid.h" />
+    <ClInclude Include="..\src\DeadlockDetect.h" />
+    <ClInclude Include="..\src\Defines.h" />
+    <ClInclude Include="..\src\Enchantments.h" />
+    <ClInclude Include="..\src\Endianness.h" />
+    <ClInclude Include="..\src\FastRandom.h" />
+    <ClInclude Include="..\src\FurnaceRecipe.h" />
+    <ClInclude Include="..\src\Globals.h" />
+    <ClInclude Include="..\src\Group.h" />
+    <ClInclude Include="..\src\GroupManager.h" />
+    <ClInclude Include="..\src\Inventory.h" />
+    <ClInclude Include="..\src\Item.h" />
+    <ClInclude Include="..\src\ItemGrid.h" />
+    <ClInclude Include="..\src\Ladder.h" />
+    <ClInclude Include="..\src\LeakFinder.h" />
+    <ClInclude Include="..\src\LightingThread.h" />
+    <ClInclude Include="..\src\LinearInterpolation.h" />
+    <ClInclude Include="..\src\LinearUpscale.h" />
+    <ClInclude Include="..\src\LineBlockTracer.h" />
+    <ClInclude Include="..\src\Log.h" />
+    <ClInclude Include="..\src\Matrix4f.h" />
+    <ClInclude Include="..\src\MCLogger.h" />
+    <ClInclude Include="..\src\MemoryLeak.h" />
+    <ClInclude Include="..\src\MersenneTwister.h" />
+    <ClInclude Include="..\src\MobCensus.h" />
+    <ClInclude Include="..\src\MobFamilyCollecter.h" />
+    <ClInclude Include="..\src\MobProximityCounter.h" />
+    <ClInclude Include="..\src\MobSpawner.h" />
+    <ClInclude Include="..\src\MonsterConfig.h" />
+    <ClInclude Include="..\src\Noise.h" />
+    <ClInclude Include="..\src\Piston.h" />
+    <ClInclude Include="..\src\ProbabDistrib.h" />
+    <ClInclude Include="..\src\RCONServer.h" />
+    <ClInclude Include="..\src\ReferenceManager.h" />
+    <ClInclude Include="..\src\Root.h" />
+    <ClInclude Include="..\src\Server.h" />
+    <ClInclude Include="..\src\Sign.h" />
+    <ClInclude Include="..\src\StackWalker.h" />
+    <ClInclude Include="..\src\StringCompression.h" />
+    <ClInclude Include="..\src\StringUtils.h" />
+    <ClInclude Include="..\src\Tracer.h" />
+    <ClInclude Include="..\src\Vector3d.h" />
+    <ClInclude Include="..\src\Vector3f.h" />
+    <ClInclude Include="..\src\Vector3i.h" />
+    <ClInclude Include="..\src\WebAdmin.h" />
+    <ClInclude Include="..\src\World.h" />
+    <ClInclude Include="..\src\Mobs\AggressiveMonster.h" />
+    <ClInclude Include="..\src\Mobs\Bat.h" />
+    <ClInclude Include="..\src\Mobs\Blaze.h" />
+    <ClInclude Include="..\src\Mobs\Cavespider.h" />
+    <ClInclude Include="..\src\Mobs\Chicken.h" />
+    <ClInclude Include="..\src\Mobs\Cow.h" />
+    <ClInclude Include="..\src\Mobs\Creeper.h" />
+    <ClInclude Include="..\src\Mobs\EnderDragon.h" />
+    <ClInclude Include="..\src\Mobs\Enderman.h" />
+    <ClInclude Include="..\src\Mobs\Ghast.h" />
+    <ClInclude Include="..\src\Mobs\Giant.h" />
+    <ClInclude Include="..\src\Mobs\Horse.h" />
+    <ClInclude Include="..\src\Mobs\IronGolem.h" />
+    <ClInclude Include="..\src\Mobs\MagmaCube.h" />
+    <ClInclude Include="..\src\Mobs\Monster.h" />
+    <ClInclude Include="..\src\Mobs\Mooshroom.h" />
+    <ClInclude Include="..\src\Mobs\Ocelot.h" />
+    <ClInclude Include="..\src\Mobs\PassiveAggressiveMonster.h" />
+    <ClInclude Include="..\src\Mobs\PassiveMonster.h" />
+    <ClInclude Include="..\src\Mobs\Pig.h" />
+    <ClInclude Include="..\src\Mobs\Sheep.h" />
+    <ClInclude Include="..\src\Mobs\Silverfish.h" />
+    <ClInclude Include="..\src\Mobs\Skeleton.h" />
+    <ClInclude Include="..\src\Mobs\Slime.h" />
+    <ClInclude Include="..\src\Mobs\SnowGolem.h" />
+    <ClInclude Include="..\src\Mobs\Spider.h" />
+    <ClInclude Include="..\src\Mobs\Squid.h" />
+    <ClInclude Include="..\src\Mobs\Villager.h" />
+    <ClInclude Include="..\src\Mobs\Witch.h" />
+    <ClInclude Include="..\src\Mobs\Wither.h" />
+    <ClInclude Include="..\src\Mobs\Wolf.h" />
+    <ClInclude Include="..\src\Mobs\Zombie.h" />
+    <ClInclude Include="..\src\Mobs\ZombiePigman.h" />
+    <ClInclude Include="..\src\Entities\Boat.h" />
+    <ClInclude Include="..\src\Entities\Entity.h" />
+    <ClInclude Include="..\src\Entities\FallingBlock.h" />
+    <ClInclude Include="..\src\Entities\Minecart.h" />
+    <ClInclude Include="..\src\Entities\Pawn.h" />
+    <ClInclude Include="..\src\Entities\Pickup.h" />
+    <ClInclude Include="..\src\Entities\Player.h" />
+    <ClInclude Include="..\src\Entities\ProjectileEntity.h" />
+    <ClInclude Include="..\src\Entities\TNTEntity.h" />
+    <ClInclude Include="..\src\UI\SlotArea.h" />
+    <ClInclude Include="..\src\UI\Window.h" />
+    <ClInclude Include="..\src\UI\WindowOwner.h" />
+    <ClInclude Include="..\src\Simulator\DelayedFluidSimulator.h" />
+    <ClInclude Include="..\src\Simulator\FireSimulator.h" />
+    <ClInclude Include="..\src\Simulator\FloodyFluidSimulator.h" />
+    <ClInclude Include="..\src\Simulator\FluidSimulator.h" />
+    <ClInclude Include="..\src\Simulator\NoopFluidSimulator.h" />
+    <ClInclude Include="..\src\Simulator\RedstoneSimulator.h" />
+    <ClInclude Include="..\src\Simulator\SandSimulator.h" />
+    <ClInclude Include="..\src\Simulator\Simulator.h" />
+    <ClInclude Include="..\src\Simulator\SimulatorManager.h" />
+    <ClInclude Include="..\src\Simulator\VaporizeFluidSimulator.h" />
+    <ClInclude Include="..\src\OSSupport\BlockingTCPLink.h" />
+    <ClInclude Include="..\src\OSSupport\CriticalSection.h" />
+    <ClInclude Include="..\src\OSSupport\Event.h" />
+    <ClInclude Include="..\src\OSSupport\File.h" />
+    <ClInclude Include="..\src\OSSupport\GZipFile.h" />
+    <ClInclude Include="..\src\OSSupport\IsThread.h" />
+    <ClInclude Include="..\src\OSSupport\ListenThread.h" />
+    <ClInclude Include="..\src\OSSupport\Semaphore.h" />
+    <ClInclude Include="..\src\OSSupport\Sleep.h" />
+    <ClInclude Include="..\src\OSSupport\Socket.h" />
+    <ClInclude Include="..\src\OSSupport\SocketThreads.h" />
+    <ClInclude Include="..\src\OSSupport\Thread.h" />
+    <ClInclude Include="..\src\OSSupport\Timer.h" />
     <CustomBuild Include="..\Android\jni\ToJava.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuild>
-    <ClInclude Include="..\source\Bindings.h" />
-    <ClInclude Include="..\source\LuaFunctions.h" />
-    <ClInclude Include="..\source\LuaState.h" />
-    <ClInclude Include="..\source\LuaWindow.h" />
-    <ClInclude Include="..\source\ManualBindings.h" />
-    <ClInclude Include="..\source\Plugin.h" />
-    <ClInclude Include="..\source\PluginLua.h" />
-    <ClInclude Include="..\source\PluginManager.h" />
-    <ClInclude Include="..\source\tolua++.h" />
-    <ClInclude Include="..\source\tolua_base.h" />
-    <ClInclude Include="..\source\WebPlugin.h" />
+    <ClInclude Include="..\src\Bindings.h" />
+    <ClInclude Include="..\src\LuaFunctions.h" />
+    <ClInclude Include="..\src\LuaState.h" />
+    <ClInclude Include="..\src\LuaWindow.h" />
+    <ClInclude Include="..\src\ManualBindings.h" />
+    <ClInclude Include="..\src\Plugin.h" />
+    <ClInclude Include="..\src\PluginLua.h" />
+    <ClInclude Include="..\src\PluginManager.h" />
+    <ClInclude Include="..\src\tolua++.h" />
+    <ClInclude Include="..\src\tolua_base.h" />
+    <ClInclude Include="..\src\WebPlugin.h" />
     <ClInclude Include="..\iniFile\iniFile.h" />
-    <ClInclude Include="..\source\md5\md5.h" />
-    <ClInclude Include="..\source\WorldStorage\FastNBT.h" />
-    <ClInclude Include="..\source\WorldStorage\NBTChunkSerializer.h" />
-    <ClInclude Include="..\source\WorldStorage\WorldStorage.h" />
-    <ClInclude Include="..\source\WorldStorage\WSSAnvil.h" />
-    <ClInclude Include="..\source\WorldStorage\WSSCompact.h" />
-    <ClInclude Include="..\source\Generating\BioGen.h" />
-    <ClInclude Include="..\source\Generating\Caves.h" />
-    <ClInclude Include="..\source\Generating\ChunkDesc.h" />
-    <ClInclude Include="..\source\Generating\ChunkGenerator.h" />
-    <ClInclude Include="..\source\Generating\CompoGen.h" />
-    <ClInclude Include="..\source\Generating\ComposableGenerator.h" />
-    <ClInclude Include="..\source\Generating\DistortedHeightmap.h" />
-    <ClInclude Include="..\source\Generating\EndGen.h" />
-    <ClInclude Include="..\source\Generating\FinishGen.h" />
-    <ClInclude Include="..\source\Generating\HeiGen.h" />
-    <ClInclude Include="..\source\Generating\MineShafts.h" />
-    <ClInclude Include="..\source\Generating\Noise3DGenerator.h" />
-    <ClInclude Include="..\source\Generating\Ravines.h" />
-    <ClInclude Include="..\source\Generating\StructGen.h" />
-    <ClInclude Include="..\source\Generating\Trees.h" />
-    <ClInclude Include="..\source\blocks\BlockBed.h" />
-    <ClInclude Include="..\source\Blocks\BlockBrewingStand.h" />
-    <ClInclude Include="..\source\Blocks\BlockButton.h" />
-    <ClInclude Include="..\source\blocks\BlockCactus.h" />
-    <ClInclude Include="..\source\Blocks\BlockCarpet.h" />
-    <ClInclude Include="..\source\Blocks\BlockCauldron.h" />
-    <ClInclude Include="..\source\blocks\BlockChest.h" />
-    <ClInclude Include="..\source\blocks\BlockCloth.h" />
-    <ClInclude Include="..\source\Blocks\BlockCobWeb.h" />
-    <ClInclude Include="..\source\Blocks\BlockComparator.h" />
-    <ClInclude Include="..\source\blocks\BlockCrops.h" />
-    <ClInclude Include="..\source\Blocks\BlockDeadBush.h" />
-    <ClInclude Include="..\source\blocks\BlockDirt.h" />
-    <ClInclude Include="..\source\blocks\BlockDoor.h" />
-    <ClInclude Include="..\source\blocks\BlockDropSpenser.h" />
-    <ClInclude Include="..\source\Blocks\BlockEnderchest.h" />
-    <ClInclude Include="..\source\blocks\BlockEntity.h" />
-    <ClInclude Include="..\source\Blocks\BlockFarmland.h" />
-    <ClInclude Include="..\source\Blocks\BlockFenceGate.h" />
-    <ClInclude Include="..\source\blocks\BlockFire.h" />
-    <ClInclude Include="..\source\blocks\BlockFlower.h" />
-    <ClInclude Include="..\source\Blocks\BlockFlowerPot.h" />
-    <ClInclude Include="..\source\blocks\BlockFluid.h" />
-    <ClInclude Include="..\source\blocks\BlockFurnace.h" />
-    <ClInclude Include="..\source\Blocks\BlockGlass.h" />
-    <ClInclude Include="..\source\blocks\BlockGlowstone.h" />
-    <ClInclude Include="..\source\blocks\BlockGravel.h" />
-    <ClInclude Include="..\source\blocks\BlockHandler.h" />
-    <ClInclude Include="..\source\Blocks\BlockHopper.h" />
-    <ClInclude Include="..\source\blocks\BlockIce.h" />
-    <ClInclude Include="..\source\blocks\BlockLadder.h" />
-    <ClInclude Include="..\source\blocks\BlockLeaves.h" />
-    <ClInclude Include="..\source\Blocks\BlockLever.h" />
-    <ClInclude Include="..\source\blocks\BlockMelon.h" />
-    <ClInclude Include="..\source\blocks\BlockMushroom.h" />
-    <ClInclude Include="..\source\Blocks\BlockMycelium.h" />
-    <ClInclude Include="..\source\blocks\BlockNote.h" />
-    <ClInclude Include="..\source\blocks\BlockOre.h" />
-    <ClInclude Include="..\source\blocks\BlockPiston.h" />
-    <ClInclude Include="..\source\blocks\BlockPlanks.h" />
-    <ClInclude Include="..\source\blocks\BlockPortal.h" />
-    <ClInclude Include="..\source\Blocks\BlockPumpkin.h" />
-    <ClInclude Include="..\source\Blocks\BlockRail.h" />
-    <ClInclude Include="..\source\blocks\BlockRedstone.h" />
-    <ClInclude Include="..\source\blocks\BlockRedstoneOre.h" />
-    <ClInclude Include="..\source\blocks\BlockRedstoneRepeater.h" />
-    <ClInclude Include="..\source\blocks\BlockRedstoneTorch.h" />
-    <ClInclude Include="..\source\blocks\BlockSand.h" />
-    <ClInclude Include="..\source\blocks\BlockSapling.h" />
-    <ClInclude Include="..\source\blocks\BlockSign.h" />
-    <ClInclude Include="..\source\blocks\BlockSlab.h" />
-    <ClInclude Include="..\source\blocks\BlockSnow.h" />
-    <ClInclude Include="..\source\blocks\BlockStairs.h" />
-    <ClInclude Include="..\source\blocks\BlockStems.h" />
-    <ClInclude Include="..\source\blocks\BlockStone.h" />
-    <ClInclude Include="..\source\blocks\BlockSugarcane.h" />
-    <ClInclude Include="..\source\blocks\BlockTallGrass.h" />
-    <ClInclude Include="..\source\blocks\BlockTorch.h" />
-    <ClInclude Include="..\source\blocks\BlockVine.h" />
-    <ClInclude Include="..\source\blocks\BlockWood.h" />
-    <ClInclude Include="..\source\blocks\BlockWorkbench.h" />
-    <ClInclude Include="..\source\items\ItemBed.h" />
-    <ClInclude Include="..\source\Items\ItemBoat.h" />
-    <ClInclude Include="..\source\Items\ItemBow.h" />
-    <ClInclude Include="..\source\Items\ItemBrewingStand.h" />
-    <ClInclude Include="..\source\items\ItemBucket.h" />
-    <ClInclude Include="..\source\Items\ItemCauldron.h" />
-    <ClInclude Include="..\source\items\ItemCloth.h" />
-    <ClInclude Include="..\source\Items\ItemComparator.h" />
-    <ClInclude Include="..\source\items\ItemDoor.h" />
-    <ClInclude Include="..\source\items\ItemDye.h" />
-    <ClInclude Include="..\source\Items\ItemFlowerPot.h" />
-    <ClInclude Include="..\source\items\ItemFood.h" />
-    <ClInclude Include="..\source\items\ItemHandler.h" />
-    <ClInclude Include="..\source\items\ItemHoe.h" />
-    <ClInclude Include="..\source\items\ItemLeaves.h" />
-    <ClInclude Include="..\source\items\ItemLighter.h" />
-    <ClInclude Include="..\source\Items\ItemMinecart.h" />
-    <ClInclude Include="..\source\items\ItemPickaxe.h" />
-    <ClInclude Include="..\source\items\ItemRedstoneDust.h" />
-    <ClInclude Include="..\source\items\ItemRedstoneRepeater.h" />
-    <ClInclude Include="..\source\items\ItemSapling.h" />
-    <ClInclude Include="..\source\items\ItemSeeds.h" />
-    <ClInclude Include="..\source\items\ItemShears.h" />
-    <ClInclude Include="..\source\items\ItemShovel.h" />
-    <ClInclude Include="..\source\items\ItemSign.h" />
-    <ClInclude Include="..\source\Items\ItemSpawnEgg.h" />
-    <ClInclude Include="..\source\items\ItemSugarcane.h" />
-    <ClInclude Include="..\source\items\ItemSword.h" />
-    <ClInclude Include="..\source\Items\ItemThrowable.h" />
-    <ClInclude Include="..\source\Protocol\ChunkDataSerializer.h" />
-    <ClInclude Include="..\source\Protocol\Protocol.h" />
-    <ClInclude Include="..\source\Protocol\Protocol125.h" />
-    <ClInclude Include="..\source\Protocol\Protocol132.h" />
-    <ClInclude Include="..\source\Protocol\Protocol14x.h" />
-    <ClInclude Include="..\source\Protocol\Protocol15x.h" />
-    <ClInclude Include="..\source\Protocol\Protocol16x.h" />
-    <ClInclude Include="..\source\Protocol\Protocol17x.h" />
-    <ClInclude Include="..\source\Protocol\ProtocolRecognizer.h" />
-    <ClInclude Include="..\source\sqlite\sqlite3.h" />
-    <ClInclude Include="..\source\LuaExpat\lxplib.h" />
-    <ClInclude Include="..\source\BlockEntities\BlockEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\BlockEntityWithItems.h" />
-    <ClInclude Include="..\source\BlockEntities\ChestEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\DispenserEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\DropperEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\DropSpenserEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\FurnaceEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\HopperEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\JukeboxEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\NoteEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\SignEntity.h" />
-    <ClInclude Include="..\source\HTTPServer\EnvelopeParser.h" />
-    <ClInclude Include="..\source\HTTPServer\HTTPConnection.h" />
-    <ClInclude Include="..\source\HTTPServer\HTTPFormParser.h" />
-    <ClInclude Include="..\source\HTTPServer\HTTPMessage.h" />
-    <ClInclude Include="..\source\HTTPServer\HTTPServer.h" />
-    <ClInclude Include="..\source\HTTPServer\MultipartParser.h" />
-    <ClInclude Include="..\source\HTTPServer\NameValueParser.h" />
+    <ClInclude Include="..\src\md5\md5.h" />
+    <ClInclude Include="..\src\WorldStorage\FastNBT.h" />
+    <ClInclude Include="..\src\WorldStorage\NBTChunkSerializer.h" />
+    <ClInclude Include="..\src\WorldStorage\WorldStorage.h" />
+    <ClInclude Include="..\src\WorldStorage\WSSAnvil.h" />
+    <ClInclude Include="..\src\WorldStorage\WSSCompact.h" />
+    <ClInclude Include="..\src\Generating\BioGen.h" />
+    <ClInclude Include="..\src\Generating\Caves.h" />
+    <ClInclude Include="..\src\Generating\ChunkDesc.h" />
+    <ClInclude Include="..\src\Generating\ChunkGenerator.h" />
+    <ClInclude Include="..\src\Generating\CompoGen.h" />
+    <ClInclude Include="..\src\Generating\ComposableGenerator.h" />
+    <ClInclude Include="..\src\Generating\DistortedHeightmap.h" />
+    <ClInclude Include="..\src\Generating\EndGen.h" />
+    <ClInclude Include="..\src\Generating\FinishGen.h" />
+    <ClInclude Include="..\src\Generating\HeiGen.h" />
+    <ClInclude Include="..\src\Generating\MineShafts.h" />
+    <ClInclude Include="..\src\Generating\Noise3DGenerator.h" />
+    <ClInclude Include="..\src\Generating\Ravines.h" />
+    <ClInclude Include="..\src\Generating\StructGen.h" />
+    <ClInclude Include="..\src\Generating\Trees.h" />
+    <ClInclude Include="..\src\blocks\BlockBed.h" />
+    <ClInclude Include="..\src\Blocks\BlockBrewingStand.h" />
+    <ClInclude Include="..\src\Blocks\BlockButton.h" />
+    <ClInclude Include="..\src\blocks\BlockCactus.h" />
+    <ClInclude Include="..\src\Blocks\BlockCarpet.h" />
+    <ClInclude Include="..\src\Blocks\BlockCauldron.h" />
+    <ClInclude Include="..\src\blocks\BlockChest.h" />
+    <ClInclude Include="..\src\blocks\BlockCloth.h" />
+    <ClInclude Include="..\src\Blocks\BlockCobWeb.h" />
+    <ClInclude Include="..\src\Blocks\BlockComparator.h" />
+    <ClInclude Include="..\src\blocks\BlockCrops.h" />
+    <ClInclude Include="..\src\Blocks\BlockDeadBush.h" />
+    <ClInclude Include="..\src\blocks\BlockDirt.h" />
+    <ClInclude Include="..\src\blocks\BlockDoor.h" />
+    <ClInclude Include="..\src\blocks\BlockDropSpenser.h" />
+    <ClInclude Include="..\src\Blocks\BlockEnderchest.h" />
+    <ClInclude Include="..\src\blocks\BlockEntity.h" />
+    <ClInclude Include="..\src\Blocks\BlockFarmland.h" />
+    <ClInclude Include="..\src\Blocks\BlockFenceGate.h" />
+    <ClInclude Include="..\src\blocks\BlockFire.h" />
+    <ClInclude Include="..\src\blocks\BlockFlower.h" />
+    <ClInclude Include="..\src\Blocks\BlockFlowerPot.h" />
+    <ClInclude Include="..\src\blocks\BlockFluid.h" />
+    <ClInclude Include="..\src\blocks\BlockFurnace.h" />
+    <ClInclude Include="..\src\Blocks\BlockGlass.h" />
+    <ClInclude Include="..\src\blocks\BlockGlowstone.h" />
+    <ClInclude Include="..\src\blocks\BlockGravel.h" />
+    <ClInclude Include="..\src\blocks\BlockHandler.h" />
+    <ClInclude Include="..\src\Blocks\BlockHopper.h" />
+    <ClInclude Include="..\src\blocks\BlockIce.h" />
+    <ClInclude Include="..\src\blocks\BlockLadder.h" />
+    <ClInclude Include="..\src\blocks\BlockLeaves.h" />
+    <ClInclude Include="..\src\Blocks\BlockLever.h" />
+    <ClInclude Include="..\src\blocks\BlockMelon.h" />
+    <ClInclude Include="..\src\blocks\BlockMushroom.h" />
+    <ClInclude Include="..\src\Blocks\BlockMycelium.h" />
+    <ClInclude Include="..\src\blocks\BlockNote.h" />
+    <ClInclude Include="..\src\blocks\BlockOre.h" />
+    <ClInclude Include="..\src\blocks\BlockPiston.h" />
+    <ClInclude Include="..\src\blocks\BlockPlanks.h" />
+    <ClInclude Include="..\src\blocks\BlockPortal.h" />
+    <ClInclude Include="..\src\Blocks\BlockPumpkin.h" />
+    <ClInclude Include="..\src\Blocks\BlockRail.h" />
+    <ClInclude Include="..\src\blocks\BlockRedstone.h" />
+    <ClInclude Include="..\src\blocks\BlockRedstoneOre.h" />
+    <ClInclude Include="..\src\blocks\BlockRedstoneRepeater.h" />
+    <ClInclude Include="..\src\blocks\BlockRedstoneTorch.h" />
+    <ClInclude Include="..\src\blocks\BlockSand.h" />
+    <ClInclude Include="..\src\blocks\BlockSapling.h" />
+    <ClInclude Include="..\src\blocks\BlockSign.h" />
+    <ClInclude Include="..\src\blocks\BlockSlab.h" />
+    <ClInclude Include="..\src\blocks\BlockSnow.h" />
+    <ClInclude Include="..\src\blocks\BlockStairs.h" />
+    <ClInclude Include="..\src\blocks\BlockStems.h" />
+    <ClInclude Include="..\src\blocks\BlockStone.h" />
+    <ClInclude Include="..\src\blocks\BlockSugarcane.h" />
+    <ClInclude Include="..\src\blocks\BlockTallGrass.h" />
+    <ClInclude Include="..\src\blocks\BlockTorch.h" />
+    <ClInclude Include="..\src\blocks\BlockVine.h" />
+    <ClInclude Include="..\src\blocks\BlockWood.h" />
+    <ClInclude Include="..\src\blocks\BlockWorkbench.h" />
+    <ClInclude Include="..\src\items\ItemBed.h" />
+    <ClInclude Include="..\src\Items\ItemBoat.h" />
+    <ClInclude Include="..\src\Items\ItemBow.h" />
+    <ClInclude Include="..\src\Items\ItemBrewingStand.h" />
+    <ClInclude Include="..\src\items\ItemBucket.h" />
+    <ClInclude Include="..\src\Items\ItemCauldron.h" />
+    <ClInclude Include="..\src\items\ItemCloth.h" />
+    <ClInclude Include="..\src\Items\ItemComparator.h" />
+    <ClInclude Include="..\src\items\ItemDoor.h" />
+    <ClInclude Include="..\src\items\ItemDye.h" />
+    <ClInclude Include="..\src\Items\ItemFlowerPot.h" />
+    <ClInclude Include="..\src\items\ItemFood.h" />
+    <ClInclude Include="..\src\items\ItemHandler.h" />
+    <ClInclude Include="..\src\items\ItemHoe.h" />
+    <ClInclude Include="..\src\items\ItemLeaves.h" />
+    <ClInclude Include="..\src\items\ItemLighter.h" />
+    <ClInclude Include="..\src\Items\ItemMinecart.h" />
+    <ClInclude Include="..\src\items\ItemPickaxe.h" />
+    <ClInclude Include="..\src\items\ItemRedstoneDust.h" />
+    <ClInclude Include="..\src\items\ItemRedstoneRepeater.h" />
+    <ClInclude Include="..\src\items\ItemSapling.h" />
+    <ClInclude Include="..\src\items\ItemSeeds.h" />
+    <ClInclude Include="..\src\items\ItemShears.h" />
+    <ClInclude Include="..\src\items\ItemShovel.h" />
+    <ClInclude Include="..\src\items\ItemSign.h" />
+    <ClInclude Include="..\src\Items\ItemSpawnEgg.h" />
+    <ClInclude Include="..\src\items\ItemSugarcane.h" />
+    <ClInclude Include="..\src\items\ItemSword.h" />
+    <ClInclude Include="..\src\Items\ItemThrowable.h" />
+    <ClInclude Include="..\src\Protocol\ChunkDataSerializer.h" />
+    <ClInclude Include="..\src\Protocol\Protocol.h" />
+    <ClInclude Include="..\src\Protocol\Protocol125.h" />
+    <ClInclude Include="..\src\Protocol\Protocol132.h" />
+    <ClInclude Include="..\src\Protocol\Protocol14x.h" />
+    <ClInclude Include="..\src\Protocol\Protocol15x.h" />
+    <ClInclude Include="..\src\Protocol\Protocol16x.h" />
+    <ClInclude Include="..\src\Protocol\Protocol17x.h" />
+    <ClInclude Include="..\src\Protocol\ProtocolRecognizer.h" />
+    <ClInclude Include="..\src\sqlite\sqlite3.h" />
+    <ClInclude Include="..\src\LuaExpat\lxplib.h" />
+    <ClInclude Include="..\src\BlockEntities\BlockEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\BlockEntityWithItems.h" />
+    <ClInclude Include="..\src\BlockEntities\ChestEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\DispenserEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\DropperEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\DropSpenserEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\FurnaceEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\HopperEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\JukeboxEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\NoteEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\SignEntity.h" />
+    <ClInclude Include="..\src\HTTPServer\EnvelopeParser.h" />
+    <ClInclude Include="..\src\HTTPServer\HTTPConnection.h" />
+    <ClInclude Include="..\src\HTTPServer\HTTPFormParser.h" />
+    <ClInclude Include="..\src\HTTPServer\HTTPMessage.h" />
+    <ClInclude Include="..\src\HTTPServer\HTTPServer.h" />
+    <ClInclude Include="..\src\HTTPServer\MultipartParser.h" />
+    <ClInclude Include="..\src\HTTPServer\NameValueParser.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\webadmin\template.html" />
@@ -491,7 +488,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuild>
-    <CustomBuild Include="..\source\AllToLua.pkg">
+    <CustomBuild Include="..\src\AllToLua.pkg">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</ExcludedFromBuild>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">GenerateBindings.cmd
 </Command>
@@ -566,35 +563,35 @@
     <None Include="..\MCServer\Plugins\APIDump\main.lua" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\source\Authenticator.cpp" />
-    <ClCompile Include="..\source\BlockArea.cpp" />
-    <ClCompile Include="..\source\BlockID.cpp" />
-    <ClCompile Include="..\source\BoundingBox.cpp" />
-    <ClCompile Include="..\source\ByteBuffer.cpp" />
-    <ClCompile Include="..\source\ChatColor.cpp" />
-    <ClCompile Include="..\source\Chunk.cpp" />
-    <ClCompile Include="..\source\ChunkMap.cpp" />
-    <ClCompile Include="..\source\ChunkSender.cpp" />
-    <ClCompile Include="..\source\ClientHandle.cpp" />
-    <ClCompile Include="..\source\CommandOutput.cpp" />
-    <ClCompile Include="..\source\CraftingRecipes.cpp" />
-    <ClCompile Include="..\source\Cuboid.cpp" />
-    <ClCompile Include="..\source\DeadlockDetect.cpp" />
-    <ClCompile Include="..\source\Enchantments.cpp" />
-    <ClCompile Include="..\source\FastRandom.cpp" />
-    <ClCompile Include="..\source\FurnaceRecipe.cpp" />
-    <ClCompile Include="..\source\Globals.cpp">
+    <ClCompile Include="..\src\Authenticator.cpp" />
+    <ClCompile Include="..\src\BlockArea.cpp" />
+    <ClCompile Include="..\src\BlockID.cpp" />
+    <ClCompile Include="..\src\BoundingBox.cpp" />
+    <ClCompile Include="..\src\ByteBuffer.cpp" />
+    <ClCompile Include="..\src\ChatColor.cpp" />
+    <ClCompile Include="..\src\Chunk.cpp" />
+    <ClCompile Include="..\src\ChunkMap.cpp" />
+    <ClCompile Include="..\src\ChunkSender.cpp" />
+    <ClCompile Include="..\src\ClientHandle.cpp" />
+    <ClCompile Include="..\src\CommandOutput.cpp" />
+    <ClCompile Include="..\src\CraftingRecipes.cpp" />
+    <ClCompile Include="..\src\Cuboid.cpp" />
+    <ClCompile Include="..\src\DeadlockDetect.cpp" />
+    <ClCompile Include="..\src\Enchantments.cpp" />
+    <ClCompile Include="..\src\FastRandom.cpp" />
+    <ClCompile Include="..\src\FurnaceRecipe.cpp" />
+    <ClCompile Include="..\src\Globals.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\Group.cpp" />
-    <ClCompile Include="..\source\GroupManager.cpp" />
-    <ClCompile Include="..\source\Inventory.cpp" />
-    <ClCompile Include="..\source\Item.cpp" />
-    <ClCompile Include="..\source\ItemGrid.cpp" />
-    <ClCompile Include="..\source\LeakFinder.cpp">
+    <ClCompile Include="..\src\Group.cpp" />
+    <ClCompile Include="..\src\GroupManager.cpp" />
+    <ClCompile Include="..\src\Inventory.cpp" />
+    <ClCompile Include="..\src\Item.cpp" />
+    <ClCompile Include="..\src\ItemGrid.cpp" />
+    <ClCompile Include="..\src\LeakFinder.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Level3</WarningLevel>
@@ -608,19 +605,19 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\LightingThread.cpp" />
-    <ClCompile Include="..\source\LinearInterpolation.cpp" />
-    <ClCompile Include="..\source\LineBlockTracer.cpp" />
-    <ClCompile Include="..\source\Log.cpp" />
-    <ClCompile Include="..\source\main.cpp" />
-    <ClCompile Include="..\source\Matrix4f.cpp" />
-    <ClCompile Include="..\source\MCLogger.cpp" />
-    <ClCompile Include="..\source\MobCensus.cpp" />
-    <ClCompile Include="..\source\MobFamilyCollecter.cpp" />
-    <ClCompile Include="..\source\MobProximityCounter.cpp" />
-    <ClCompile Include="..\source\MobSpawner.cpp" />
-    <ClCompile Include="..\source\MonsterConfig.cpp" />
-    <ClCompile Include="..\source\Noise.cpp">
+    <ClCompile Include="..\src\LightingThread.cpp" />
+    <ClCompile Include="..\src\LinearInterpolation.cpp" />
+    <ClCompile Include="..\src\LineBlockTracer.cpp" />
+    <ClCompile Include="..\src\Log.cpp" />
+    <ClCompile Include="..\src\main.cpp" />
+    <ClCompile Include="..\src\Matrix4f.cpp" />
+    <ClCompile Include="..\src\MCLogger.cpp" />
+    <ClCompile Include="..\src\MobCensus.cpp" />
+    <ClCompile Include="..\src\MobFamilyCollecter.cpp" />
+    <ClCompile Include="..\src\MobProximityCounter.cpp" />
+    <ClCompile Include="..\src\MobSpawner.cpp" />
+    <ClCompile Include="..\src\MonsterConfig.cpp" />
+    <ClCompile Include="..\src\Noise.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">MaxSpeed</Optimization>
       <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</IntrinsicFunctions>
       <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Speed</FavorSizeOrSpeed>
@@ -636,13 +633,13 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\Piston.cpp" />
-    <ClCompile Include="..\source\ProbabDistrib.cpp" />
-    <ClCompile Include="..\source\RCONServer.cpp" />
-    <ClCompile Include="..\source\ReferenceManager.cpp" />
-    <ClCompile Include="..\source\Root.cpp" />
-    <ClCompile Include="..\source\Server.cpp" />
-    <ClCompile Include="..\source\StackWalker.cpp">
+    <ClCompile Include="..\src\Piston.cpp" />
+    <ClCompile Include="..\src\ProbabDistrib.cpp" />
+    <ClCompile Include="..\src\RCONServer.cpp" />
+    <ClCompile Include="..\src\ReferenceManager.cpp" />
+    <ClCompile Include="..\src\Root.cpp" />
+    <ClCompile Include="..\src\Server.cpp" />
+    <ClCompile Include="..\src\StackWalker.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Level3</WarningLevel>
@@ -656,78 +653,78 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\StringCompression.cpp" />
-    <ClCompile Include="..\source\StringUtils.cpp" />
-    <ClCompile Include="..\source\Tracer.cpp" />
-    <ClCompile Include="..\source\Vector3d.cpp" />
-    <ClCompile Include="..\source\Vector3f.cpp" />
-    <ClCompile Include="..\source\Vector3i.cpp" />
-    <ClCompile Include="..\source\WebAdmin.cpp" />
-    <ClCompile Include="..\source\World.cpp" />
-    <ClCompile Include="..\source\Mobs\AggressiveMonster.cpp" />
-    <ClCompile Include="..\source\Mobs\Bat.cpp" />
-    <ClCompile Include="..\source\Mobs\Blaze.cpp" />
-    <ClCompile Include="..\source\Mobs\Cavespider.cpp" />
-    <ClCompile Include="..\source\Mobs\Chicken.cpp" />
-    <ClCompile Include="..\source\Mobs\Cow.cpp" />
-    <ClCompile Include="..\source\Mobs\Creeper.cpp" />
-    <ClCompile Include="..\source\Mobs\EnderDragon.cpp" />
-    <ClCompile Include="..\source\Mobs\Enderman.cpp" />
-    <ClCompile Include="..\source\Mobs\Ghast.cpp" />
-    <ClCompile Include="..\source\Mobs\Giant.cpp" />
-    <ClCompile Include="..\source\Mobs\Horse.cpp" />
-    <ClCompile Include="..\source\Mobs\IronGolem.cpp" />
-    <ClCompile Include="..\source\Mobs\MagmaCube.cpp" />
-    <ClCompile Include="..\source\Mobs\Monster.cpp" />
-    <ClCompile Include="..\source\Mobs\Mooshroom.cpp" />
-    <ClCompile Include="..\source\Mobs\PassiveAggressiveMonster.cpp" />
-    <ClCompile Include="..\source\Mobs\PassiveMonster.cpp" />
-    <ClCompile Include="..\source\Mobs\Pig.cpp" />
-    <ClCompile Include="..\source\Mobs\Sheep.cpp" />
-    <ClCompile Include="..\source\Mobs\Skeleton.cpp" />
-    <ClCompile Include="..\source\Mobs\Slime.cpp" />
-    <ClCompile Include="..\source\Mobs\SnowGolem.cpp" />
-    <ClCompile Include="..\source\Mobs\Spider.cpp" />
-    <ClCompile Include="..\source\Mobs\Squid.cpp" />
-    <ClCompile Include="..\source\Mobs\Villager.cpp" />
-    <ClCompile Include="..\source\Mobs\Witch.cpp" />
-    <ClCompile Include="..\source\Mobs\Wither.cpp" />
-    <ClCompile Include="..\source\Mobs\Wolf.cpp" />
-    <ClCompile Include="..\source\Mobs\Zombie.cpp" />
-    <ClCompile Include="..\source\Mobs\ZombiePigman.cpp" />
-    <ClCompile Include="..\source\Entities\Boat.cpp" />
-    <ClCompile Include="..\source\Entities\Entity.cpp" />
-    <ClCompile Include="..\source\Entities\FallingBlock.cpp" />
-    <ClCompile Include="..\source\Entities\Minecart.cpp" />
-    <ClCompile Include="..\source\Entities\Pawn.cpp" />
-    <ClCompile Include="..\source\Entities\Pickup.cpp" />
-    <ClCompile Include="..\source\Entities\Player.cpp" />
-    <ClCompile Include="..\source\Entities\ProjectileEntity.cpp" />
-    <ClCompile Include="..\source\Entities\TNTEntity.cpp" />
-    <ClCompile Include="..\source\UI\SlotArea.cpp" />
-    <ClCompile Include="..\source\UI\Window.cpp" />
-    <ClCompile Include="..\source\Simulator\DelayedFluidSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\FireSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\FloodyFluidSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\FluidSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\RedstoneSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\SandSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\Simulator.cpp" />
-    <ClCompile Include="..\source\Simulator\SimulatorManager.cpp" />
-    <ClCompile Include="..\source\Simulator\VaporizeFluidSimulator.cpp" />
-    <ClCompile Include="..\source\OSSupport\BlockingTCPLink.cpp" />
-    <ClCompile Include="..\source\OSSupport\CriticalSection.cpp" />
-    <ClCompile Include="..\source\OSSupport\Event.cpp" />
-    <ClCompile Include="..\source\OSSupport\File.cpp" />
-    <ClCompile Include="..\source\OSSupport\GZipFile.cpp" />
-    <ClCompile Include="..\source\OSSupport\IsThread.cpp" />
-    <ClCompile Include="..\source\OSSupport\ListenThread.cpp" />
-    <ClCompile Include="..\source\OSSupport\Semaphore.cpp" />
-    <ClCompile Include="..\source\OSSupport\Sleep.cpp" />
-    <ClCompile Include="..\source\OSSupport\Socket.cpp" />
-    <ClCompile Include="..\source\OSSupport\SocketThreads.cpp" />
-    <ClCompile Include="..\source\OSSupport\Thread.cpp" />
-    <ClCompile Include="..\source\OSSupport\Timer.cpp" />
+    <ClCompile Include="..\src\StringCompression.cpp" />
+    <ClCompile Include="..\src\StringUtils.cpp" />
+    <ClCompile Include="..\src\Tracer.cpp" />
+    <ClCompile Include="..\src\Vector3d.cpp" />
+    <ClCompile Include="..\src\Vector3f.cpp" />
+    <ClCompile Include="..\src\Vector3i.cpp" />
+    <ClCompile Include="..\src\WebAdmin.cpp" />
+    <ClCompile Include="..\src\World.cpp" />
+    <ClCompile Include="..\src\Mobs\AggressiveMonster.cpp" />
+    <ClCompile Include="..\src\Mobs\Bat.cpp" />
+    <ClCompile Include="..\src\Mobs\Blaze.cpp" />
+    <ClCompile Include="..\src\Mobs\Cavespider.cpp" />
+    <ClCompile Include="..\src\Mobs\Chicken.cpp" />
+    <ClCompile Include="..\src\Mobs\Cow.cpp" />
+    <ClCompile Include="..\src\Mobs\Creeper.cpp" />
+    <ClCompile Include="..\src\Mobs\EnderDragon.cpp" />
+    <ClCompile Include="..\src\Mobs\Enderman.cpp" />
+    <ClCompile Include="..\src\Mobs\Ghast.cpp" />
+    <ClCompile Include="..\src\Mobs\Giant.cpp" />
+    <ClCompile Include="..\src\Mobs\Horse.cpp" />
+    <ClCompile Include="..\src\Mobs\IronGolem.cpp" />
+    <ClCompile Include="..\src\Mobs\MagmaCube.cpp" />
+    <ClCompile Include="..\src\Mobs\Monster.cpp" />
+    <ClCompile Include="..\src\Mobs\Mooshroom.cpp" />
+    <ClCompile Include="..\src\Mobs\PassiveAggressiveMonster.cpp" />
+    <ClCompile Include="..\src\Mobs\PassiveMonster.cpp" />
+    <ClCompile Include="..\src\Mobs\Pig.cpp" />
+    <ClCompile Include="..\src\Mobs\Sheep.cpp" />
+    <ClCompile Include="..\src\Mobs\Skeleton.cpp" />
+    <ClCompile Include="..\src\Mobs\Slime.cpp" />
+    <ClCompile Include="..\src\Mobs\SnowGolem.cpp" />
+    <ClCompile Include="..\src\Mobs\Spider.cpp" />
+    <ClCompile Include="..\src\Mobs\Squid.cpp" />
+    <ClCompile Include="..\src\Mobs\Villager.cpp" />
+    <ClCompile Include="..\src\Mobs\Witch.cpp" />
+    <ClCompile Include="..\src\Mobs\Wither.cpp" />
+    <ClCompile Include="..\src\Mobs\Wolf.cpp" />
+    <ClCompile Include="..\src\Mobs\Zombie.cpp" />
+    <ClCompile Include="..\src\Mobs\ZombiePigman.cpp" />
+    <ClCompile Include="..\src\Entities\Boat.cpp" />
+    <ClCompile Include="..\src\Entities\Entity.cpp" />
+    <ClCompile Include="..\src\Entities\FallingBlock.cpp" />
+    <ClCompile Include="..\src\Entities\Minecart.cpp" />
+    <ClCompile Include="..\src\Entities\Pawn.cpp" />
+    <ClCompile Include="..\src\Entities\Pickup.cpp" />
+    <ClCompile Include="..\src\Entities\Player.cpp" />
+    <ClCompile Include="..\src\Entities\ProjectileEntity.cpp" />
+    <ClCompile Include="..\src\Entities\TNTEntity.cpp" />
+    <ClCompile Include="..\src\UI\SlotArea.cpp" />
+    <ClCompile Include="..\src\UI\Window.cpp" />
+    <ClCompile Include="..\src\Simulator\DelayedFluidSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\FireSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\FloodyFluidSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\FluidSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\RedstoneSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\SandSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\Simulator.cpp" />
+    <ClCompile Include="..\src\Simulator\SimulatorManager.cpp" />
+    <ClCompile Include="..\src\Simulator\VaporizeFluidSimulator.cpp" />
+    <ClCompile Include="..\src\OSSupport\BlockingTCPLink.cpp" />
+    <ClCompile Include="..\src\OSSupport\CriticalSection.cpp" />
+    <ClCompile Include="..\src\OSSupport\Event.cpp" />
+    <ClCompile Include="..\src\OSSupport\File.cpp" />
+    <ClCompile Include="..\src\OSSupport\GZipFile.cpp" />
+    <ClCompile Include="..\src\OSSupport\IsThread.cpp" />
+    <ClCompile Include="..\src\OSSupport\ListenThread.cpp" />
+    <ClCompile Include="..\src\OSSupport\Semaphore.cpp" />
+    <ClCompile Include="..\src\OSSupport\Sleep.cpp" />
+    <ClCompile Include="..\src\OSSupport\Socket.cpp" />
+    <ClCompile Include="..\src\OSSupport\SocketThreads.cpp" />
+    <ClCompile Include="..\src\OSSupport\Thread.cpp" />
+    <ClCompile Include="..\src\OSSupport\Timer.cpp" />
     <ClCompile Include="..\Android\jni\app-android.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -740,7 +737,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\source\Bindings.cpp">
+    <ClCompile Include="..\src\Bindings.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -750,15 +747,15 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\LuaState.cpp" />
-    <ClCompile Include="..\source\LuaWindow.cpp" />
-    <ClCompile Include="..\source\ManualBindings.cpp" />
-    <ClCompile Include="..\source\Plugin.cpp" />
-    <ClCompile Include="..\source\PluginLua.cpp" />
-    <ClCompile Include="..\source\PluginManager.cpp" />
-    <ClCompile Include="..\source\WebPlugin.cpp" />
+    <ClCompile Include="..\src\LuaState.cpp" />
+    <ClCompile Include="..\src\LuaWindow.cpp" />
+    <ClCompile Include="..\src\ManualBindings.cpp" />
+    <ClCompile Include="..\src\Plugin.cpp" />
+    <ClCompile Include="..\src\PluginLua.cpp" />
+    <ClCompile Include="..\src\PluginManager.cpp" />
+    <ClCompile Include="..\src\WebPlugin.cpp" />
     <ClCompile Include="..\iniFile\iniFile.cpp" />
-    <ClCompile Include="..\source\md5\md5.cpp">
+    <ClCompile Include="..\src\md5\md5.cpp">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
@@ -772,45 +769,45 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\WorldStorage\FastNBT.cpp" />
-    <ClCompile Include="..\source\WorldStorage\NBTChunkSerializer.cpp" />
-    <ClCompile Include="..\source\WorldStorage\WorldStorage.cpp" />
-    <ClCompile Include="..\source\WorldStorage\WSSAnvil.cpp" />
-    <ClCompile Include="..\source\WorldStorage\WSSCompact.cpp" />
-    <ClCompile Include="..\source\Generating\BioGen.cpp" />
-    <ClCompile Include="..\source\Generating\Caves.cpp" />
-    <ClCompile Include="..\source\Generating\ChunkDesc.cpp" />
-    <ClCompile Include="..\source\Generating\ChunkGenerator.cpp" />
-    <ClCompile Include="..\source\Generating\CompoGen.cpp" />
-    <ClCompile Include="..\source\Generating\ComposableGenerator.cpp" />
-    <ClCompile Include="..\source\Generating\DistortedHeightmap.cpp" />
-    <ClCompile Include="..\source\Generating\EndGen.cpp" />
-    <ClCompile Include="..\source\Generating\FinishGen.cpp" />
-    <ClCompile Include="..\source\Generating\HeiGen.cpp" />
-    <ClCompile Include="..\source\Generating\MineShafts.cpp" />
-    <ClCompile Include="..\source\Generating\Noise3DGenerator.cpp" />
-    <ClCompile Include="..\source\Generating\Ravines.cpp" />
-    <ClCompile Include="..\source\Generating\StructGen.cpp" />
-    <ClCompile Include="..\source\Generating\Trees.cpp" />
-    <ClCompile Include="..\source\Blocks\BlockBed.cpp" />
-    <ClCompile Include="..\source\Blocks\BlockButton.cpp" />
-    <ClCompile Include="..\source\Blocks\BlockComparator.cpp" />
-    <ClCompile Include="..\source\blocks\BlockDoor.cpp" />
-    <ClCompile Include="..\source\blocks\BlockHandler.cpp" />
-    <ClCompile Include="..\source\Blocks\BlockLever.cpp" />
-    <ClCompile Include="..\source\blocks\BlockPiston.cpp" />
-    <ClCompile Include="..\source\blocks\BlockRedstone.cpp" />
-    <ClCompile Include="..\source\blocks\BlockRedstoneRepeater.cpp" />
-    <ClCompile Include="..\source\items\ItemHandler.cpp" />
-    <ClCompile Include="..\source\Protocol\ChunkDataSerializer.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol125.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol132.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol14x.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol15x.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol16x.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol17x.cpp" />
-    <ClCompile Include="..\source\Protocol\ProtocolRecognizer.cpp" />
-    <ClCompile Include="..\source\sqlite\lsqlite3.c">
+    <ClCompile Include="..\src\WorldStorage\FastNBT.cpp" />
+    <ClCompile Include="..\src\WorldStorage\NBTChunkSerializer.cpp" />
+    <ClCompile Include="..\src\WorldStorage\WorldStorage.cpp" />
+    <ClCompile Include="..\src\WorldStorage\WSSAnvil.cpp" />
+    <ClCompile Include="..\src\WorldStorage\WSSCompact.cpp" />
+    <ClCompile Include="..\src\Generating\BioGen.cpp" />
+    <ClCompile Include="..\src\Generating\Caves.cpp" />
+    <ClCompile Include="..\src\Generating\ChunkDesc.cpp" />
+    <ClCompile Include="..\src\Generating\ChunkGenerator.cpp" />
+    <ClCompile Include="..\src\Generating\CompoGen.cpp" />
+    <ClCompile Include="..\src\Generating\ComposableGenerator.cpp" />
+    <ClCompile Include="..\src\Generating\DistortedHeightmap.cpp" />
+    <ClCompile Include="..\src\Generating\EndGen.cpp" />
+    <ClCompile Include="..\src\Generating\FinishGen.cpp" />
+    <ClCompile Include="..\src\Generating\HeiGen.cpp" />
+    <ClCompile Include="..\src\Generating\MineShafts.cpp" />
+    <ClCompile Include="..\src\Generating\Noise3DGenerator.cpp" />
+    <ClCompile Include="..\src\Generating\Ravines.cpp" />
+    <ClCompile Include="..\src\Generating\StructGen.cpp" />
+    <ClCompile Include="..\src\Generating\Trees.cpp" />
+    <ClCompile Include="..\src\Blocks\BlockBed.cpp" />
+    <ClCompile Include="..\src\Blocks\BlockButton.cpp" />
+    <ClCompile Include="..\src\Blocks\BlockComparator.cpp" />
+    <ClCompile Include="..\src\blocks\BlockDoor.cpp" />
+    <ClCompile Include="..\src\blocks\BlockHandler.cpp" />
+    <ClCompile Include="..\src\Blocks\BlockLever.cpp" />
+    <ClCompile Include="..\src\blocks\BlockPiston.cpp" />
+    <ClCompile Include="..\src\blocks\BlockRedstone.cpp" />
+    <ClCompile Include="..\src\blocks\BlockRedstoneRepeater.cpp" />
+    <ClCompile Include="..\src\items\ItemHandler.cpp" />
+    <ClCompile Include="..\src\Protocol\ChunkDataSerializer.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol125.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol132.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol14x.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol15x.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol16x.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol17x.cpp" />
+    <ClCompile Include="..\src\Protocol\ProtocolRecognizer.cpp" />
+    <ClCompile Include="..\src\sqlite\lsqlite3.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -820,7 +817,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\sqlite\sqlite3.c">
+    <ClCompile Include="..\src\sqlite\sqlite3.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -830,7 +827,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\LuaExpat\lxplib.c">
+    <ClCompile Include="..\src\LuaExpat\lxplib.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -840,55 +837,30 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\ChestEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\DispenserEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\DropperEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\DropSpenserEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\FurnaceEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\HopperEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\JukeboxEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\NoteEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\SignEntity.cpp" />
-    <ClCompile Include="..\source\HTTPServer\EnvelopeParser.cpp" />
-    <ClCompile Include="..\source\HTTPServer\HTTPConnection.cpp" />
-    <ClCompile Include="..\source\HTTPServer\HTTPFormParser.cpp" />
-    <ClCompile Include="..\source\HTTPServer\HTTPMessage.cpp" />
-    <ClCompile Include="..\source\HTTPServer\HTTPServer.cpp" />
-    <ClCompile Include="..\source\HTTPServer\MultipartParser.cpp" />
-    <ClCompile Include="..\source\HTTPServer\NameValueParser.cpp" />
+    <ClCompile Include="..\src\BlockEntities\BlockEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\ChestEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\DispenserEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\DropperEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\DropSpenserEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\FurnaceEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\HopperEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\JukeboxEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\NoteEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\SignEntity.cpp" />
+    <ClCompile Include="..\src\HTTPServer\EnvelopeParser.cpp" />
+    <ClCompile Include="..\src\HTTPServer\HTTPConnection.cpp" />
+    <ClCompile Include="..\src\HTTPServer\HTTPFormParser.cpp" />
+    <ClCompile Include="..\src\HTTPServer\HTTPMessage.cpp" />
+    <ClCompile Include="..\src\HTTPServer\HTTPServer.cpp" />
+    <ClCompile Include="..\src\HTTPServer\MultipartParser.cpp" />
+    <ClCompile Include="..\src\HTTPServer\NameValueParser.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\MCServer\API.txt" />
-    <Text Include="..\source\sqlite\urls.txt" />
+    <Text Include="..\src\sqlite\urls.txt" />
     <Text Include="..\MCServer\crafting.txt" />
     <Text Include="..\MCServer\furnace.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="CryptoPP.vcxproj">
-      <Project>{3423ec9a-52e4-4a4d-9753-edebc38785ef}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="expat.vcxproj">
-      <Project>{5fcfaf8d-ff2c-456d-a72c-1d76f913ad96}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="JsonCpp.vcxproj">
-      <Project>{5aaa90b9-946d-4034-83f3-676b06a6e326}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="Lua.vcxproj">
-      <Project>{082e8185-7b3a-4945-8c82-9132341a329d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="ToLua.vcxproj">
-      <Project>{eeab54ad-114c-4ab8-8482-0a52d502bd35}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>{ea9d50fd-937a-4ef5-8c37-5f4175af4fea}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>