diff --git a/TR5Main/Game/Box.h b/TR5Main/Game/Box.h
index 17b1c7eec..a873adc21 100644
--- a/TR5Main/Game/Box.h
+++ b/TR5Main/Game/Box.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 #include "level.h"
 
diff --git a/TR5Main/Game/Lara/lara_flare.cpp b/TR5Main/Game/Lara/lara_flare.cpp
index 0f074776e..a343c53f6 100644
--- a/TR5Main/Game/Lara/lara_flare.cpp
+++ b/TR5Main/Game/Lara/lara_flare.cpp
@@ -11,7 +11,7 @@
 #include "collide.h"
 #include "effects\effects.h"
 #include "effects\chaffFX.h"
-#include "prng.h"
+#include "Specific\prng.h"
 
 constexpr std::array<float, 28> FlareFlickerTable = { 0.7590,0.9880,0.8790,0.920,0.8020,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.84642,0.7896,0.817634,0.923424,0.7589,0.81399,0.92834,0.9978,0.7610,0.97878,0.8978,0.9983,0.934763,0.8485,0.762573,0.74642 };
 constexpr DirectX::SimpleMath::Vector3 FlareMainColor = Vector3(1,0.52947, 0.3921);
diff --git a/TR5Main/Game/Lara/lara_objects.cpp b/TR5Main/Game/Lara/lara_objects.cpp
index 6fd4721e9..6230c0034 100644
--- a/TR5Main/Game/Lara/lara_objects.cpp
+++ b/TR5Main/Game/Lara/lara_objects.cpp
@@ -8,7 +8,7 @@
 #include "camera.h"
 #include "collide.h"
 #include "control.h"
-#include "prng.h"
+#include "Specific\prng.h"
 /*This file has "all" lara_as/lara_col functions where Lara is interacting with an object.*/
 
 /*pickups*/
diff --git a/TR5Main/Game/Lara/lara_one_gun.h b/TR5Main/Game/Lara/lara_one_gun.h
index b1a6cc18b..a41f331cd 100644
--- a/TR5Main/Game/Lara/lara_one_gun.h
+++ b/TR5Main/Game/Lara/lara_one_gun.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "items.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 enum GRENADE_TYPE
 {
diff --git a/TR5Main/Game/Lara/lara_struct.h b/TR5Main/Game/Lara/lara_struct.h
index b8e1fcc07..a938df9a4 100644
--- a/TR5Main/Game/Lara/lara_struct.h
+++ b/TR5Main/Game/Lara/lara_struct.h
@@ -3,7 +3,7 @@
 #include "collide.h"
 #include "effects\effects.h"
 #include "objectslist.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "Renderer11.h"
 
 #define NUM_PUZZLES	(ID_PUZZLE_ITEM16 - ID_PUZZLE_ITEM1 + 1)
diff --git a/TR5Main/Game/Lara/lara_two_guns.cpp b/TR5Main/Game/Lara/lara_two_guns.cpp
index e77dc222a..2f0559b88 100644
--- a/TR5Main/Game/Lara/lara_two_guns.cpp
+++ b/TR5Main/Game/Lara/lara_two_guns.cpp
@@ -11,7 +11,7 @@
 #include "input.h"
 #include "Sound\sound.h"
 #include "savegame.h"
-#include "prng.h"
+#include "Specific\prng.h"
 using namespace TEN::Math::Random;
 struct PISTOL_DEF
 {
diff --git a/TR5Main/Game/box.cpp b/TR5Main/Game/box.cpp
index ffc22a734..2c433b860 100644
--- a/TR5Main/Game/box.cpp
+++ b/TR5Main/Game/box.cpp
@@ -9,7 +9,7 @@
 #include "camera.h"
 #include "control.h"
 #include "setup.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "objectslist.h"
 
 #define CHECK_CLICK(x) CLICK(x) / 2
diff --git a/TR5Main/Game/camera.h b/TR5Main/Game/camera.h
index 1b21b6251..453b54214 100644
--- a/TR5Main/Game/camera.h
+++ b/TR5Main/Game/camera.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 #include <Specific\setup.h>
 
diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp
index 6a37f609a..015efe56d 100644
--- a/TR5Main/Game/collide.cpp
+++ b/TR5Main/Game/collide.cpp
@@ -9,8 +9,8 @@
 #include "misc.h"
 #include "setup.h"
 #include "Sound\sound.h"
-#include "trmath.h"
-#include "prng.h"
+#include "Specific\trmath.h"
+#include "Specific\prng.h"
 #include "room.h"
 
 using std::vector;
diff --git a/TR5Main/Game/collide.h b/TR5Main/Game/collide.h
index 1e4d2755a..6e833963a 100644
--- a/TR5Main/Game/collide.h
+++ b/TR5Main/Game/collide.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "level.h"
 
 // used by coll->badPos
diff --git a/TR5Main/Game/control.cpp b/TR5Main/Game/control.cpp
index bd4144a13..dd4111b72 100644
--- a/TR5Main/Game/control.cpp
+++ b/TR5Main/Game/control.cpp
@@ -48,7 +48,7 @@
 #include "tr4_littlebeetle.h"
 #include "particle/SimpleParticle.h"
 #include <process.h>
-#include "prng.h"
+#include "Specific\prng.h"
 #include <Game/Lara/lara_one_gun.h>
 #include <Game/Lara/lara_climb.h>
 #include "generic_switch.h"
diff --git a/TR5Main/Game/control.h b/TR5Main/Game/control.h
index 3081b5408..a34b975d3 100644
--- a/TR5Main/Game/control.h
+++ b/TR5Main/Game/control.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 #include "room.h"
 #include "control\trigger.h"
diff --git a/TR5Main/Game/door.cpp b/TR5Main/Game/door.cpp
index de3aa6685..0fe0f2808 100644
--- a/TR5Main/Game/door.cpp
+++ b/TR5Main/Game/door.cpp
@@ -16,7 +16,7 @@
 #include "level.h"
 #include "input.h"
 #include "Sound\sound.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "cog_switch.h"
 #include "generic_switch.h"
 #include "pickup\pickup.h"
diff --git a/TR5Main/Game/effects/bubble.cpp b/TR5Main/Game/effects/bubble.cpp
index 9d6f9d3e4..f3d9ca334 100644
--- a/TR5Main/Game/effects/bubble.cpp
+++ b/TR5Main/Game/effects/bubble.cpp
@@ -2,10 +2,10 @@
 #include "effects\bubble.h"
 #include "level.h"
 #include "control.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "objectslist.h"
 #include "setup.h"
-#include "prng.h"
+#include "Specific\prng.h"
 using std::vector;
 using namespace TEN::Math::Random;
 extern vector<BUBBLE_STRUCT> Bubbles = vector<BUBBLE_STRUCT>(MAX_BUBBLES);
diff --git a/TR5Main/Game/effects/chaffFX.cpp b/TR5Main/Game/effects/chaffFX.cpp
index f27bbcfaa..213672948 100644
--- a/TR5Main/Game/effects/chaffFX.cpp
+++ b/TR5Main/Game/effects/chaffFX.cpp
@@ -8,7 +8,7 @@
 #include "level.h"
 #include "smoke.h"
 #include "spark.h"
-#include "prng.h"
+#include "Specific\prng.h"
 #define	MAX_TRIGGER_RANGE	0x4000
 using namespace TEN::Math::Random;
 
diff --git a/TR5Main/Game/effects/chaffFX.h b/TR5Main/Game/effects/chaffFX.h
index fd4ff826c..4e01e432a 100644
--- a/TR5Main/Game/effects/chaffFX.h
+++ b/TR5Main/Game/effects/chaffFX.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 
 void TriggerChaffEffects(int age);
diff --git a/TR5Main/Game/effects/debris.cpp b/TR5Main/Game/effects/debris.cpp
index ee2cf6591..1fd714380 100644
--- a/TR5Main/Game/effects/debris.cpp
+++ b/TR5Main/Game/effects/debris.cpp
@@ -3,8 +3,8 @@
 #include "level.h"
 #include "setup.h"
 #include "control.h"
-#include "trmath.h"
-#include "prng.h"
+#include "Specific\trmath.h"
+#include "Specific\prng.h"
 
 using std::vector;
 using namespace TEN::Renderer;
diff --git a/TR5Main/Game/effects/drip.cpp b/TR5Main/Game/effects/drip.cpp
index 4084462bf..f9f0fc147 100644
--- a/TR5Main/Game/effects/drip.cpp
+++ b/TR5Main/Game/effects/drip.cpp
@@ -5,10 +5,10 @@
 #include "control.h"
 #include "level.h"
 #include "room.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "effects\effects.h"
 #include "setup.h"
-#include "prng.h"
+#include "Specific\prng.h"
 using namespace TEN::Math::Random;
 namespace TEN {
 	namespace Effects {
diff --git a/TR5Main/Game/effects/effects.cpp b/TR5Main/Game/effects/effects.cpp
index 4db82a8ef..2799e5d3c 100644
--- a/TR5Main/Game/effects/effects.cpp
+++ b/TR5Main/Game/effects/effects.cpp
@@ -4,7 +4,7 @@
 #include "lara.h"
 #include "effects\tomb4fx.h"
 #include "traps.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "Sound\sound.h"
 #include "setup.h"
 #include "level.h"
@@ -15,7 +15,7 @@
 #include <Game\effects\drip.h>
 #include <Game\effects\bubble.h>
 #include "smoke.h"
-#include "prng.h"
+#include "Specific\prng.h"
 
 using TEN::Renderer::g_Renderer;
 using TEN::Effects::Explosion::TriggerExplosion;
diff --git a/TR5Main/Game/effects/effects.h b/TR5Main/Game/effects/effects.h
index c9e6879a7..3d1c9cb9b 100644
--- a/TR5Main/Game/effects/effects.h
+++ b/TR5Main/Game/effects/effects.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 
 enum RIPPLE_TYPE
diff --git a/TR5Main/Game/effects/explosion.cpp b/TR5Main/Game/effects/explosion.cpp
index 770570ad0..fe2c42818 100644
--- a/TR5Main/Game/effects/explosion.cpp
+++ b/TR5Main/Game/effects/explosion.cpp
@@ -1,11 +1,11 @@
 #include "framework.h"
 #include "explosion.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "spark.h"
 #include "effects\tomb4fx.h"
 #include "setup.h"
 #include "effects\effects.h"
-#include "prng.h"
+#include "Specific\prng.h"
 using namespace TEN::Math::Random;
 namespace TEN {
 	namespace Effects {
diff --git a/TR5Main/Game/effects/footprint.cpp b/TR5Main/Game/effects/footprint.cpp
index 680d7bda9..f115d71d6 100644
--- a/TR5Main/Game/effects/footprint.cpp
+++ b/TR5Main/Game/effects/footprint.cpp
@@ -1,9 +1,9 @@
 #include "framework.h"
-#include "effects\footprint.h"
 #include "control.h"
 #include "lara.h"
 #include "draw.h"
-#include "groundfx.h"
+#include "effects\groundfx.h"
+#include "effects\footprint.h"
 #include "level.h"
 #include "items.h"
 namespace TEN {
diff --git a/TR5Main/Game/effects/footprint.h b/TR5Main/Game/effects/footprint.h
index 190f06f91..9d9ef3ccd 100644
--- a/TR5Main/Game/effects/footprint.h
+++ b/TR5Main/Game/effects/footprint.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 #include <deque>
 namespace TEN{
diff --git a/TR5Main/Sound/groundfx.h b/TR5Main/Game/effects/groundfx.h
similarity index 100%
rename from TR5Main/Sound/groundfx.h
rename to TR5Main/Game/effects/groundfx.h
diff --git a/TR5Main/Game/effects/hair.h b/TR5Main/Game/effects/hair.h
index 8babd56ce..1b8d6a992 100644
--- a/TR5Main/Game/effects/hair.h
+++ b/TR5Main/Game/effects/hair.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 constexpr auto HAIR_MAX = 2; // HAIR_NORMAL = 0, HAIR_YOUNG = 1
 constexpr auto HAIR_SEGMENTS = 6; // classic = 7, young = 14
diff --git a/TR5Main/Game/effects/lightning.cpp b/TR5Main/Game/effects/lightning.cpp
index 1534eba07..8606c3480 100644
--- a/TR5Main/Game/effects/lightning.cpp
+++ b/TR5Main/Game/effects/lightning.cpp
@@ -7,7 +7,7 @@
 #include "level.h"
 #include "Sound\sound.h"
 #include "effects\bubble.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "GameFlowScript.h"
 #include "smoke.h"
 #include "drip.h"
diff --git a/TR5Main/Game/effects/smoke.cpp b/TR5Main/Game/effects/smoke.cpp
index 4927696ca..aaa00329c 100644
--- a/TR5Main/Game/effects/smoke.cpp
+++ b/TR5Main/Game/effects/smoke.cpp
@@ -1,5 +1,5 @@
 #include "framework.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "smoke.h"
 #include "room.h"
 #include "control.h"
@@ -7,7 +7,7 @@
 #include "setup.h"
 #include "lara.h"
 #include <algorithm>
-#include "prng.h"
+#include "Specific\prng.h"
 using namespace TEN::Math::Random;
 namespace TEN {
 	namespace Effects {
diff --git a/TR5Main/Game/effects/spark.cpp b/TR5Main/Game/effects/spark.cpp
index 26b924525..16a13ba0a 100644
--- a/TR5Main/Game/effects/spark.cpp
+++ b/TR5Main/Game/effects/spark.cpp
@@ -2,8 +2,8 @@
 #include "framework.h"
 #include "spark.h"
 #include <array>
-#include <Game\trmath.h>
-#include "prng.h"
+#include <Specific\trmath.h>
+#include "Specific\prng.h"
 using namespace DirectX::SimpleMath;
 using namespace TEN::Math::Random;
 
diff --git a/TR5Main/Game/effects/spark.h b/TR5Main/Game/effects/spark.h
index 487d16733..e41e02a93 100644
--- a/TR5Main/Game/effects/spark.h
+++ b/TR5Main/Game/effects/spark.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <d3d11.h>
 #include <SimpleMath.h>
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 namespace TEN {
 	namespace Effects {
 		namespace Spark {
diff --git a/TR5Main/Game/effects/tomb4fx.cpp b/TR5Main/Game/effects/tomb4fx.cpp
index a7b7e9e72..33144eaf4 100644
--- a/TR5Main/Game/effects/tomb4fx.cpp
+++ b/TR5Main/Game/effects/tomb4fx.cpp
@@ -7,7 +7,7 @@
 #include "level.h"
 #include "Sound\sound.h"
 #include "effects\bubble.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "GameFlowScript.h"
 #include "smoke.h"
 #include "drip.h"
diff --git a/TR5Main/Game/effects/tomb4fx.h b/TR5Main/Game/effects/tomb4fx.h
index cf798ba30..915adfece 100644
--- a/TR5Main/Game/effects/tomb4fx.h
+++ b/TR5Main/Game/effects/tomb4fx.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 #include "lara_struct.h"
 
diff --git a/TR5Main/Game/floordata.cpp b/TR5Main/Game/floordata.cpp
index 05ef2330a..92ea2bb13 100644
--- a/TR5Main/Game/floordata.cpp
+++ b/TR5Main/Game/floordata.cpp
@@ -1,5 +1,5 @@
 #include "framework.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "floordata.h"
 #include "room.h"
 #include "level.h"
diff --git a/TR5Main/Game/floordata.h b/TR5Main/Game/floordata.h
index 8fb1cf2d0..a506a98eb 100644
--- a/TR5Main/Game/floordata.h
+++ b/TR5Main/Game/floordata.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "items.h"
 
 struct SECTOR_COLLISION_INFO
diff --git a/TR5Main/Game/items.h b/TR5Main/Game/items.h
index a8ac1b146..3a0e72c1a 100644
--- a/TR5Main/Game/items.h
+++ b/TR5Main/Game/items.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 enum GAME_OBJECT_ID : short;
 
diff --git a/TR5Main/Game/particle/SimpleParticle.cpp b/TR5Main/Game/particle/SimpleParticle.cpp
index 030d22864..e13153610 100644
--- a/TR5Main/Game/particle/SimpleParticle.cpp
+++ b/TR5Main/Game/particle/SimpleParticle.cpp
@@ -1,9 +1,9 @@
 #include "framework.h"
 #include "SimpleParticle.h"
 #include "items.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include <Specific\setup.h>
-#include "prng.h"
+#include "Specific\prng.h"
 using namespace TEN::Math::Random;
 
 namespace TEN::Effects{
diff --git a/TR5Main/Game/pickup/pickup.cpp b/TR5Main/Game/pickup/pickup.cpp
index b4a85538f..37f4268e6 100644
--- a/TR5Main/Game/pickup/pickup.cpp
+++ b/TR5Main/Game/pickup/pickup.cpp
@@ -1,6 +1,6 @@
 #include "framework.h"
 #include "pickup\pickup.h"
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "lara.h"
 #include "draw.h"
 #ifdef NEW_INV
diff --git a/TR5Main/Game/sphere.cpp b/TR5Main/Game/sphere.cpp
index 704751c85..3f14ca09c 100644
--- a/TR5Main/Game/sphere.cpp
+++ b/TR5Main/Game/sphere.cpp
@@ -5,7 +5,7 @@
 #include "level.h"
 #include "setup.h"
 #include "Renderer11.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 using namespace TEN::Renderer;
 
diff --git a/TR5Main/Game/spotcam.h b/TR5Main/Game/spotcam.h
index 856c8f7b8..a54362888 100644
--- a/TR5Main/Game/spotcam.h
+++ b/TR5Main/Game/spotcam.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 struct QUAKE_CAMERA
 {
diff --git a/TR5Main/Objects/Effects/tr4_locusts.cpp b/TR5Main/Objects/Effects/tr4_locusts.cpp
index fbd1f0fec..91d580c43 100644
--- a/TR5Main/Objects/Effects/tr4_locusts.cpp
+++ b/TR5Main/Objects/Effects/tr4_locusts.cpp
@@ -1,7 +1,7 @@
 #include "framework.h"
 #include "tr4_locusts.h"
 #include "Sound\sound.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "sphere.h"
 #include "misc.h"
 #include "lara.h"
diff --git a/TR5Main/Objects/Effects/tr4_locusts.h b/TR5Main/Objects/Effects/tr4_locusts.h
index a5d4598d5..4155aa069 100644
--- a/TR5Main/Objects/Effects/tr4_locusts.h
+++ b/TR5Main/Objects/Effects/tr4_locusts.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 
 struct LOCUST_INFO
diff --git a/TR5Main/Objects/Generic/Object/generic_bridge.h b/TR5Main/Objects/Generic/Object/generic_bridge.h
index 1ed7ad5ab..6b94a17de 100644
--- a/TR5Main/Objects/Generic/Object/generic_bridge.h
+++ b/TR5Main/Objects/Generic/Object/generic_bridge.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 void InitialiseBridge(short itemNumber);
 int GetOffset(short angle, int x, int z);
diff --git a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp
index dcf3f4891..9cd38b2bc 100644
--- a/TR5Main/Objects/TR1/Entity/tr1_natla.cpp
+++ b/TR5Main/Objects/TR1/Entity/tr1_natla.cpp
@@ -7,7 +7,7 @@
 #include "level.h"
 #include "Sound\sound.h"
 #include "effects\effects.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 #define NATLA_NEAR_DEATH 200
 
diff --git a/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp b/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp
index 8e84773ca..5935704e5 100644
--- a/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp
+++ b/TR5Main/Objects/TR2/Entity/tr2_mercenary.cpp
@@ -5,7 +5,7 @@
 #include "setup.h"
 #include "level.h"
 #include "control.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 BITE_INFO mercUziBite = { 0, 150, 19, 17 };
 BITE_INFO mercAutoPistolBite = { 0, 230, 9, 17 };
diff --git a/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp b/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp
index a377e74b7..4792d4390 100644
--- a/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp
+++ b/TR5Main/Objects/TR2/Entity/tr2_worker_flamethrower.cpp
@@ -10,7 +10,7 @@
 #include "level.h"
 #include "control.h"
 #include "effects\effects.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 BITE_INFO workerFlameThrower = { 0, 250, 32, 9 };
 
diff --git a/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp b/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp
index 6ea214369..ad19c1a3f 100644
--- a/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp
+++ b/TR5Main/Objects/TR2/Vehicles/snowmobile.cpp
@@ -15,7 +15,7 @@
 #include "input.h"
 #include "Sound\sound.h"
 #include <Game\particle\SimpleParticle.h>
-#include "prng.h"
+#include "Specific\prng.h"
 
 using std::vector;
 using namespace TEN::Math::Random;
diff --git a/TR5Main/Objects/TR3/Vehicles/quad.cpp b/TR5Main/Objects/TR3/Vehicles/quad.cpp
index 8fd836551..c5a9f6009 100644
--- a/TR5Main/Objects/TR3/Vehicles/quad.cpp
+++ b/TR5Main/Objects/TR3/Vehicles/quad.cpp
@@ -14,7 +14,7 @@
 #include "level.h"
 #include "input.h"
 #include "Sound\sound.h"
-#include "prng.h"
+#include "Specific\prng.h"
 using std::vector;
 using namespace TEN::Math::Random;
 enum QUAD_EFFECTS_POSITIONS {
diff --git a/TR5Main/Objects/TR3/boss.h b/TR5Main/Objects/TR3/boss.h
index 31b9a0d3b..0df88ff4b 100644
--- a/TR5Main/Objects/TR3/boss.h
+++ b/TR5Main/Objects/TR3/boss.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 struct BOSS_STRUCT
 {
diff --git a/TR5Main/Objects/TR4/Entity/tr4_baboon.h b/TR5Main/Objects/TR4/Entity/tr4_baboon.h
index 7c325809c..3a2895f8f 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_baboon.h
+++ b/TR5Main/Objects/TR4/Entity/tr4_baboon.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 #include "items.h"
 
 struct BaboonRespawnStruct
diff --git a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp
index 8206ee19c..c554cff72 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_bat.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_bat.cpp
@@ -7,7 +7,7 @@
 #include "lara.h"
 #include "lot.h"
 #include "setup.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 namespace TEN::Entities::TR4
 {
diff --git a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
index cd1a6c51a..f1ecc7060 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
@@ -5,9 +5,9 @@
 #include "setup.h"
 #include "level.h"
 #include "control.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include <lara.h>
-#include <sound.h>
+#include "Sound\sound.h"
 #include <sphere.h>
 #include <people.h>
 
diff --git a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp
index c7f4b83a5..c2456cfc4 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp
@@ -3,12 +3,12 @@
 #include <items.h>
 #include <level.h>
 #include <Box.h>
-#include <trmath.h>
+#include <Specific\trmath.h>
 #include <control.h>
 #include <lara.h>
 #include <sphere.h>
 #include <lot.h>
-#include <sound.h>
+#include "Sound\sound.h"
 #include <draw.h>
 #include <effects\effects.h>
 #include <effects\tomb4fx.h>
diff --git a/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp b/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp
index a461e90f2..50f3776d8 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_horseman.cpp
@@ -5,9 +5,9 @@
 #include "setup.h"
 #include "level.h"
 #include "control.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include <lara.h>
-#include <sound.h>
+#include "Sound\sound.h"
 #include <sphere.h>
 
 namespace TEN::Entities::TR4
diff --git a/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp b/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp
index fb71bf68a..94fa51890 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_littlebeetle.cpp
@@ -2,7 +2,7 @@
 #include "tr4_littlebeetle.h"
 #include "level.h"
 #include "control.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "lara.h"
 
 namespace TEN::Entities::TR4
diff --git a/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp b/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
index 8c77b4027..46d0d1755 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
@@ -7,7 +7,7 @@
 #include "setup.h"
 #include "sphere.h"
 #include "objectslist.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "control.h"
 
 namespace TEN::Entities::TR4
diff --git a/TR5Main/Objects/TR4/Entity/tr4_mutant.h b/TR5Main/Objects/TR4/Entity/tr4_mutant.h
index bc8dc5157..e67d6431e 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_mutant.h
+++ b/TR5Main/Objects/TR4/Entity/tr4_mutant.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "framework.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 namespace TEN::Entities::TR4 
 {
diff --git a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
index 3960ee299..3e13392fc 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
@@ -14,7 +14,7 @@
 #include "sphere.h"
 #include "people.h"
 #include "Sound\sound.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "objectslist.h"
 
 #ifndef NEW_INV
diff --git a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp
index 831c1c10a..9907f2012 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp
@@ -5,9 +5,9 @@
 #include "setup.h"
 #include "level.h"
 #include "control.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include <lara.h>
-#include <sound.h>
+#include "Sound\sound.h"
 #include <sphere.h>
 #include <people.h>
 
diff --git a/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp b/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
index 0fa2d9185..ba3fdc57c 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
@@ -4,8 +4,8 @@
 #include "effects\effects.h"
 #include "control.h"
 #include "objectslist.h"
-#include "trmath.h"
-#include <sound.h>
+#include "Specific\trmath.h"
+#include "Sound\sound.h"
 #include <lara.h>
 #include <traps.h>
 #include <effects\tomb4fx.h>
diff --git a/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp b/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp
index dcd121034..452133244 100644
--- a/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp
+++ b/TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp
@@ -2,7 +2,7 @@
 #include "tr4_element_puzzle.h"
 #include "level.h"
 #include "control.h"
-#include <sound.h>
+#include "Sound\sound.h"
 #include <draw.h>
 #include <lara.h>
 #include <sphere.h>
diff --git a/TR5Main/Objects/TR4/Object/tr4_mapper.cpp b/TR5Main/Objects/TR4/Object/tr4_mapper.cpp
index 822565856..0b60c960e 100644
--- a/TR5Main/Objects/TR4/Object/tr4_mapper.cpp
+++ b/TR5Main/Objects/TR4/Object/tr4_mapper.cpp
@@ -2,7 +2,7 @@
 #include "tr4_mapper.h"
 #include "level.h"
 #include "control.h"
-#include <sound.h>
+#include "Sound\sound.h"
 #include <draw.h>
 #include <lara.h>
 #include <Game\sphere.h>
diff --git a/TR5Main/Objects/TR4/Trap/tr4_hammer.cpp b/TR5Main/Objects/TR4/Trap/tr4_hammer.cpp
index be3a7c082..0d732d0c3 100644
--- a/TR5Main/Objects/TR4/Trap/tr4_hammer.cpp
+++ b/TR5Main/Objects/TR4/Trap/tr4_hammer.cpp
@@ -2,7 +2,7 @@
 #include "tr4_element_puzzle.h"
 #include "level.h"
 #include "control.h"
-#include <sound.h>
+#include "Sound\sound.h"
 #include <draw.h>
 #include <lara.h>
 #include <sphere.h>
diff --git a/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp b/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
index e0f9406bd..463548c1c 100644
--- a/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
+++ b/TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
@@ -3,7 +3,7 @@
 #include "level.h"
 #include "control.h"
 #include "effects\effects.h"
-#include <sound.h>
+#include "Sound\sound.h"
 #include <draw.h>
 #include <lara.h>
 
diff --git a/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp b/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp
index 4a20d3e9a..fcb46dd35 100644
--- a/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp
+++ b/TR5Main/Objects/TR4/Trap/tr4_moving_blade.cpp
@@ -2,7 +2,7 @@
 #include "tr4_moving_blade.h"
 #include "level.h"
 #include "control.h"
-#include <sound.h>
+#include "Sound\sound.h"
 #include <draw.h>
 #include <lara.h>
 #include <sphere.h>
diff --git a/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp b/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp
index b74872fe3..e6e8f0ff1 100644
--- a/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp
+++ b/TR5Main/Objects/TR4/Trap/tr4_slicerdicer.cpp
@@ -3,7 +3,7 @@
 #include "level.h"
 #include "Sound\sound.h"
 #include "items.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 void InitialiseSlicerDicer(short itemNum)
 {
diff --git a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp
index 71bdf2908..d5ad95030 100644
--- a/TR5Main/Objects/TR4/Vehicles/motorbike.cpp
+++ b/TR5Main/Objects/TR4/Vehicles/motorbike.cpp
@@ -19,7 +19,7 @@
 #include "Sound\sound.h"
 #include "health.h"
 #include "camera.h"
-#include "prng.h"
+#include "Specific\prng.h"
 
 using namespace TEN::Math::Random;
 
diff --git a/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp b/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp
index e1fed6fb0..2326b489c 100644
--- a/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp
+++ b/TR5Main/Objects/TR5/Emitter/tr5_smoke_emitter.cpp
@@ -3,7 +3,7 @@
 #include "objectslist.h"
 #include "items.h"
 #include "level.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 void InitialiseSmokeEmitter(short itemNumber)
 {
diff --git a/TR5Main/Objects/TR5/Entity/tr5_hydra.h b/TR5Main/Objects/TR5/Entity/tr5_hydra.h
index a98349cc4..48af86833 100644
--- a/TR5Main/Objects/TR5/Entity/tr5_hydra.h
+++ b/TR5Main/Objects/TR5/Entity/tr5_hydra.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 void InitialiseHydra(short itemNum);
 void HydraControl(short itemNumber);
diff --git a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.h b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.h
index 375c70ad6..5693e8cf6 100644
--- a/TR5Main/Objects/TR5/Entity/tr5_roman_statue.h
+++ b/TR5Main/Objects/TR5/Entity/tr5_roman_statue.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 void InitialiseRomanStatue(short itemNum);
 void RomanStatueControl(short itemNumber);
diff --git a/TR5Main/Objects/TR5/Light/tr5_light.cpp b/TR5Main/Objects/TR5/Light/tr5_light.cpp
index c0475ff57..23102881d 100644
--- a/TR5Main/Objects/TR5/Light/tr5_light.cpp
+++ b/TR5Main/Objects/TR5/Light/tr5_light.cpp
@@ -6,7 +6,7 @@
 #include "effects\effects.h"
 #include "Sound\sound.h"
 #include "sphere.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 void PulseLightControl(short itemNumber)
 {
diff --git a/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp b/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp
index 73163c859..8d0fa3bd2 100644
--- a/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp
+++ b/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp
@@ -1,7 +1,7 @@
 #include "framework.h"
 #include "tr5_bodypart.h"
 #include "effects\effects.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "Sound\sound.h"
 #include "tr5_missile.h"
 
diff --git a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp
index d34ba5459..b35865eb1 100644
--- a/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp
+++ b/TR5Main/Objects/TR5/Shatter/tr5_smashobject.cpp
@@ -5,7 +5,7 @@
 #include "Sound\sound.h"
 #include "effects\tomb4fx.h"
 #include "items.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 void InitialiseSmashObject(short itemNumber)
 {
diff --git a/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp b/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp
index 2c7fb7256..8ebd4402e 100644
--- a/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp
+++ b/TR5Main/Objects/TR5/Trap/tr5_deathslide.cpp
@@ -1,7 +1,7 @@
 #include "framework.h"
 #include "tr5_deathslide.h"
 #include "input.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "lara.h"
 #include "setup.h"
 #include "Sound\sound.h"
diff --git a/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp b/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp
index 96af8214e..26b7897d5 100644
--- a/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp
+++ b/TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp
@@ -6,7 +6,7 @@
 #include "level.h"
 #include "Sound\sound.h"
 #include "effects\tomb4fx.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 
 short SPyoffs[8] =
 {
diff --git a/TR5Main/Renderer/Renderer11.cpp b/TR5Main/Renderer/Renderer11.cpp
index 4123e95d8..bb7a38df1 100644
--- a/TR5Main/Renderer/Renderer11.cpp
+++ b/TR5Main/Renderer/Renderer11.cpp
@@ -16,7 +16,7 @@
 #include "rope.h"
 #include "camera.h"
 #include "effects\tomb4fx.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "misc.h"
 #include "effects\footprint.h"
 #include "setup.h"
diff --git a/TR5Main/Scripting/GameLogicScript.h b/TR5Main/Scripting/GameLogicScript.h
index 805e7fc03..b2edd764c 100644
--- a/TR5Main/Scripting/GameLogicScript.h
+++ b/TR5Main/Scripting/GameLogicScript.h
@@ -2,7 +2,7 @@
 #include "items.h"
 #include "room.h"
 #include "LuaHandler.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include <unordered_set>
 #include "GameScriptColor.h"
 #include "GameScriptPosition.h"
diff --git a/TR5Main/Scripting/GameScriptCameraInfo.h b/TR5Main/Scripting/GameScriptCameraInfo.h
index 819d9b171..6e65e2973 100644
--- a/TR5Main/Scripting/GameScriptCameraInfo.h
+++ b/TR5Main/Scripting/GameScriptCameraInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "GameScriptNamedBase.h"
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 namespace sol {
 	class state;
diff --git a/TR5Main/Scripting/GameScriptItemInfo.cpp b/TR5Main/Scripting/GameScriptItemInfo.cpp
index b673081cb..d9aa8c10d 100644
--- a/TR5Main/Scripting/GameScriptItemInfo.cpp
+++ b/TR5Main/Scripting/GameScriptItemInfo.cpp
@@ -9,7 +9,7 @@
 #include "lot.h"
 #include "GameScriptPosition.h"
 #include "GameScriptRotation.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include "lara.h"
 
 /***
diff --git a/TR5Main/Scripting/GameScriptPosition.cpp b/TR5Main/Scripting/GameScriptPosition.cpp
index ee7d95adb..ea3ae03f0 100644
--- a/TR5Main/Scripting/GameScriptPosition.cpp
+++ b/TR5Main/Scripting/GameScriptPosition.cpp
@@ -1,7 +1,7 @@
 #include "framework.h"
 #include "GameScriptPosition.h"
 #include <sol.hpp>
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 /***
 Represents a position in the game world.
diff --git a/TR5Main/Scripting/GameScriptRotation.cpp b/TR5Main/Scripting/GameScriptRotation.cpp
index f87953759..ecd9ca477 100644
--- a/TR5Main/Scripting/GameScriptRotation.cpp
+++ b/TR5Main/Scripting/GameScriptRotation.cpp
@@ -1,6 +1,6 @@
 #include "framework.h"
 #include "GameScriptRotation.h"
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 /*** Represents a rotation.
 Rotations are specifed as a combination of individual
diff --git a/TR5Main/Scripting/GameScriptSinkInfo.h b/TR5Main/Scripting/GameScriptSinkInfo.h
index 4aebd44f3..4ed88ffee 100644
--- a/TR5Main/Scripting/GameScriptSinkInfo.h
+++ b/TR5Main/Scripting/GameScriptSinkInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "GameScriptNamedBase.h"
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 namespace sol {
 	class state;
diff --git a/TR5Main/Scripting/GameScriptSoundSourceInfo.h b/TR5Main/Scripting/GameScriptSoundSourceInfo.h
index ab8f2dcc9..5ddd00150 100644
--- a/TR5Main/Scripting/GameScriptSoundSourceInfo.h
+++ b/TR5Main/Scripting/GameScriptSoundSourceInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "GameScriptNamedBase.h"
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 namespace sol {
 	class state;
diff --git a/TR5Main/Game/phd_global.h b/TR5Main/Specific/phd_global.h
similarity index 100%
rename from TR5Main/Game/phd_global.h
rename to TR5Main/Specific/phd_global.h
diff --git a/TR5Main/Game/prng.cpp b/TR5Main/Specific/prng.cpp
similarity index 92%
rename from TR5Main/Game/prng.cpp
rename to TR5Main/Specific/prng.cpp
index d5c5414b0..e539a97bc 100644
--- a/TR5Main/Game/prng.cpp
+++ b/TR5Main/Specific/prng.cpp
@@ -1,5 +1,5 @@
 #include "framework.h"
-#include "prng.h"
+#include "Specific\prng.h"
 #include <random>
 
 namespace TEN::Math::Random
diff --git a/TR5Main/Game/prng.h b/TR5Main/Specific/prng.h
similarity index 100%
rename from TR5Main/Game/prng.h
rename to TR5Main/Specific/prng.h
diff --git a/TR5Main/Game/trmath.cpp b/TR5Main/Specific/trmath.cpp
similarity index 98%
rename from TR5Main/Game/trmath.cpp
rename to TR5Main/Specific/trmath.cpp
index b6dec10df..84630afde 100644
--- a/TR5Main/Game/trmath.cpp
+++ b/TR5Main/Specific/trmath.cpp
@@ -1,7 +1,7 @@
 #include "framework.h"
-#include "trmath.h"
+#include "Specific\trmath.h"
 #include <cmath>
-#include "prng.h"
+#include "Specific\prng.h"
 
 using namespace TEN::Math::Random;
 
diff --git a/TR5Main/Game/trmath.h b/TR5Main/Specific/trmath.h
similarity index 97%
rename from TR5Main/Game/trmath.h
rename to TR5Main/Specific/trmath.h
index 76ba13c51..e65e8564c 100644
--- a/TR5Main/Game/trmath.h
+++ b/TR5Main/Specific/trmath.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phd_global.h"
+#include "Specific\phd_global.h"
 
 struct VectorInt2
 {
diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj
index 746e98bb1..638401854 100644
--- a/TR5Main/TombEngine.vcxproj
+++ b/TR5Main/TombEngine.vcxproj
@@ -145,7 +145,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
     <ClInclude Include="Game\effects\explosion.h" />
     <ClInclude Include="Game\floordata.h" />
     <ClInclude Include="Game\effects\footprint.h" />
-    <ClInclude Include="Sound\groundfx.h" />
+    <ClInclude Include="Game\effects\groundfx.h" />
     <ClInclude Include="Game\Lara\lara_basic.h" />
     <ClInclude Include="Game\Lara\lara_cheat.h" />
     <ClInclude Include="Game\Lara\lara_collide.h" />
@@ -162,7 +162,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
     <ClInclude Include="Game\memory\Vector.h" />
     <ClInclude Include="Game\newinv2.h" />
     <ClInclude Include="Game\particle\SimpleParticle.h" />
-    <ClInclude Include="Game\phd_global.h" />
+    <ClInclude Include="Specific\phd_global.h" />
     <ClInclude Include="Game\memory\qmalloc.h" />
     <ClInclude Include="Game\pickup\pickuputil.h" />
     <ClInclude Include="Game\pickup\pickup_ammo.h" />
@@ -171,7 +171,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
     <ClInclude Include="Game\pickup\pickup_misc_items.h" />
     <ClInclude Include="Game\pickup\pickup_weapon.h" />
     <ClInclude Include="Game\precompute\precompute.h" />
-    <ClInclude Include="Game\prng.h" />
+    <ClInclude Include="Specific\prng.h" />
     <ClInclude Include="Game\puzzles_keys.h" />
     <ClInclude Include="Game\room.h" />
     <ClInclude Include="Objects\Generic\Switches\cog_switch.h" />
@@ -480,7 +480,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
     <ClInclude Include="Game\traps.h" />
     <ClInclude Include="Objects\objectslist.h" />
     <ClInclude Include="Game\memory\malloc.h" />
-    <ClInclude Include="Game\trmath.h" />
+    <ClInclude Include="Specific\trmath.h" />
     <ClInclude Include="Scripting\GameLogicScript.h" />
     <ClInclude Include="Specific\input.h" />
     <ClInclude Include="Specific\IO\Streams.h" />
@@ -526,7 +526,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
     <ClCompile Include="Game\pickup\pickup_key_items.cpp" />
     <ClCompile Include="Game\pickup\pickup_misc_items.cpp" />
     <ClCompile Include="Game\pickup\pickup_weapon.cpp" />
-    <ClCompile Include="Game\prng.cpp" />
+    <ClCompile Include="Specific\prng.cpp" />
     <ClCompile Include="Game\puzzles_keys.cpp" />
     <ClCompile Include="Objects\Generic\Switches\cog_switch.cpp" />
     <ClCompile Include="Objects\Generic\Switches\crowbar_switch.cpp" />
@@ -544,7 +544,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
     <ClCompile Include="Scripting\GameScriptColor.cpp" />
     <ClCompile Include="Scripting\GameScriptInventoryObject.cpp" />
     <ClCompile Include="Scripting\GameScriptItemInfo.cpp" />
-    <ClCompile Include="Game\trmath.cpp" />
+    <ClCompile Include="Specific\trmath.cpp" />
     <ClCompile Include="Game\effects\smoke.cpp" />
     <ClCompile Include="Game\effects\spark.cpp" />
     <ClCompile Include="Objects\Generic\generic_objects.cpp" />
diff --git a/TR5Main/TombEngine.vcxproj.filters b/TR5Main/TombEngine.vcxproj.filters
index ab922489d..6362061e9 100644
--- a/TR5Main/TombEngine.vcxproj.filters
+++ b/TR5Main/TombEngine.vcxproj.filters
@@ -609,18 +609,12 @@
     <ClInclude Include="Objects\TR5\Switch\tr5_raisingcog.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="Game\phd_global.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="Game\room.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
     <ClInclude Include="Renderer\RenderEnums.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="Game\trmath.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="Specific\newtypes.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
@@ -873,9 +867,6 @@
     <ClInclude Include="Renderer\RendererSprites.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="Game\prng.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="Objects\TR1\Entity\tr1_giant_mutant.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
@@ -1083,15 +1074,24 @@
     <ClInclude Include="Sound\sound_tracks.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="Sound\groundfx.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="Game\effects\hair.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
     <ClInclude Include="Game\pickup\pickup.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
+    <ClInclude Include="Specific\trmath.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Specific\prng.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Specific\phd_global.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\effects\groundfx.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Game\box.cpp">
@@ -1616,9 +1616,6 @@
     <ClCompile Include="Objects\TR5\Switch\tr5_raisingcog.cpp">
       <Filter>File di origine</Filter>
     </ClCompile>
-    <ClCompile Include="Game\trmath.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
     <ClCompile Include="Objects\TR5\Light\tr5_light.cpp">
       <Filter>File di origine</Filter>
     </ClCompile>
@@ -1820,9 +1817,6 @@
     <ClCompile Include="Renderer\RendererSprites.cpp">
       <Filter>File di origine</Filter>
     </ClCompile>
-    <ClCompile Include="Game\prng.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
     <ClCompile Include="Objects\TR1\Entity\tr1_giant_mutant.cpp">
       <Filter>File di origine</Filter>
     </ClCompile>
@@ -2003,6 +1997,12 @@
     <ClCompile Include="Game\pickup\pickup.cpp">
       <Filter>File di origine</Filter>
     </ClCompile>
+    <ClCompile Include="Specific\trmath.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Specific\prng.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />