diff --git a/src/server/shared/vmap/BIH.cpp b/src/server/game/CollisionDetection/BIH.cpp similarity index 100% rename from src/server/shared/vmap/BIH.cpp rename to src/server/game/CollisionDetection/BIH.cpp diff --git a/src/server/shared/vmap/BIH.h b/src/server/game/CollisionDetection/BIH.h similarity index 100% rename from src/server/shared/vmap/BIH.h rename to src/server/game/CollisionDetection/BIH.h diff --git a/src/server/shared/vmap/CMakeLists.txt b/src/server/game/CollisionDetection/CMakeLists.txt similarity index 100% rename from src/server/shared/vmap/CMakeLists.txt rename to src/server/game/CollisionDetection/CMakeLists.txt diff --git a/src/server/shared/vmap/IVMapManager.h b/src/server/game/CollisionDetection/IVMapManager.h similarity index 100% rename from src/server/shared/vmap/IVMapManager.h rename to src/server/game/CollisionDetection/IVMapManager.h diff --git a/src/server/shared/vmap/MapTree.cpp b/src/server/game/CollisionDetection/MapTree.cpp similarity index 100% rename from src/server/shared/vmap/MapTree.cpp rename to src/server/game/CollisionDetection/MapTree.cpp diff --git a/src/server/shared/vmap/MapTree.h b/src/server/game/CollisionDetection/MapTree.h similarity index 100% rename from src/server/shared/vmap/MapTree.h rename to src/server/game/CollisionDetection/MapTree.h diff --git a/src/server/shared/vmap/ModelInstance.cpp b/src/server/game/CollisionDetection/ModelInstance.cpp similarity index 100% rename from src/server/shared/vmap/ModelInstance.cpp rename to src/server/game/CollisionDetection/ModelInstance.cpp diff --git a/src/server/shared/vmap/ModelInstance.h b/src/server/game/CollisionDetection/ModelInstance.h similarity index 100% rename from src/server/shared/vmap/ModelInstance.h rename to src/server/game/CollisionDetection/ModelInstance.h diff --git a/src/server/shared/vmap/TileAssembler.cpp b/src/server/game/CollisionDetection/TileAssembler.cpp similarity index 100% rename from src/server/shared/vmap/TileAssembler.cpp rename to src/server/game/CollisionDetection/TileAssembler.cpp diff --git a/src/server/shared/vmap/TileAssembler.h b/src/server/game/CollisionDetection/TileAssembler.h similarity index 100% rename from src/server/shared/vmap/TileAssembler.h rename to src/server/game/CollisionDetection/TileAssembler.h diff --git a/src/server/shared/vmap/VMapDefinitions.h b/src/server/game/CollisionDetection/VMapDefinitions.h similarity index 100% rename from src/server/shared/vmap/VMapDefinitions.h rename to src/server/game/CollisionDetection/VMapDefinitions.h diff --git a/src/server/shared/vmap/VMapFactory.cpp b/src/server/game/CollisionDetection/VMapFactory.cpp similarity index 100% rename from src/server/shared/vmap/VMapFactory.cpp rename to src/server/game/CollisionDetection/VMapFactory.cpp diff --git a/src/server/shared/vmap/VMapFactory.h b/src/server/game/CollisionDetection/VMapFactory.h similarity index 100% rename from src/server/shared/vmap/VMapFactory.h rename to src/server/game/CollisionDetection/VMapFactory.h diff --git a/src/server/shared/vmap/VMapManager2.cpp b/src/server/game/CollisionDetection/VMapManager2.cpp similarity index 100% rename from src/server/shared/vmap/VMapManager2.cpp rename to src/server/game/CollisionDetection/VMapManager2.cpp diff --git a/src/server/shared/vmap/VMapManager2.h b/src/server/game/CollisionDetection/VMapManager2.h similarity index 100% rename from src/server/shared/vmap/VMapManager2.h rename to src/server/game/CollisionDetection/VMapManager2.h diff --git a/src/server/shared/vmap/VMapTools.h b/src/server/game/CollisionDetection/VMapTools.h similarity index 100% rename from src/server/shared/vmap/VMapTools.h rename to src/server/game/CollisionDetection/VMapTools.h diff --git a/src/server/shared/vmap/WorldModel.cpp b/src/server/game/CollisionDetection/WorldModel.cpp similarity index 100% rename from src/server/shared/vmap/WorldModel.cpp rename to src/server/game/CollisionDetection/WorldModel.cpp diff --git a/src/server/shared/vmap/WorldModel.h b/src/server/game/CollisionDetection/WorldModel.h similarity index 100% rename from src/server/shared/vmap/WorldModel.h rename to src/server/game/CollisionDetection/WorldModel.h