diff --git a/src/server/game/BattleGrounds/BattleGround.h b/src/server/game/BattleGrounds/BattleGround.h
index 6f46b6f8f6..36fdb18f1b 100644
--- a/src/server/game/BattleGrounds/BattleGround.h
+++ b/src/server/game/BattleGrounds/BattleGround.h
@@ -22,8 +22,8 @@
 #define __BATTLEGROUND_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "DBCEnums.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "DataStores/DBCEnums.h"
 
 class Creature;
 class GameObject;
diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h
index 80b676312a..ce5947ffc6 100644
--- a/src/server/game/Combat/HostileRefManager.h
+++ b/src/server/game/Combat/HostileRefManager.h
@@ -22,7 +22,7 @@
 #define _HOSTILEREFMANAGER
 
 #include "Common.h"
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 class Unit;
 class ThreatManager;
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index 723a553e9d..517f454812 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -22,9 +22,9 @@
 #define _THREATMANAGER
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Utilities/LinkedReference/Reference.h"
-#include "UnitEvents.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Dynamic/LinkedReference/Reference.h"
+#include "Combat/UnitEvents.h"
 
 #include <list>
 
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index d2d93d787d..0d4a4b0930 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -23,11 +23,11 @@
 
 #include "Common.h"
 #include "Unit.h"
-#include "UpdateMask.h"
+#include "Updates/UpdateMask.h"
 #include "ItemPrototype.h"
 #include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
-#include "Cell.h"
+#include "Grids/Cells/Cell.h"
 
 #include <list>
 
diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h
index 527bec42aa..9db2fcecbc 100644
--- a/src/server/game/Entities/Object/Updates/UpdateMask.h
+++ b/src/server/game/Entities/Object/Updates/UpdateMask.h
@@ -22,7 +22,7 @@
 #define __UPDATEMASK_H
 
 #include "UpdateFields.h"
-#include "Errors.h"
+#include "Debugging/Errors.h"
 
 class UpdateMask
 {
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index d6de867932..314b122d34 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -27,11 +27,11 @@
 #include "Item.h"
 
 #include "Database/DatabaseEnv.h"
-#include "NPCHandler.h"
-#include "QuestDef.h"
-#include "Group.h"
-#include "Bag.h"
-#include "WorldSession.h"
+#include "Server/Protocol/Handlers/NPCHandler.h"
+#include "Quests/QuestDef.h"
+#include "Groups/Group.h"
+#include "Item/Container/Bag.h"
+#include "Server/WorldSession.h"
 #include "Pet.h"
 #include "MapReference.h"
 #include "Util.h"                                           // for Tokens typedef
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index c41a00f2e4..dc90411d88 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -25,12 +25,12 @@
 #include "Object.h"
 #include "Server/Protocol/Opcodes.h"
 #include "SpellAuraDefines.h"
-#include "UpdateFields.h"
-#include "SharedDefines.h"
-#include "ThreatManager.h"
-#include "HostileRefManager.h"
-#include "FollowerReference.h"
-#include "FollowerRefManager.h"
+#include "Updates/UpdateFields.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Combat/ThreatManager.h"
+#include "Combat/HostileRefManager.h"
+#include "Movement/FollowerReference.h"
+#include "Movement/FollowerRefManager.h"
 #include "Utilities/EventProcessor.h"
 #include "MotionMaster.h"
 #include "DBCStructure.h"
diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h
index 4fdeba2dd8..f80e8d0989 100644
--- a/src/server/game/Groups/GroupRefManager.h
+++ b/src/server/game/Groups/GroupRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _GROUPREFMANAGER
 #define _GROUPREFMANAGER
 
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 class Group;
 class Player;
diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h
index 76f54c5230..530f6dd8f1 100644
--- a/src/server/game/Groups/GroupReference.h
+++ b/src/server/game/Groups/GroupReference.h
@@ -21,7 +21,7 @@
 #ifndef _GROUPREFERENCE_H
 #define _GROUPREFERENCE_H
 
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedReference/Reference.h"
 
 class Group;
 class Player;
diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index 65fe3de22e..55bb35eda6 100644
--- a/src/server/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
@@ -22,10 +22,10 @@
 #define TRINITY_LOOTMGR_H
 
 #include "ItemEnchantmentMgr.h"
-#include "ByteBuffer.h"
-#include "Utilities/LinkedReference/RefManager.h"
-#include "SharedDefines.h"
-#include "ConditionMgr.h"
+#include "Packets/ByteBuffer.h"
+#include "Dynamic/LinkedReference/RefManager.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Conditions/ConditionMgr.h"
 
 #include <map>
 #include <vector>
diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
index c2068b36f8..a0364e03db 100644
--- a/src/server/game/Movement/FollowerRefManager.h
+++ b/src/server/game/Movement/FollowerRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFMANAGER
 #define _FOLLOWERREFMANAGER
 
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 class Unit;
 class TargetedMovementGeneratorBase;
diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
index e468f79f01..db66ec4d02 100644
--- a/src/server/game/Movement/FollowerReference.h
+++ b/src/server/game/Movement/FollowerReference.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFERENCE_H
 #define _FOLLOWERREFERENCE_H
 
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedReference/Reference.h"
 
 class TargetedMovementGeneratorBase;
 class Unit;
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index c4082ba086..5bd81cd965 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include <vector>
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "Object.h"
 
 class MovementGenerator;
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 20d4ca3d28..8da1f822b4 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -21,7 +21,7 @@
 #ifndef TRINITYCORE_QUEST_H
 #define TRINITYCORE_QUEST_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Database/DatabaseEnv.h"
 
 #include <string>
diff --git a/src/server/shared/Utilities/EventProcessor.h b/src/server/shared/Utilities/EventProcessor.h
index 2712967e1b..421f88b659 100644
--- a/src/server/shared/Utilities/EventProcessor.h
+++ b/src/server/shared/Utilities/EventProcessor.h
@@ -21,7 +21,7 @@
 #ifndef __EVENTPROCESSOR_H
 #define __EVENTPROCESSOR_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 #include<map>