From deca190af548debb37a2888dd3750229b9ed90b0 Mon Sep 17 00:00:00 2001
From: Sezz <sezzary@outlook.com>
Date: Sun, 21 Aug 2022 15:20:13 +1000
Subject: [PATCH] Move TR2 creatures into more appropriate namespace

---
 TombEngine/Objects/TR2/Entity/tr2_barracuda.cpp           | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_barracuda.h             | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_bird_monster.cpp        | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_bird_monster.h          | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_dragon.cpp              | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_dragon.h                | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.cpp       | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.h         | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_knife_thrower.cpp       | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_knife_thrower.h         | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_mercenary.cpp           | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_mercenary.h             | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_monk.cpp                | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_monk.h                  | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_rat.cpp                 | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_rat.h                   | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_shark.cpp               | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_shark.h                 | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_silencer.cpp            | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_silencer.h              | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_skidman.cpp             | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_skidman.h               | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_spear_guardian.cpp      | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_spear_guardian.h        | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_spider.cpp              | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_spider.h                | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_sword_guardian.cpp      | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_sword_guardian.h        | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.h   | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.cpp | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.h   | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.cpp   | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.h     | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.cpp      | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.h        | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_yeti.cpp                | 2 +-
 TombEngine/Objects/TR2/Entity/tr2_yeti.h                  | 2 +-
 TombEngine/Objects/TR2/tr2_objects.cpp                    | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/TombEngine/Objects/TR2/Entity/tr2_barracuda.cpp b/TombEngine/Objects/TR2/Entity/tr2_barracuda.cpp
index 4346a201c..68e717b09 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_barracuda.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_barracuda.cpp
@@ -12,7 +12,7 @@
 
 using std::vector;
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	constexpr auto BARRACUDA_ATTACK_DAMAGE = 100;
 	constexpr auto BARRACUDA_IDLE_ATTACK_RANGE		= SQUARE(SECTOR(0.67f));
diff --git a/TombEngine/Objects/TR2/Entity/tr2_barracuda.h b/TombEngine/Objects/TR2/Entity/tr2_barracuda.h
index dfde88ccf..64ddf1939 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_barracuda.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_barracuda.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void BarracudaControl(short itemNumber);
 }
diff --git a/TombEngine/Objects/TR2/Entity/tr2_bird_monster.cpp b/TombEngine/Objects/TR2/Entity/tr2_bird_monster.cpp
index 1d56afbcf..a71985072 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_bird_monster.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_bird_monster.cpp
@@ -14,7 +14,7 @@
 using namespace TEN::Math::Random;
 using std::vector;
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	constexpr auto BIRD_MONSTER_ATTACK_DAMAGE = 200;
 	constexpr auto BIRD_MONSTER_SLAM_CRUSH_ATTACK_RANGE = SQUARE(SECTOR(1));
diff --git a/TombEngine/Objects/TR2/Entity/tr2_bird_monster.h b/TombEngine/Objects/TR2/Entity/tr2_bird_monster.h
index 5756af247..3c97478ce 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_bird_monster.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_bird_monster.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void BirdMonsterControl(short itemNumber);
 }
diff --git a/TombEngine/Objects/TR2/Entity/tr2_dragon.cpp b/TombEngine/Objects/TR2/Entity/tr2_dragon.cpp
index d8234d996..2ab45bf54 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_dragon.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_dragon.cpp
@@ -20,7 +20,7 @@
 using namespace TEN::Input;
 using std::vector;
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	constexpr auto DRAGON_SWIPE_ATTACK_DAMAGE = 250;
 	constexpr auto DRAGON_CONTACT_DAMAGE	  = 10;
diff --git a/TombEngine/Objects/TR2/Entity/tr2_dragon.h b/TombEngine/Objects/TR2/Entity/tr2_dragon.h
index 0809af93a..d501de501 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_dragon.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_dragon.h
@@ -2,7 +2,7 @@
 #include "Game/collision/collide_room.h"
 #include "Game/items.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void DragonCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* coll);
 	void DragonControl(short backNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.cpp b/TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.cpp
index a5b078769..b59911c68 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.cpp
@@ -10,7 +10,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto EagleBite = BiteInfo(Vector3(15.0f, 46.0f, 21.0f), 6);
 	const auto CrowBite	 = BiteInfo(Vector3(2.0f, 10.0f, 60.0f), 14);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.h b/TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.h
index 4b704e256..828b15bf8 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_eagle_or_crow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void InitialiseEagle(short itemNumber);
 	void EagleControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_knife_thrower.cpp b/TombEngine/Objects/TR2/Entity/tr2_knife_thrower.cpp
index bde2bff9c..de1b22b40 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_knife_thrower.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_knife_thrower.cpp
@@ -18,7 +18,7 @@
 
 using namespace TEN::Math::Random;
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	constexpr auto KNIFE_PROJECTILE_DAMAGE = 50;
 
diff --git a/TombEngine/Objects/TR2/Entity/tr2_knife_thrower.h b/TombEngine/Objects/TR2/Entity/tr2_knife_thrower.h
index 640373f24..2204a999c 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_knife_thrower.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_knife_thrower.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void KnifeControl(short fxNumber);
 	void KnifeThrowerControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_mercenary.cpp b/TombEngine/Objects/TR2/Entity/tr2_mercenary.cpp
index b166e57f0..c312e5002 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_mercenary.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_mercenary.cpp
@@ -11,7 +11,7 @@
 #include "Specific/setup.h"
 #include "Specific/trmath.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto MercenaryUziBite		   = BiteInfo(Vector3(0.0f, 150.0f, 19.0f), 17);
 	const auto MercenaryAutoPistolBite = BiteInfo(Vector3(0.0f, 230.0f, 9.0f), 17);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_mercenary.h b/TombEngine/Objects/TR2/Entity/tr2_mercenary.h
index 5199716ad..80f95100d 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_mercenary.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_mercenary.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void MercenaryUziControl(short itemNumber);
 	void MercenaryAutoPistolControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_monk.cpp b/TombEngine/Objects/TR2/Entity/tr2_monk.cpp
index 6dd61eb4d..1308c90e5 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_monk.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_monk.cpp
@@ -11,7 +11,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto MonkBite = BiteInfo(Vector3(-23.0f, 16.0f, 265.0f), 14);
 
diff --git a/TombEngine/Objects/TR2/Entity/tr2_monk.h b/TombEngine/Objects/TR2/Entity/tr2_monk.h
index dcf98f279..5fa99a252 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_monk.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_monk.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void MonkControl(short itemNumber);
 }
diff --git a/TombEngine/Objects/TR2/Entity/tr2_rat.cpp b/TombEngine/Objects/TR2/Entity/tr2_rat.cpp
index 473e071b2..a636344e6 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_rat.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_rat.cpp
@@ -14,7 +14,7 @@
 
 using namespace TEN::Math::Random;
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	constexpr auto RAT_ATTACK_DAMAGE = 20;
 	constexpr auto RAT_ATTACK_RANGE = SQUARE(CLICK(0.7f));
diff --git a/TombEngine/Objects/TR2/Entity/tr2_rat.h b/TombEngine/Objects/TR2/Entity/tr2_rat.h
index 1b4ebadcc..9afbf9b8a 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_rat.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_rat.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void RatControl(short itemNumber);
 }
diff --git a/TombEngine/Objects/TR2/Entity/tr2_shark.cpp b/TombEngine/Objects/TR2/Entity/tr2_shark.cpp
index 6d1e71a10..2f1ef3ae8 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_shark.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_shark.cpp
@@ -11,7 +11,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto SharkBite = BiteInfo(Vector3(17.0f, -22.0f, 344.0f), 12);
 
diff --git a/TombEngine/Objects/TR2/Entity/tr2_shark.h b/TombEngine/Objects/TR2/Entity/tr2_shark.h
index 1f2d76299..5788ee192 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_shark.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_shark.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void SharkControl(short itemNumber);
 }
diff --git a/TombEngine/Objects/TR2/Entity/tr2_silencer.cpp b/TombEngine/Objects/TR2/Entity/tr2_silencer.cpp
index c5f124b5f..6261b52d3 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_silencer.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_silencer.cpp
@@ -10,7 +10,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto SilencerGunBite = BiteInfo(Vector3(3.0f, 331.0f, 56.0f), 10);
 
diff --git a/TombEngine/Objects/TR2/Entity/tr2_silencer.h b/TombEngine/Objects/TR2/Entity/tr2_silencer.h
index 3b91c1f71..69e903dfc 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_silencer.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_silencer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void SilencerControl(short itemNumber);
 }
diff --git a/TombEngine/Objects/TR2/Entity/tr2_skidman.cpp b/TombEngine/Objects/TR2/Entity/tr2_skidman.cpp
index dec4daf4e..fb0c8b51c 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_skidman.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_skidman.cpp
@@ -17,7 +17,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	#define SMAN_MIN_TURN (ANGLE(2.0f))
 	#define SMAN_TARGET_ANGLE ANGLE(15.0f)
diff --git a/TombEngine/Objects/TR2/Entity/tr2_skidman.h b/TombEngine/Objects/TR2/Entity/tr2_skidman.h
index 3a79818c5..bc6147943 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_skidman.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_skidman.h
@@ -2,7 +2,7 @@
 #include "Game/collision/collide_room.h"
 #include "Game/items.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void InitialiseSkidooMan(short itemNumber);
 	void SkidooManCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* coll);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_spear_guardian.cpp b/TombEngine/Objects/TR2/Entity/tr2_spear_guardian.cpp
index 3ad9912e7..32a46fbf1 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_spear_guardian.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_spear_guardian.cpp
@@ -12,7 +12,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto SpearBiteLeft  = BiteInfo(Vector3(0.0f, 0.0f, 920.0f), 11);
 	const auto SpearBiteRight = BiteInfo(Vector3(0.0f, 0.0f, 920.0f), 18);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_spear_guardian.h b/TombEngine/Objects/TR2/Entity/tr2_spear_guardian.h
index d7965b761..e46bb4ea1 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_spear_guardian.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_spear_guardian.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void InitialiseSpearGuardian(short itemNumber);
 	void SpearGuardianControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_spider.cpp b/TombEngine/Objects/TR2/Entity/tr2_spider.cpp
index 7043d2fc6..e7bb5ac5a 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_spider.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_spider.cpp
@@ -14,7 +14,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto SpiderBite = BiteInfo(Vector3(0.0f, 0.0f, 41.0f), 1);
 
diff --git a/TombEngine/Objects/TR2/Entity/tr2_spider.h b/TombEngine/Objects/TR2/Entity/tr2_spider.h
index 23d72cc40..9b5876eec 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_spider.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_spider.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void SmallSpiderControl(short itemNumber);
 	void BigSpiderControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_sword_guardian.cpp b/TombEngine/Objects/TR2/Entity/tr2_sword_guardian.cpp
index 155e51721..062eb22e9 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_sword_guardian.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_sword_guardian.cpp
@@ -13,7 +13,7 @@
 #include "Sound/sound.h"
 #include "Specific/level.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto SwordBite = BiteInfo(Vector3(0.0f, 37.0f, 550.0f), 15);
 
diff --git a/TombEngine/Objects/TR2/Entity/tr2_sword_guardian.h b/TombEngine/Objects/TR2/Entity/tr2_sword_guardian.h
index 9c837688b..588df13b8 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_sword_guardian.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_sword_guardian.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void InitialiseSwordGuardian(short itemNumber);
 	void SwordGuardianControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp b/TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp
index 66e424bf2..5ab9a903b 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.cpp
@@ -10,7 +10,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto WorkerDualGunBiteLeft  = BiteInfo(Vector3(-2.0f, 275.0f, 23.0f), 6);
 	const auto WorkerDualGunBiteRight = BiteInfo(Vector3(2.0f, 275.0f, 23.0f), 10);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.h b/TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.h
index fd95395f8..d4a1761d3 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_worker_dualrevolver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void WorkerDualGunControl(short itemNumber);
 }
diff --git a/TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.cpp b/TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.cpp
index a1ed233eb..ee7738029 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.cpp
@@ -16,7 +16,7 @@
 #include "Specific/level.h"
 #include "Specific/trmath.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto WorkerFlamethrowerOffset = Vector3Int(0, 140, 0);
 	const auto WorkerFlamethrowerBite = BiteInfo(Vector3(0.0f, 250.0f, 32.0f), 9);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.h b/TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.h
index 89fa4122b..f8b851421 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_worker_flamethrower.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void InitialiseWorkerFlamethrower(short itemNumber);
 	void WorkerFlamethrower(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.cpp b/TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.cpp
index 6a69c3e15..2a198c8f5 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.cpp
@@ -11,7 +11,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto WorkerMachineGunBite = BiteInfo(Vector3(0.0f, 308.0f, 32.0f), 9);
 
diff --git a/TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.h b/TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.h
index fef58f199..1ba9b187a 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_worker_machinegun.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void InitialiseWorkerMachineGun(short itemNumber);
 	void WorkerMachineGunControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.cpp b/TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.cpp
index b5bb9e0d1..9f44426e1 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.cpp
@@ -12,7 +12,7 @@
 #include "Specific/level.h"
 #include "Specific/setup.h"
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto WorkerShotgunBite = BiteInfo(Vector3(0.0f, 281.0f, 40.0f), 9);
 
diff --git a/TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.h b/TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.h
index a6ad5f5a6..5022fcbd7 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_worker_shotgun.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void InitialiseWorkerShotgun(short itemNumber);
 	void WorkerShotgunControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_yeti.cpp b/TombEngine/Objects/TR2/Entity/tr2_yeti.cpp
index 173ba1dd8..8dcd9889c 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_yeti.cpp
+++ b/TombEngine/Objects/TR2/Entity/tr2_yeti.cpp
@@ -15,7 +15,7 @@
 using namespace TEN::Math::Random;
 using std::vector;
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	const auto YetiBiteLeft	 = BiteInfo(Vector3(12.0f, 101.0f, 19.0f), 13);
 	const auto YetiBiteRight = BiteInfo(Vector3(12.0f, 101.0f, 19.0f), 10);
diff --git a/TombEngine/Objects/TR2/Entity/tr2_yeti.h b/TombEngine/Objects/TR2/Entity/tr2_yeti.h
index aa6ae5f16..f77c73350 100644
--- a/TombEngine/Objects/TR2/Entity/tr2_yeti.h
+++ b/TombEngine/Objects/TR2/Entity/tr2_yeti.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace TEN::Entities::TR2
+namespace TEN::Entities::Creatures::TR2
 {
 	void InitialiseYeti(short itemNumber);
 	void YetiControl(short itemNumber);
diff --git a/TombEngine/Objects/TR2/tr2_objects.cpp b/TombEngine/Objects/TR2/tr2_objects.cpp
index 67c07965b..599a45b7d 100644
--- a/TombEngine/Objects/TR2/tr2_objects.cpp
+++ b/TombEngine/Objects/TR2/tr2_objects.cpp
@@ -37,7 +37,7 @@
 #include "Objects/TR2/Vehicles/speedboat.h"
 #include "Objects/TR2/Vehicles/skidoo.h"
 
-using namespace TEN::Entities::TR2;
+using namespace TEN::Entities::Creatures::TR2;
 
 static void StartEntity(ObjectInfo* obj)
 {