diff --git a/source/client/player/input/Keyboard.hpp b/source/client/player/input/Keyboard.hpp
index d019735..3497c86 100644
--- a/source/client/player/input/Keyboard.hpp
+++ b/source/client/player/input/Keyboard.hpp
@@ -21,7 +21,7 @@ struct KeyboardAction;
 class Keyboard
 {
 public:
-	enum KeyState : bool
+	enum KeyState
 	{
 		UP,
 		DOWN
diff --git a/source/client/player/input/Mouse.hpp b/source/client/player/input/Mouse.hpp
index 065faee..707bc20 100644
--- a/source/client/player/input/Mouse.hpp
+++ b/source/client/player/input/Mouse.hpp
@@ -28,7 +28,7 @@ public:
 		SCROLLWHEEL,
 	};
 
-	enum ButtonState : bool
+	enum ButtonState
 	{
 		UP,
 		DOWN,
diff --git a/windows_vs/minecraftcpp_vs2010.vcxproj b/windows_vs/minecraftcpp_vs2010.vcxproj
index eecb858..64e8dbf 100644
--- a/windows_vs/minecraftcpp_vs2010.vcxproj
+++ b/windows_vs/minecraftcpp_vs2010.vcxproj
@@ -85,21 +85,15 @@
     <ClInclude Include="..\platforms\windows\SoundSystemWindows.hpp" />
     <ClInclude Include="..\source\App.hpp" />
     <ClInclude Include="..\source\AppPlatform.hpp" />
-    <ClInclude Include="..\source\client\common\AABB.hpp" />
-    <ClInclude Include="..\source\client\common\CThread.hpp" />
-    <ClInclude Include="..\source\client\common\HitResult.hpp" />
-    <ClInclude Include="..\source\client\common\ImprovedNoise.hpp" />
-    <ClInclude Include="..\source\client\common\LongHack.hpp" />
-    <ClInclude Include="..\source\client\common\Matrix.hpp" />
-    <ClInclude Include="..\source\client\common\Mth.hpp" />
-    <ClInclude Include="..\source\client\common\Options.hpp" />
-    <ClInclude Include="..\source\client\common\PerlinNoise.hpp" />
-    <ClInclude Include="..\source\client\common\Random.hpp" />
-    <ClInclude Include="..\source\client\common\Synth.hpp" />
-    <ClInclude Include="..\source\client\common\Timer.hpp" />
-    <ClInclude Include="..\source\client\common\Util.hpp" />
-    <ClInclude Include="..\source\client\common\Utils.hpp" />
-    <ClInclude Include="..\source\client\common\Vec3.hpp" />
+    <ClInclude Include="..\source\common\CThread.hpp" />
+    <ClInclude Include="..\source\common\LongHack.hpp" />
+    <ClInclude Include="..\source\common\Matrix.hpp" />
+    <ClInclude Include="..\source\common\Mth.hpp" />
+    <ClInclude Include="..\source\common\Options.hpp" />
+    <ClInclude Include="..\source\common\Random.hpp" />
+    <ClInclude Include="..\source\common\Timer.hpp" />
+    <ClInclude Include="..\source\common\Util.hpp" />
+    <ClInclude Include="..\source\common\Utils.hpp" />
     <ClInclude Include="..\source\client\gui\components\AvailableGamesList.hpp" />
     <ClInclude Include="..\source\client\gui\components\Button.hpp" />
     <ClInclude Include="..\source\client\gui\components\RolledSelectionList.hpp" />
@@ -130,13 +124,13 @@
     <ClInclude Include="..\source\client\model\HumanoidModel.hpp" />
     <ClInclude Include="..\source\client\model\Model.hpp" />
     <ClInclude Include="..\source\client\model\PolygonQuad.hpp" />
-    <ClInclude Include="..\source\client\network\ClientSideNetworkHandler.hpp" />
-    <ClInclude Include="..\source\client\network\MinecraftPackets.hpp" />
-    <ClInclude Include="..\source\client\network\NetEventCallback.hpp" />
-    <ClInclude Include="..\source\client\network\Packet.hpp" />
-    <ClInclude Include="..\source\client\network\PingedCompatibleServer.hpp" />
-    <ClInclude Include="..\source\client\network\RakNetInstance.hpp" />
-    <ClInclude Include="..\source\client\network\ServerSideNetworkHandler.hpp" />
+    <ClInclude Include="..\source\network\ClientSideNetworkHandler.hpp" />
+    <ClInclude Include="..\source\network\MinecraftPackets.hpp" />
+    <ClInclude Include="..\source\network\NetEventCallback.hpp" />
+    <ClInclude Include="..\source\network\Packet.hpp" />
+    <ClInclude Include="..\source\network\PingedCompatibleServer.hpp" />
+    <ClInclude Include="..\source\network\RakNetInstance.hpp" />
+    <ClInclude Include="..\source\network\ServerSideNetworkHandler.hpp" />
     <ClInclude Include="..\source\client\player\input\Controller.hpp" />
     <ClInclude Include="..\source\client\player\input\ControllerTurnInput.hpp" />
     <ClInclude Include="..\source\client\player\input\ITurnInput.hpp" />
@@ -180,6 +174,12 @@
     <ClInclude Include="..\source\client\sound\SoundSystem.hpp" />
     <ClInclude Include="..\source\Minecraft.hpp" />
     <ClInclude Include="..\source\NinecraftApp.hpp" />
+    <ClInclude Include="..\source\world\phys\Vec3.hpp" />
+    <ClInclude Include="..\source\world\phys\AABB.hpp" />
+    <ClInclude Include="..\source\world\phys\HitResult.hpp" />
+    <ClInclude Include="..\source\world\level\levelgen\synth\Synth.hpp" />
+    <ClInclude Include="..\source\world\level\levelgen\synth\ImprovedNoise.hpp" />
+    <ClInclude Include="..\source\world\level\levelgen\synth\PerlinNoise.hpp" />
     <ClInclude Include="..\source\world\entity\Entity.hpp" />
     <ClInclude Include="..\source\world\entity\FallingTile.hpp" />
     <ClInclude Include="..\source\world\entity\ItemEntity.hpp" />
@@ -441,20 +441,14 @@
     <ClCompile Include="..\platforms\windows\SoundSystemWindows.cpp" />
     <ClCompile Include="..\source\App.cpp" />
     <ClCompile Include="..\source\AppPlatform.cpp" />
-    <ClCompile Include="..\source\client\common\AABB.cpp" />
-    <ClCompile Include="..\source\client\common\CThread.cpp" />
-    <ClCompile Include="..\source\client\common\HitResult.cpp" />
-    <ClCompile Include="..\source\client\common\ImprovedNoise.cpp" />
-    <ClCompile Include="..\source\client\common\Matrix.cpp" />
-    <ClCompile Include="..\source\client\common\Mth.cpp" />
-    <ClCompile Include="..\source\client\common\Options.cpp" />
-    <ClCompile Include="..\source\client\common\PerlinNoise.cpp" />
-    <ClCompile Include="..\source\client\common\Random.cpp" />
-    <ClCompile Include="..\source\client\common\Synth.cpp" />
-    <ClCompile Include="..\source\client\common\Timer.cpp" />
-    <ClCompile Include="..\source\client\common\Util.cpp" />
-    <ClCompile Include="..\source\client\common\Utils.cpp" />
-    <ClCompile Include="..\source\client\common\Vec3.cpp" />
+    <ClCompile Include="..\source\common\CThread.cpp" />
+    <ClCompile Include="..\source\common\Matrix.cpp" />
+    <ClCompile Include="..\source\common\Mth.cpp" />
+    <ClCompile Include="..\source\common\Options.cpp" />
+    <ClCompile Include="..\source\common\Random.cpp" />
+    <ClCompile Include="..\source\common\Timer.cpp" />
+    <ClCompile Include="..\source\common\Util.cpp" />
+    <ClCompile Include="..\source\common\Utils.cpp" />
     <ClCompile Include="..\source\client\gui\components\AvailableGamesList.cpp" />
     <ClCompile Include="..\source\client\gui\components\Button.cpp" />
     <ClCompile Include="..\source\client\gui\components\RolledSelectionList.cpp" />
@@ -485,24 +479,24 @@
     <ClCompile Include="..\source\client\model\HumanoidModel.cpp" />
     <ClCompile Include="..\source\client\model\Model.cpp" />
     <ClCompile Include="..\source\client\model\PolygonQuad.cpp" />
-    <ClCompile Include="..\source\client\network\ClientSideNetworkHandler.cpp" />
-    <ClCompile Include="..\source\client\network\MinecraftPackets.cpp" />
-    <ClCompile Include="..\source\client\network\NetEventCallback.cpp" />
-    <ClCompile Include="..\source\client\network\packets\AddPlayerPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\ChunkDataPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\LevelDataPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\LoginPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\MessagePacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\MovePlayerPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\PlaceBlockPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\PlayerEquipmentPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\RemoveBlockPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\RemoveEntityPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\RequestChunkPacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\StartGamePacket.cpp" />
-    <ClCompile Include="..\source\client\network\packets\UpdateBlockPacket.cpp" />
-    <ClCompile Include="..\source\client\network\RakNetInstance.cpp" />
-    <ClCompile Include="..\source\client\network\ServerSideNetworkHandler.cpp" />
+    <ClCompile Include="..\source\network\ClientSideNetworkHandler.cpp" />
+    <ClCompile Include="..\source\network\MinecraftPackets.cpp" />
+    <ClCompile Include="..\source\network\NetEventCallback.cpp" />
+    <ClCompile Include="..\source\network\packets\AddPlayerPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\ChunkDataPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\LevelDataPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\LoginPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\MessagePacket.cpp" />
+    <ClCompile Include="..\source\network\packets\MovePlayerPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\PlaceBlockPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\PlayerEquipmentPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\RemoveBlockPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\RemoveEntityPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\RequestChunkPacket.cpp" />
+    <ClCompile Include="..\source\network\packets\StartGamePacket.cpp" />
+    <ClCompile Include="..\source\network\packets\UpdateBlockPacket.cpp" />
+    <ClCompile Include="..\source\network\RakNetInstance.cpp" />
+    <ClCompile Include="..\source\network\ServerSideNetworkHandler.cpp" />
     <ClCompile Include="..\source\client\player\input\Controller.cpp" />
     <ClCompile Include="..\source\client\player\input\ControllerTurnInput.cpp" />
     <ClCompile Include="..\source\client\player\input\ITurnInput.cpp" />
@@ -588,6 +582,9 @@
     <ClCompile Include="..\source\world\level\levelgen\feature\SpringFeature.cpp" />
     <ClCompile Include="..\source\world\level\levelgen\feature\SpruceFeature.cpp" />
     <ClCompile Include="..\source\world\level\levelgen\feature\TreeFeature.cpp" />
+    <ClCompile Include="..\source\world\level\levelgen\synth\ImprovedNoise.cpp" />
+    <ClCompile Include="..\source\world\level\levelgen\synth\PerlinNoise.cpp" />
+    <ClCompile Include="..\source\world\level\levelgen\synth\Synth.cpp" />
     <ClCompile Include="..\source\world\level\LevelListener.cpp" />
     <ClCompile Include="..\source\world\level\Material.cpp" />
     <ClCompile Include="..\source\world\level\Region.cpp" />
@@ -612,6 +609,9 @@
     <ClCompile Include="..\source\world\particle\RedDustParticle.cpp" />
     <ClCompile Include="..\source\world\particle\SmokeParticle.cpp" />
     <ClCompile Include="..\source\world\particle\TerrainParticle.cpp" />
+    <ClCompile Include="..\source\world\phys\AABB.cpp" />
+    <ClCompile Include="..\source\world\phys\HitResult.cpp" />
+    <ClCompile Include="..\source\world\phys\Vec3.cpp" />
     <ClCompile Include="..\source\world\tile\BookshelfTile.cpp" />
     <ClCompile Include="..\source\world\tile\Bush.cpp" />
     <ClCompile Include="..\source\world\tile\ClayTile.cpp" />
diff --git a/windows_vs/minecraftcpp_vs2010.vcxproj.filters b/windows_vs/minecraftcpp_vs2010.vcxproj.filters
index 4efb9d9..d763526 100644
--- a/windows_vs/minecraftcpp_vs2010.vcxproj.filters
+++ b/windows_vs/minecraftcpp_vs2010.vcxproj.filters
@@ -16,7 +16,7 @@
     <Filter Include="source\world">
       <UniqueIdentifier>{d7db338f-b359-4720-a51e-f2eac0cc6967}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\client\common">
+    <Filter Include="source\common">
       <UniqueIdentifier>{9a0b909e-b8ec-44f1-b6de-74518cd5d0cd}</UniqueIdentifier>
     </Filter>
     <Filter Include="source\client\gui">
@@ -31,10 +31,10 @@
     <Filter Include="source\client\model">
       <UniqueIdentifier>{c3a8e592-56de-40c6-957b-bc22cb059e5d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\client\network">
+    <Filter Include="source\network">
       <UniqueIdentifier>{43af5a60-79b9-483d-b7a1-6afaa922d5c4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\client\network\packets">
+    <Filter Include="source\network\packets">
       <UniqueIdentifier>{ef5aef49-90c0-42ec-bb7b-f1819f9133ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="source\client\player">
@@ -97,6 +97,12 @@
     <Filter Include="thirdparty\zlib">
       <UniqueIdentifier>{b413cd08-238d-4e52-90c7-eccb86bc37ed}</UniqueIdentifier>
     </Filter>
+    <Filter Include="source\world\phys">
+      <UniqueIdentifier>{389f72f4-3246-4652-9649-30ac5f44eacb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source\world\level\levelgen\synth">
+      <UniqueIdentifier>{27845c14-dcd4-43b3-9087-cfb3a5c7d531}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\thirdparty\raknet\ThreadsafePacketLogger.h">
@@ -573,50 +579,32 @@
     <ClInclude Include="..\source\NinecraftApp.hpp">
       <Filter>source</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\AABB.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\CThread.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\CThread.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\LongHack.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\HitResult.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\Matrix.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\ImprovedNoise.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\Mth.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\LongHack.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\Options.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\Matrix.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\Random.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\Mth.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\Timer.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\Options.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\Util.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\PerlinNoise.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Random.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Synth.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Timer.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Util.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Utils.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\client\common\Vec3.hpp">
-      <Filter>source\client\common</Filter>
+    <ClInclude Include="..\source\common\Utils.hpp">
+      <Filter>source\common</Filter>
     </ClInclude>
     <ClInclude Include="..\source\client\gui\Gui.hpp">
       <Filter>source\client\gui</Filter>
@@ -705,26 +693,26 @@
     <ClInclude Include="..\source\client\model\Cube.hpp">
       <Filter>source\client\model</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\network\NetEventCallback.hpp">
-      <Filter>source\client\network</Filter>
+    <ClInclude Include="..\source\network\NetEventCallback.hpp">
+      <Filter>source\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\network\Packet.hpp">
-      <Filter>source\client\network</Filter>
+    <ClInclude Include="..\source\network\Packet.hpp">
+      <Filter>source\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\network\PingedCompatibleServer.hpp">
-      <Filter>source\client\network</Filter>
+    <ClInclude Include="..\source\network\PingedCompatibleServer.hpp">
+      <Filter>source\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\network\RakNetInstance.hpp">
-      <Filter>source\client\network</Filter>
+    <ClInclude Include="..\source\network\RakNetInstance.hpp">
+      <Filter>source\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\network\ServerSideNetworkHandler.hpp">
-      <Filter>source\client\network</Filter>
+    <ClInclude Include="..\source\network\ServerSideNetworkHandler.hpp">
+      <Filter>source\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\network\ClientSideNetworkHandler.hpp">
-      <Filter>source\client\network</Filter>
+    <ClInclude Include="..\source\network\ClientSideNetworkHandler.hpp">
+      <Filter>source\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\network\MinecraftPackets.hpp">
-      <Filter>source\client\network</Filter>
+    <ClInclude Include="..\source\network\MinecraftPackets.hpp">
+      <Filter>source\network</Filter>
     </ClInclude>
     <ClInclude Include="..\source\client\player\input\ControllerTurnInput.hpp">
       <Filter>source\client\player\input</Filter>
@@ -1161,6 +1149,24 @@
     <ClInclude Include="..\source\client\gui\screens\DeathScreen.hpp">
       <Filter>source\client\gui\screens</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\world\phys\AABB.hpp">
+      <Filter>source\world\phys</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\world\phys\Vec3.hpp">
+      <Filter>source\world\phys</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\world\phys\HitResult.hpp">
+      <Filter>source\world\phys</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\world\level\levelgen\synth\ImprovedNoise.hpp">
+      <Filter>source\world\level\levelgen\synth</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\world\level\levelgen\synth\Synth.hpp">
+      <Filter>source\world\level\levelgen\synth</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\world\level\levelgen\synth\PerlinNoise.hpp">
+      <Filter>source\world\level\levelgen\synth</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\thirdparty\raknet\TwoWayAuthentication.cpp">
@@ -1505,47 +1511,29 @@
     <ClCompile Include="..\source\NinecraftApp.cpp">
       <Filter>source</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\AABB.cpp">
-      <Filter>source\client\common</Filter>
+    <ClCompile Include="..\source\common\CThread.cpp">
+      <Filter>source\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\CThread.cpp">
-      <Filter>source\client\common</Filter>
+    <ClCompile Include="..\source\common\Matrix.cpp">
+      <Filter>source\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\HitResult.cpp">
-      <Filter>source\client\common</Filter>
+    <ClCompile Include="..\source\common\Mth.cpp">
+      <Filter>source\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\ImprovedNoise.cpp">
-      <Filter>source\client\common</Filter>
+    <ClCompile Include="..\source\common\Options.cpp">
+      <Filter>source\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\Matrix.cpp">
-      <Filter>source\client\common</Filter>
+    <ClCompile Include="..\source\common\Random.cpp">
+      <Filter>source\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\Mth.cpp">
-      <Filter>source\client\common</Filter>
+    <ClCompile Include="..\source\common\Timer.cpp">
+      <Filter>source\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\Options.cpp">
-      <Filter>source\client\common</Filter>
+    <ClCompile Include="..\source\common\Util.cpp">
+      <Filter>source\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\PerlinNoise.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Random.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Synth.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Timer.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Util.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Utils.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\client\common\Vec3.cpp">
-      <Filter>source\client\common</Filter>
+    <ClCompile Include="..\source\common\Utils.cpp">
+      <Filter>source\common</Filter>
     </ClCompile>
     <ClCompile Include="..\source\client\gui\Gui.cpp">
       <Filter>source\client\gui</Filter>
@@ -1634,56 +1622,56 @@
     <ClCompile Include="..\source\client\model\HumanoidModel.cpp">
       <Filter>source\client\model</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\NetEventCallback.cpp">
-      <Filter>source\client\network</Filter>
+    <ClCompile Include="..\source\network\NetEventCallback.cpp">
+      <Filter>source\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\RakNetInstance.cpp">
-      <Filter>source\client\network</Filter>
+    <ClCompile Include="..\source\network\RakNetInstance.cpp">
+      <Filter>source\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\ServerSideNetworkHandler.cpp">
-      <Filter>source\client\network</Filter>
+    <ClCompile Include="..\source\network\ServerSideNetworkHandler.cpp">
+      <Filter>source\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\ClientSideNetworkHandler.cpp">
-      <Filter>source\client\network</Filter>
+    <ClCompile Include="..\source\network\ClientSideNetworkHandler.cpp">
+      <Filter>source\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\MinecraftPackets.cpp">
-      <Filter>source\client\network</Filter>
+    <ClCompile Include="..\source\network\MinecraftPackets.cpp">
+      <Filter>source\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\PlaceBlockPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\PlaceBlockPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\PlayerEquipmentPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\PlayerEquipmentPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\RemoveBlockPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\RemoveBlockPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\RemoveEntityPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\RemoveEntityPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\RequestChunkPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\RequestChunkPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\StartGamePacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\StartGamePacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\UpdateBlockPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\UpdateBlockPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\AddPlayerPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\AddPlayerPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\ChunkDataPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\ChunkDataPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\LoginPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\LoginPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\MessagePacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\MessagePacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\MovePlayerPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\MovePlayerPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
     <ClCompile Include="..\source\client\player\input\ITurnInput.cpp">
       <Filter>source\client\player\input</Filter>
@@ -2183,12 +2171,30 @@
     <ClCompile Include="..\thirdparty\zlib\gzclose.c">
       <Filter>thirdparty\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\network\packets\LevelDataPacket.cpp">
-      <Filter>source\client\network\packets</Filter>
+    <ClCompile Include="..\source\network\packets\LevelDataPacket.cpp">
+      <Filter>source\network\packets</Filter>
     </ClCompile>
     <ClCompile Include="..\source\client\gui\screens\DeathScreen.cpp">
       <Filter>source\client\gui\screens</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\world\phys\Vec3.cpp">
+      <Filter>source\world\phys</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\world\phys\AABB.cpp">
+      <Filter>source\world\phys</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\world\phys\HitResult.cpp">
+      <Filter>source\world\phys</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\world\level\levelgen\synth\ImprovedNoise.cpp">
+      <Filter>source\world\level\levelgen\synth</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\world\level\levelgen\synth\PerlinNoise.cpp">
+      <Filter>source\world\level\levelgen\synth</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\world\level\levelgen\synth\Synth.cpp">
+      <Filter>source\world\level\levelgen\synth</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\thirdparty\raknet\CMakeLists.txt">