diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index fa0cd1acce2..1a6321c23e3 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,7 +1,8 @@
+add_subdirectory(shared)
 add_subdirectory(game)
+add_subdirectory(collision)
 if (DO_SCRIPTS)
    add_subdirectory(scripts)
 endif (DO_SCRIPTS)
-add_subdirectory(shared)
-add_subdirectory(worldserver)
 add_subdirectory(authserver)
+add_subdirectory(worldserver)
diff --git a/src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp
similarity index 100%
rename from src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp
rename to src/server/collision/BoundingIntervalHierarchy.cpp
diff --git a/src/server/game/CollisionDetection/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h
similarity index 100%
rename from src/server/game/CollisionDetection/BoundingIntervalHierarchy.h
rename to src/server/collision/BoundingIntervalHierarchy.h
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
new file mode 100644
index 00000000000..e30b9a2bf36
--- /dev/null
+++ b/src/server/collision/CMakeLists.txt
@@ -0,0 +1,29 @@
+
+########### next target ###############
+
+SET(collision_STAT_SRCS
+   BIH.h
+   BIH.cpp
+   Management/IVMapManager.h
+   Maps/MapTree.cpp
+   Maps/MapTree.h
+   Models/ModelInstance.cpp
+   Models/ModelInstance.h
+   Maps/TileAssembler.cpp
+   Maps/TileAssembler.h
+   VMapDefinitions.h
+   Management/VMapFactory.cpp
+   Management/VMapFactory.h
+   Management/VMapManager2.cpp
+   Management/VMapManager2.h
+   VMapTools.h
+   Models/WorldModel.cpp
+   Models/WorldModel.h
+)
+
+include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
+)
+
+add_library(collision STATIC ${collision_STAT_SRCS})
diff --git a/src/server/game/CollisionDetection/IVMapManager.h b/src/server/collision/Management/IVMapManager.h
similarity index 100%
rename from src/server/game/CollisionDetection/IVMapManager.h
rename to src/server/collision/Management/IVMapManager.h
diff --git a/src/server/game/CollisionDetection/VMapFactory.cpp b/src/server/collision/Management/VMapFactory.cpp
similarity index 100%
rename from src/server/game/CollisionDetection/VMapFactory.cpp
rename to src/server/collision/Management/VMapFactory.cpp
diff --git a/src/server/game/CollisionDetection/VMapFactory.h b/src/server/collision/Management/VMapFactory.h
similarity index 100%
rename from src/server/game/CollisionDetection/VMapFactory.h
rename to src/server/collision/Management/VMapFactory.h
diff --git a/src/server/game/CollisionDetection/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
similarity index 100%
rename from src/server/game/CollisionDetection/VMapManager2.cpp
rename to src/server/collision/Management/VMapManager2.cpp
diff --git a/src/server/game/CollisionDetection/VMapManager2.h b/src/server/collision/Management/VMapManager2.h
similarity index 100%
rename from src/server/game/CollisionDetection/VMapManager2.h
rename to src/server/collision/Management/VMapManager2.h
diff --git a/src/server/game/CollisionDetection/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
similarity index 100%
rename from src/server/game/CollisionDetection/MapTree.cpp
rename to src/server/collision/Maps/MapTree.cpp
diff --git a/src/server/game/CollisionDetection/MapTree.h b/src/server/collision/Maps/MapTree.h
similarity index 100%
rename from src/server/game/CollisionDetection/MapTree.h
rename to src/server/collision/Maps/MapTree.h
diff --git a/src/server/game/CollisionDetection/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp
similarity index 100%
rename from src/server/game/CollisionDetection/TileAssembler.cpp
rename to src/server/collision/Maps/TileAssembler.cpp
diff --git a/src/server/game/CollisionDetection/TileAssembler.h b/src/server/collision/Maps/TileAssembler.h
similarity index 100%
rename from src/server/game/CollisionDetection/TileAssembler.h
rename to src/server/collision/Maps/TileAssembler.h
diff --git a/src/server/game/CollisionDetection/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp
similarity index 100%
rename from src/server/game/CollisionDetection/ModelInstance.cpp
rename to src/server/collision/Models/ModelInstance.cpp
diff --git a/src/server/game/CollisionDetection/ModelInstance.h b/src/server/collision/Models/ModelInstance.h
similarity index 100%
rename from src/server/game/CollisionDetection/ModelInstance.h
rename to src/server/collision/Models/ModelInstance.h
diff --git a/src/server/game/CollisionDetection/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp
similarity index 100%
rename from src/server/game/CollisionDetection/WorldModel.cpp
rename to src/server/collision/Models/WorldModel.cpp
diff --git a/src/server/game/CollisionDetection/WorldModel.h b/src/server/collision/Models/WorldModel.h
similarity index 100%
rename from src/server/game/CollisionDetection/WorldModel.h
rename to src/server/collision/Models/WorldModel.h
diff --git a/src/server/game/CollisionDetection/VMapDefinitions.h b/src/server/collision/VMapDefinitions.h
similarity index 100%
rename from src/server/game/CollisionDetection/VMapDefinitions.h
rename to src/server/collision/VMapDefinitions.h
diff --git a/src/server/game/CollisionDetection/VMapTools.h b/src/server/collision/VMapTools.h
similarity index 100%
rename from src/server/game/CollisionDetection/VMapTools.h
rename to src/server/collision/VMapTools.h
diff --git a/src/server/game/CollisionDetection/CMakeLists.txt b/src/server/game/CollisionDetection/CMakeLists.txt
deleted file mode 100644
index 7d865d354e7..00000000000
--- a/src/server/game/CollisionDetection/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-########### next target ###############
-
-SET(vmaps_STAT_SRCS
-   BIH.h
-   BIH.cpp
-   IVMapManager.h
-   MapTree.cpp
-   MapTree.h
-   ModelInstance.cpp
-   ModelInstance.h
-   TileAssembler.cpp
-   TileAssembler.h
-   VMapDefinitions.h
-   VMapFactory.cpp
-   VMapFactory.h
-   VMapManager2.cpp
-   VMapManager2.h
-   VMapTools.h
-   WorldModel.cpp
-   WorldModel.h
-)
-
-include_directories(
-  ${ACE_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/src/server/framework
-  ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
-)
-
-add_library(vmaps STATIC ${vmaps_STAT_SRCS})