87 files changed, 6 insertions, 6 deletions
diff --git a/src/Camera.cpp b/src/core/Camera.cpp
index d7ee398b..660be333 100644
--- a/src/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -8,7 +8,7 @@
 #include "PlayerPed.h"
 #include "Pad.h"
 #include "General.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "SurfaceTable.h"
 #include "MBlur.h"
 #include "Camera.h"
diff --git a/src/Camera.h b/src/core/Camera.h
index 84c3060b..84c3060b 100644
--- a/src/Camera.h
+++ b/src/core/Camera.h
diff --git a/src/CdStream.cpp b/src/core/CdStream.cpp
index 255e46bb..255e46bb 100644
--- a/src/CdStream.cpp
+++ b/src/core/CdStream.cpp
diff --git a/src/CdStream.h b/src/core/CdStream.h
index 55507aa8..55507aa8 100644
--- a/src/CdStream.h
+++ b/src/core/CdStream.h
diff --git a/src/Clock.cpp b/src/core/Clock.cpp
index 707b0e57..707b0e57 100644
--- a/src/Clock.cpp
+++ b/src/core/Clock.cpp
diff --git a/src/Clock.h b/src/core/Clock.h
index e11b2293..e11b2293 100644
--- a/src/Clock.h
+++ b/src/core/Clock.h
diff --git a/src/Collision.cpp b/src/core/Collision.cpp
index 62b27eff..d15ccca5 100644
--- a/src/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -5,7 +5,7 @@
 #include "Game.h"
 #include "Zones.h"
 #include "General.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "World.h"
 #include "Entity.h"
 #include "Train.h"
diff --git a/src/Collision.h b/src/core/Collision.h
index 5a9058d3..5a9058d3 100644
--- a/src/Collision.h
+++ b/src/core/Collision.h
diff --git a/src/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index d7567ac4..d7567ac4 100644
--- a/src/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
diff --git a/src/ControllerConfig.h b/src/core/ControllerConfig.h
index 581efe05..581efe05 100644
--- a/src/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
diff --git a/src/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp
index 744ef53d..744ef53d 100644
--- a/src/CutsceneMgr.cpp
+++ b/src/core/CutsceneMgr.cpp
diff --git a/src/CutsceneMgr.h b/src/core/CutsceneMgr.h
index 89f6ab8d..89f6ab8d 100644
--- a/src/CutsceneMgr.h
+++ b/src/core/CutsceneMgr.h
diff --git a/src/Directory.cpp b/src/core/Directory.cpp
index 3e0d5382..3e0d5382 100644
--- a/src/Directory.cpp
+++ b/src/core/Directory.cpp
diff --git a/src/Directory.h b/src/core/Directory.h
index 06e6bba4..06e6bba4 100644
--- a/src/Directory.h
+++ b/src/core/Directory.h
diff --git a/src/FileLoader.cpp b/src/core/FileLoader.cpp
index d87964ac..fdc3b9d7 100644
--- a/src/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -21,7 +21,7 @@
 #include "DummyObject.h"
 #include "World.h"
 #include "Zones.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "CdStream.h"
 #include "FileLoader.h"
 
diff --git a/src/FileLoader.h b/src/core/FileLoader.h
index f9121ace..f9121ace 100644
--- a/src/FileLoader.h
+++ b/src/core/FileLoader.h
diff --git a/src/FileMgr.cpp b/src/core/FileMgr.cpp
index 954fcdef..954fcdef 100644
--- a/src/FileMgr.cpp
+++ b/src/core/FileMgr.cpp
diff --git a/src/FileMgr.h b/src/core/FileMgr.h
index bab86e38..bab86e38 100644
--- a/src/FileMgr.h
+++ b/src/core/FileMgr.h
diff --git a/src/Fire.cpp b/src/core/Fire.cpp
index 05d72199..05d72199 100644
--- a/src/Fire.cpp
+++ b/src/core/Fire.cpp
diff --git a/src/Fire.h b/src/core/Fire.h
index c7f83fd8..c7f83fd8 100644
--- a/src/Fire.h
+++ b/src/core/Fire.h
diff --git a/src/Frontend.cpp b/src/core/Frontend.cpp
index fdb2420b..fdb2420b 100644
--- a/src/Frontend.cpp
+++ b/src/core/Frontend.cpp
diff --git a/src/Frontend.h b/src/core/Frontend.h
index 9b9377da..9b9377da 100644
--- a/src/Frontend.h
+++ b/src/core/Frontend.h
diff --git a/src/Game.cpp b/src/core/Game.cpp
index cbd55c48..cbd55c48 100644
--- a/src/Game.cpp
+++ b/src/core/Game.cpp
diff --git a/src/Game.h b/src/core/Game.h
index 3bc3e633..3bc3e633 100644
--- a/src/Game.h
+++ b/src/core/Game.h
diff --git a/src/General.h b/src/core/General.h
index cae1caa0..cae1caa0 100644
--- a/src/General.h
+++ b/src/core/General.h
diff --git a/src/Lists.cpp b/src/core/Lists.cpp
index 448a0ff1..448a0ff1 100644
--- a/src/Lists.cpp
+++ b/src/core/Lists.cpp
diff --git a/src/Lists.h b/src/core/Lists.h
index 7572e882..7572e882 100644
--- a/src/Lists.h
+++ b/src/core/Lists.h
diff --git a/src/MenuScreens.h b/src/core/MenuScreens.h
index 2da81f1d..2da81f1d 100644
--- a/src/MenuScreens.h
+++ b/src/core/MenuScreens.h
diff --git a/src/Messages.cpp b/src/core/Messages.cpp
index 7fc23593..7fc23593 100644
--- a/src/Messages.cpp
+++ b/src/core/Messages.cpp
diff --git a/src/Messages.h b/src/core/Messages.h
index 69cf117c..69cf117c 100644
--- a/src/Messages.h
+++ b/src/core/Messages.h
diff --git a/src/NodeName.cpp b/src/core/NodeName.cpp
index 2aea3c83..2aea3c83 100644
--- a/src/NodeName.cpp
+++ b/src/core/NodeName.cpp
diff --git a/src/NodeName.h b/src/core/NodeName.h
index 1a3e057b..1a3e057b 100644
--- a/src/NodeName.h
+++ b/src/core/NodeName.h
diff --git a/src/PCSave.cpp b/src/core/PCSave.cpp
index 628e1218..628e1218 100644
--- a/src/PCSave.cpp
+++ b/src/core/PCSave.cpp
diff --git a/src/PCSave.h b/src/core/PCSave.h
index 696e158a..696e158a 100644
--- a/src/PCSave.h
+++ b/src/core/PCSave.h
diff --git a/src/Pad.cpp b/src/core/Pad.cpp
index 002e7180..002e7180 100644
--- a/src/Pad.cpp
+++ b/src/core/Pad.cpp
diff --git a/src/Pad.h b/src/core/Pad.h
index 30cdb8df..30cdb8df 100644
--- a/src/Pad.h
+++ b/src/core/Pad.h
diff --git a/src/Placeable.cpp b/src/core/Placeable.cpp
index b4b2a37b..b4b2a37b 100644
--- a/src/Placeable.cpp
+++ b/src/core/Placeable.cpp
diff --git a/src/Placeable.h b/src/core/Placeable.h
index 868ca9e7..868ca9e7 100644
--- a/src/Placeable.h
+++ b/src/core/Placeable.h
diff --git a/src/entities/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index 59efe2ae..59efe2ae 100644
--- a/src/entities/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
diff --git a/src/entities/PlayerInfo.h b/src/core/PlayerInfo.h
index e2b42fe7..e2b42fe7 100644
--- a/src/entities/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
diff --git a/src/entities/PlayerSkin.cpp b/src/core/PlayerSkin.cpp
index 1c9ca2c6..1c9ca2c6 100644
--- a/src/entities/PlayerSkin.cpp
+++ b/src/core/PlayerSkin.cpp
diff --git a/src/entities/PlayerSkin.h b/src/core/PlayerSkin.h
index 61e09cdf..61e09cdf 100644
--- a/src/entities/PlayerSkin.h
+++ b/src/core/PlayerSkin.h
diff --git a/src/Pools.cpp b/src/core/Pools.cpp
index f7f93292..f7f93292 100644
--- a/src/Pools.cpp
+++ b/src/core/Pools.cpp
diff --git a/src/Pools.h b/src/core/Pools.h
index 3496064c..3496064c 100644
--- a/src/Pools.h
+++ b/src/core/Pools.h
diff --git a/src/Radar.cpp b/src/core/Radar.cpp
index a071b96b..a071b96b 100644
--- a/src/Radar.cpp
+++ b/src/core/Radar.cpp
diff --git a/src/Radar.h b/src/core/Radar.h
index e5396a50..e5396a50 100644
--- a/src/Radar.h
+++ b/src/core/Radar.h
diff --git a/src/References.cpp b/src/core/References.cpp
index e87f0fd5..e87f0fd5 100644
--- a/src/References.cpp
+++ b/src/core/References.cpp
diff --git a/src/References.h b/src/core/References.h
index 6476e243..6476e243 100644
--- a/src/References.h
+++ b/src/core/References.h
diff --git a/src/RwClumpRead.cpp b/src/core/RwClumpRead.cpp
index c9f027e7..c9f027e7 100644
--- a/src/RwClumpRead.cpp
+++ b/src/core/RwClumpRead.cpp
diff --git a/src/RwHelper.cpp b/src/core/RwHelper.cpp
index 8dade266..8dade266 100644
--- a/src/RwHelper.cpp
+++ b/src/core/RwHelper.cpp
diff --git a/src/RwHelper.h b/src/core/RwHelper.h
index ef20467d..ef20467d 100644
--- a/src/RwHelper.h
+++ b/src/core/RwHelper.h
diff --git a/src/RwMatFX.cpp b/src/core/RwMatFX.cpp
index 5fd00c54..5fd00c54 100644
--- a/src/RwMatFX.cpp
+++ b/src/core/RwMatFX.cpp
diff --git a/src/RwTexRead.cpp b/src/core/RwTexRead.cpp
index a1a7050a..a1a7050a 100644
--- a/src/RwTexRead.cpp
+++ b/src/core/RwTexRead.cpp
diff --git a/src/Stats.cpp b/src/core/Stats.cpp
index 3c5b55e4..3c5b55e4 100644
--- a/src/Stats.cpp
+++ b/src/core/Stats.cpp
diff --git a/src/Stats.h b/src/core/Stats.h
index 39b0e184..39b0e184 100644
--- a/src/Stats.h
+++ b/src/core/Stats.h
diff --git a/src/Streaming.cpp b/src/core/Streaming.cpp
index 08fd80f0..f8ab19d4 100644
--- a/src/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -16,7 +16,7 @@
 #include "FileMgr.h"
 #include "FileLoader.h"
 #include "Zones.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "Radar.h"
 #include "Camera.h"
 #include "Record.h"
diff --git a/src/Streaming.h b/src/core/Streaming.h
index 212a6d71..212a6d71 100644
--- a/src/Streaming.h
+++ b/src/core/Streaming.h
diff --git a/src/SurfaceTable.cpp b/src/core/SurfaceTable.cpp
index 2ba884b1..2ba884b1 100644
--- a/src/SurfaceTable.cpp
+++ b/src/core/SurfaceTable.cpp
diff --git a/src/SurfaceTable.h b/src/core/SurfaceTable.h
index e1882e69..e1882e69 100644
--- a/src/SurfaceTable.h
+++ b/src/core/SurfaceTable.h
diff --git a/src/TempColModels.cpp b/src/core/TempColModels.cpp
index a323d7c9..a323d7c9 100644
--- a/src/TempColModels.cpp
+++ b/src/core/TempColModels.cpp
diff --git a/src/TempColModels.h b/src/core/TempColModels.h
index 8ac74428..8ac74428 100644
--- a/src/TempColModels.h
+++ b/src/core/TempColModels.h
diff --git a/src/Text.cpp b/src/core/Text.cpp
index d7d63467..d7d63467 100644
--- a/src/Text.cpp
+++ b/src/core/Text.cpp
diff --git a/src/Text.h b/src/core/Text.h
index 2592e6b8..2592e6b8 100644
--- a/src/Text.h
+++ b/src/core/Text.h
diff --git a/src/Timer.cpp b/src/core/Timer.cpp
index 543f582b..543f582b 100644
--- a/src/Timer.cpp
+++ b/src/core/Timer.cpp
diff --git a/src/Timer.h b/src/core/Timer.h
index 9e6d447e..9e6d447e 100644
--- a/src/Timer.h
+++ b/src/core/Timer.h
diff --git a/src/TxdStore.cpp b/src/core/TxdStore.cpp
index 5085c7e4..5085c7e4 100644
--- a/src/TxdStore.cpp
+++ b/src/core/TxdStore.cpp
diff --git a/src/TxdStore.h b/src/core/TxdStore.h
index a9e57d31..a9e57d31 100644
--- a/src/TxdStore.h
+++ b/src/core/TxdStore.h
diff --git a/src/User.cpp b/src/core/User.cpp
index c9cb97cc..c9cb97cc 100644
--- a/src/User.cpp
+++ b/src/core/User.cpp
diff --git a/src/User.h b/src/core/User.h
index 8b744c7e..8b744c7e 100644
--- a/src/User.h
+++ b/src/core/User.h
diff --git a/src/Wanted.cpp b/src/core/Wanted.cpp
index ece68e64..ece68e64 100644
--- a/src/Wanted.cpp
+++ b/src/core/Wanted.cpp
diff --git a/src/Wanted.h b/src/core/Wanted.h
index aafa9ac0..aafa9ac0 100644
--- a/src/Wanted.h
+++ b/src/core/Wanted.h
diff --git a/src/World.cpp b/src/core/World.cpp
index 538e15c5..538e15c5 100644
--- a/src/World.cpp
+++ b/src/core/World.cpp
diff --git a/src/World.h b/src/core/World.h
index 3b7090da..3b7090da 100644
--- a/src/World.h
+++ b/src/core/World.h
diff --git a/src/CullZones.cpp b/src/core/ZoneCull.cpp
index 6155ae57..90155bcf 100644
--- a/src/CullZones.cpp
+++ b/src/core/ZoneCull.cpp
@@ -8,7 +8,7 @@
 #include "Camera.h"
 #include "World.h"
 #include "FileMgr.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 
 int32     &CCullZones::NumCullZones = *(int*)0x8F2564;
 CCullZone *CCullZones::aZones = (CCullZone*)0x864750;	// [NUMCULLZONES];
diff --git a/src/CullZones.h b/src/core/ZoneCull.h
index 5b04b4f9..5b04b4f9 100644
--- a/src/CullZones.h
+++ b/src/core/ZoneCull.h
diff --git a/src/Zones.cpp b/src/core/Zones.cpp
index 363fc3d9..363fc3d9 100644
--- a/src/Zones.cpp
+++ b/src/core/Zones.cpp
diff --git a/src/Zones.h b/src/core/Zones.h
index bf3957de..bf3957de 100644
--- a/src/Zones.h
+++ b/src/core/Zones.h
diff --git a/src/common.h b/src/core/common.h
index 79626acb..79626acb 100644
--- a/src/common.h
+++ b/src/core/common.h
diff --git a/src/config.h b/src/core/config.h
index 8cb02190..8cb02190 100644
--- a/src/config.h
+++ b/src/core/config.h
diff --git a/src/debugmenu_public.h b/src/core/debugmenu_public.h
index 778e7afe..778e7afe 100644
--- a/src/debugmenu_public.h
+++ b/src/core/debugmenu_public.h
diff --git a/src/main.cpp b/src/core/main.cpp
index 2835f396..e7f42780 100644
--- a/src/main.cpp
+++ b/src/core/main.cpp
@@ -40,7 +40,7 @@
 #include "CutsceneMgr.h"
 #include "Lights.h"
 #include "Credits.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "Timecycle.h"
 #include "TxdStore.h"
 #include "FileMgr.h"
diff --git a/src/main.h b/src/core/main.h
index bdb0e008..bdb0e008 100644
--- a/src/main.h
+++ b/src/core/main.h
diff --git a/src/patcher.cpp b/src/core/patcher.cpp
index 5fdbdf8b..5fdbdf8b 100644
--- a/src/patcher.cpp
+++ b/src/core/patcher.cpp
diff --git a/src/patcher.h b/src/core/patcher.h
index 87a6bea4..87a6bea4 100644
--- a/src/patcher.h
+++ b/src/core/patcher.h
diff --git a/src/re3.cpp b/src/core/re3.cpp
index 9dc39d46..9dc39d46 100644
--- a/src/re3.cpp
+++ b/src/core/re3.cpp
diff --git a/src/rw.cpp b/src/core/rw.cpp
index 52bcf5bb..52bcf5bb 100644
--- a/src/rw.cpp
+++ b/src/core/rw.cpp
diff --git a/src/templates.h b/src/core/templates.h
index ef2db33a..ef2db33a 100644
--- a/src/templates.h
+++ b/src/core/templates.h