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/game/CollisionDetection/CMakeLists.txt b/src/server/collision/CMakeLists.txt
similarity index 100%
rename from src/server/game/CollisionDetection/CMakeLists.txt
rename to src/server/collision/CMakeLists.txt
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