diff --git a/source/client/renderer/Culler.hpp b/source/client/renderer/Culler.hpp
index 23d1c54..2e08df8 100644
--- a/source/client/renderer/Culler.hpp
+++ b/source/client/renderer/Culler.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "client/common/AABB.hpp"
+#include "world/phys/AABB.hpp"
 
 class Culler
 {
diff --git a/source/client/renderer/Frustum.hpp b/source/client/renderer/Frustum.hpp
index 918f8d8..8ff1c9d 100644
--- a/source/client/renderer/Frustum.hpp
+++ b/source/client/renderer/Frustum.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "client/common/Matrix.hpp"
-#include "client/common/AABB.hpp"
+#include "world/phys/AABB.hpp"
 
 class Frustum
 {
diff --git a/source/client/renderer/FrustumCuller.hpp b/source/client/renderer/FrustumCuller.hpp
index bf14f48..d775aba 100644
--- a/source/client/renderer/FrustumCuller.hpp
+++ b/source/client/renderer/FrustumCuller.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "client/common/Vec3.hpp"
+#include "world/phys/Vec3.hpp"
 #include "Culler.hpp"
 #include "Frustum.hpp"
 
diff --git a/source/client/renderer/entity/EntityRenderer.hpp b/source/client/renderer/entity/EntityRenderer.hpp
index 7e30500..295f597 100644
--- a/source/client/renderer/entity/EntityRenderer.hpp
+++ b/source/client/renderer/entity/EntityRenderer.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "client/common/AABB.hpp"
+#include "world/phys/AABB.hpp"
 #include "client/model/HumanoidModel.hpp"
 #include "client/renderer/Font.hpp"
 
diff --git a/source/world/entity/Entity.hpp b/source/world/entity/Entity.hpp
index 8c0f09a..dd558fe 100644
--- a/source/world/entity/Entity.hpp
+++ b/source/world/entity/Entity.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "client/common/AABB.hpp"
-#include "client/common/Vec3.hpp"
+#include "world/phys/Vec3.hpp"
+#include "world/phys/AABB.hpp"
 #include "world/level/Material.hpp"
 #include "world/tile/Tile.hpp"
 #include "world/item/ItemInstance.hpp"
diff --git a/source/world/level/Dimension.hpp b/source/world/level/Dimension.hpp
index 5b2ea14..0da57ae 100644
--- a/source/world/level/Dimension.hpp
+++ b/source/world/level/Dimension.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "client/common/Vec3.hpp"
+#include "world/phys/Vec3.hpp"
 #include "world/level/levelgen/biome/BiomeSource.hpp"
 #include "world/level/levelgen/chunk/ChunkSource.hpp"
 #include "Level.hpp"
diff --git a/source/world/level/levelgen/chunk/LevelChunk.hpp b/source/world/level/levelgen/chunk/LevelChunk.hpp
index a62f0f9..4854837 100644
--- a/source/world/level/levelgen/chunk/LevelChunk.hpp
+++ b/source/world/level/levelgen/chunk/LevelChunk.hpp
@@ -11,9 +11,9 @@
 #include <cstring>
 #include <vector>
 #include <algorithm>
-#include "client/common/AABB.hpp"
 #include "client/common/Utils.hpp"
 #include "client/renderer/LightLayer.hpp"
+#include "world/phys/AABB.hpp"
 
 class Level;
 class Entity;
diff --git a/source/world/level/storage/LevelData.hpp b/source/world/level/storage/LevelData.hpp
index 656d9b5..e3e230c 100644
--- a/source/world/level/storage/LevelData.hpp
+++ b/source/world/level/storage/LevelData.hpp
@@ -11,7 +11,7 @@
 #include <string>
 #include "BitStream.h"
 #include "client/common/Utils.hpp"
-#include "client/common/Vec3.hpp"
+#include "world/phys/Vec3.hpp"
 #include "world/item/Inventory.hpp"
 
 struct PlayerData
diff --git a/source/client/common/AABB.cpp b/source/world/phys/AABB.cpp
similarity index 100%
rename from source/client/common/AABB.cpp
rename to source/world/phys/AABB.cpp
diff --git a/source/client/common/AABB.hpp b/source/world/phys/AABB.hpp
similarity index 100%
rename from source/client/common/AABB.hpp
rename to source/world/phys/AABB.hpp
diff --git a/source/client/common/HitResult.cpp b/source/world/phys/HitResult.cpp
similarity index 100%
rename from source/client/common/HitResult.cpp
rename to source/world/phys/HitResult.cpp
diff --git a/source/client/common/HitResult.hpp b/source/world/phys/HitResult.hpp
similarity index 100%
rename from source/client/common/HitResult.hpp
rename to source/world/phys/HitResult.hpp
diff --git a/source/client/common/Vec3.cpp b/source/world/phys/Vec3.cpp
similarity index 100%
rename from source/client/common/Vec3.cpp
rename to source/world/phys/Vec3.cpp
diff --git a/source/client/common/Vec3.hpp b/source/world/phys/Vec3.hpp
similarity index 97%
rename from source/client/common/Vec3.hpp
rename to source/world/phys/Vec3.hpp
index 9f3f65d..4e962d5 100644
--- a/source/client/common/Vec3.hpp
+++ b/source/world/phys/Vec3.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Mth.hpp"
+#include "client/common/Mth.hpp"
 
 class Vec3
 {
diff --git a/source/world/tile/Tile.hpp b/source/world/tile/Tile.hpp
index 7313a82..86961c7 100644
--- a/source/world/tile/Tile.hpp
+++ b/source/world/tile/Tile.hpp
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "client/common/Random.hpp"
-#include "client/common/AABB.hpp"
+#include "world/phys/AABB.hpp"
 #include "world/level/storage/LevelSource.hpp"
 #include "world/level/Material.hpp"
 #include "world/entity/Entity.hpp"
diff --git a/windows_vs/minecraftcpp.vcxproj b/windows_vs/minecraftcpp.vcxproj
index a57badb..4b53cf4 100644
--- a/windows_vs/minecraftcpp.vcxproj
+++ b/windows_vs/minecraftcpp.vcxproj
@@ -34,9 +34,7 @@
     <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\LongHack.hpp" />
     <ClInclude Include="..\source\client\common\Matrix.hpp" />
     <ClInclude Include="..\source\client\common\Mth.hpp" />
@@ -45,7 +43,6 @@
     <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\client\gui\components\AvailableGamesList.hpp" />
     <ClInclude Include="..\source\client\gui\components\Button.hpp" />
     <ClInclude Include="..\source\client\gui\components\RolledSelectionList.hpp" />
@@ -178,6 +175,9 @@
     <ClInclude Include="..\source\world\level\TickNextTickData.hpp" />
     <ClInclude Include="..\source\world\particle\Particle.hpp" />
     <ClInclude Include="..\source\world\particle\ParticleEngine.hpp" />
+    <ClInclude Include="..\source\world\phys\AABB.hpp" />
+    <ClInclude Include="..\source\world\phys\HitResult.hpp" />
+    <ClInclude Include="..\source\world\phys\Vec3.hpp" />
     <ClInclude Include="..\source\world\tile\BookshelfTile.hpp" />
     <ClInclude Include="..\source\world\tile\Bush.hpp" />
     <ClInclude Include="..\source\world\tile\ClayTile.hpp" />
@@ -390,9 +390,7 @@
     <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\Matrix.cpp" />
     <ClCompile Include="..\source\client\common\Mth.cpp" />
     <ClCompile Include="..\source\client\common\Options.cpp" />
@@ -400,7 +398,6 @@
     <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\client\gui\components\AvailableGamesList.cpp" />
     <ClCompile Include="..\source\client\gui\components\Button.cpp" />
     <ClCompile Include="..\source\client\gui\components\RolledSelectionList.cpp" />
@@ -561,6 +558,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.vcxproj.filters b/windows_vs/minecraftcpp.vcxproj.filters
index 78adf92..6695208 100644
--- a/windows_vs/minecraftcpp.vcxproj.filters
+++ b/windows_vs/minecraftcpp.vcxproj.filters
@@ -100,6 +100,9 @@
     <Filter Include="source\world\level\levelgen\synth">
       <UniqueIdentifier>{4bd8c4f7-8db0-4fa2-b674-5cab5bad2d0d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="source\world\phys">
+      <UniqueIdentifier>{235360f7-6b7c-4029-afef-fd6b9898df39}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\thirdparty\raknet\ThreadsafePacketLogger.h">
@@ -576,15 +579,9 @@
     <ClInclude Include="..\source\NinecraftApp.hpp">
       <Filter>source</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\AABB.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\client\common\CThread.hpp">
       <Filter>source\client\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\client\common\HitResult.hpp">
-      <Filter>source\client\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\client\common\LongHack.hpp">
       <Filter>source\client\common</Filter>
     </ClInclude>
@@ -609,9 +606,6 @@
     <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>
     <ClInclude Include="..\source\client\gui\Gui.hpp">
       <Filter>source\client\gui</Filter>
     </ClInclude>
@@ -1164,6 +1158,15 @@
     <ClInclude Include="..\source\world\level\levelgen\synth\Synth.hpp">
       <Filter>source\world\level\levelgen\synth</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\world\phys\AABB.hpp">
+      <Filter>source\world\phys</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\world\phys\HitResult.hpp">
+      <Filter>source\world\phys</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\world\phys\Vec3.hpp">
+      <Filter>source\world\phys</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\thirdparty\raknet\TwoWayAuthentication.cpp">
@@ -1508,15 +1511,9 @@
     <ClCompile Include="..\source\NinecraftApp.cpp">
       <Filter>source</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\AABB.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\client\common\CThread.cpp">
       <Filter>source\client\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\client\common\HitResult.cpp">
-      <Filter>source\client\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\client\common\Matrix.cpp">
       <Filter>source\client\common</Filter>
     </ClCompile>
@@ -1538,9 +1535,6 @@
     <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>
     <ClCompile Include="..\source\client\gui\Gui.cpp">
       <Filter>source\client\gui</Filter>
     </ClCompile>
@@ -2192,6 +2186,15 @@
     <ClCompile Include="..\source\world\level\levelgen\synth\ImprovedNoise.cpp">
       <Filter>source\world\level\levelgen\synth</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\world\phys\AABB.cpp">
+      <Filter>source\world\phys</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\world\phys\Vec3.cpp">
+      <Filter>source\world\phys</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\world\phys\HitResult.cpp">
+      <Filter>source\world\phys</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\thirdparty\raknet\CMakeLists.txt">