* More cleanup

--HG--
branch : trunk

64 files changed, 172 insertions, 172 deletions

diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index 19d5b5d8354..f4da814e86b 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "GuardAI.h"
-#include "Errors.h"
+#include "Debugging/Errors.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "World.h"
diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h
index 73e3692a770..3d884e28906 100644
--- a/src/server/game/AI/CoreAI/GuardAI.h
+++ b/src/server/game/AI/CoreAI/GuardAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_GUARDAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 09ec8fae53f..72f0db20cb5 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "PetAI.h"
-#include "Errors.h"
+#include "Debugging/Errors.h"
 #include "Pet.h"
 #include "Player.h"
 #include "DBCStores.h"
@@ -28,7 +28,7 @@
 #include "SpellMgr.h"
 #include "Creature.h"
 #include "World.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 int PetAI::Permissible(const Creature *creature)
 {
diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
index f6087a129ae..52568999cd1 100644
--- a/src/server/game/AI/CoreAI/PetAI.h
+++ b/src/server/game/AI/CoreAI/PetAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_PETAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 class Spell;
diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
index fdca6314747..f5e3739ccbf 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ByteBuffer.h"
+#include "Packets/ByteBuffer.h"
 #include "ReactorAI.h"
-#include "Errors.h"
-#include "Log.h"
+#include "Debugging/Errors.h"
+#include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAIImpl.h"
 
diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp
index a6464f189e8..58045153efd 100644
--- a/src/server/game/AI/CoreAI/TotemAI.cpp
+++ b/src/server/game/AI/CoreAI/TotemAI.cpp
@@ -25,9 +25,9 @@
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Grids/Cells/CellImpl.h"
 
 int
 TotemAI::Permissible(const Creature *creature)
diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h
index 34f4dfa9945..63459ace023 100644
--- a/src/server/game/AI/CoreAI/TotemAI.h
+++ b/src/server/game/AI/CoreAI/TotemAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_TOTEMAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 class Totem;
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h
index 62b7090a2d0..3033f0556db 100644
--- a/src/server/game/AI/CoreAI/UnitAI.h
+++ b/src/server/game/AI/CoreAI/UnitAI.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_UNITAI_H
 #define TRINITY_UNITAI_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include <list>
 #include "Unit.h"
 
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index c03d3dd09d0..58020c785dd 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_CREATUREAI_H
 #define TRINITY_CREATUREAI_H
 
-#include "UnitAI.h"
+#include "AI/CoreAI/UnitAI.h"
 #include "Common.h"
 
 class WorldObject;
diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
index d2f96ffcabc..0f05d233891 100644
--- a/src/server/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
@@ -19,7 +19,7 @@
 #define CREATUREAIIMPL_H
 
 #include "Common.h"
-#include "Platform/Define.h"
+#include "Define.h"
 #include "TemporarySummon.h"
 #include "CreatureAI.h"
 #include "SpellMgr.h"
diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
index 9db30a0a5c4..7b96e7a97d1 100644
--- a/src/server/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "PassiveAI.h"
-#include "ReactorAI.h"
-#include "CombatAI.h"
-#include "GuardAI.h"
-#include "PetAI.h"
-#include "TotemAI.h"
-#include "CreatureEventAI.h"
-#include "RandomMovementGenerator.h"
-#include "MovementGeneratorImpl.h"
+#include "CoreAI/PassiveAI.h"
+#include "CoreAI/ReactorAI.h"
+#include "CoreAI/CombatAI.h"
+#include "CoreAI/GuardAI.h"
+#include "CoreAI/PetAI.h"
+#include "CoreAI/TotemAI.h"
+#include "EventAI/CreatureEventAI.h"
+#include "Movement/MovementGenerators/RandomMovementGenerator.h"
+#include "Movement/MovementGeneratorImpl.h"
 #include "CreatureAIRegistry.h"
 #include "WaypointMovementGenerator.h"
 #include "CreatureAIFactory.h"
diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index d3fd5a8aed9..6985edaaf2b 100644
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@@ -20,7 +20,7 @@
 
 #include "Creature.h"
 #include "CreatureAISelector.h"
-#include "PassiveAI.h"
+#include "AI/CoreAI/PassiveAI.h"
 #include "Policies/SingletonImp.h"
 #include "MovementGenerator.h"
 #include "Pet.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 47c8e9e6ad8..4162a002d99 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -24,11 +24,11 @@
 #include "ObjectMgr.h"
 #include "Spell.h"
 #include "World.h"
-#include "Cell.h"
-#include "CellImpl.h"
+#include "Grids/Cells/Cell.h"
+#include "Grids/Cells/CellImpl.h"
 #include "GameEventMgr.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
 #include "InstanceData.h"
 #include "SpellMgr.h"
 #include "CreatureAIImpl.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index 83d62ca74dc..f24226ee913 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -22,10 +22,10 @@
 #include "CreatureEventAI.h"
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
-#include "ProgressBar.h"
+#include "Utilities/ProgressBar.h"
 #include "Policies/SingletonImp.h"
 #include "ObjectDefines.h"
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "ConditionMgr.h"
 
 INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 52906fb5454..8089b4d624d 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -24,8 +24,8 @@
 #include "AccountMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Util.h"
-#include "Auth/Sha1.h"
+#include "Utilities/Util.h"
+#include "Cryptography/SHA1.h"
 
 extern DatabaseType LoginDatabase;
 
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index e0a79fc71ed..9f449105005 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -20,24 +20,24 @@
 #include "DBCEnums.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "Database/DatabaseEnv.h"
 #include "Policies/SingletonImp.h"
 
 #include "AchievementMgr.h"
 #include "ArenaTeam.h"
-#include "CellImpl.h"
-#include "GameEventMgr.h"
-#include "GridNotifiersImpl.h"
-#include "Guild.h"
-#include "Language.h"
+#include "Grids/Cells/CellImpl.h"
+#include "Events/GameEventMgr.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Guilds/Guild.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
-#include "ProgressBar.h"
+#include "Utilities/ProgressBar.h"
 #include "SpellMgr.h"
 
 #include "MapManager.h"
 #include "BattleGround.h"
-#include "BattleGroundAB.h"
+#include "BattleGrounds/Zones/BattleGroundAB.h"
 #include "Map.h"
 #include "InstanceData.h"
 
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index 66e4fbc8765..b87ddd023f7 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -24,9 +24,9 @@
 #include "AddonMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Util.h"
-#include "Auth/Sha1.h"
-#include "ProgressBar.h"
+#include "Utilities/Util.h"
+#include "Cryptography/SHA1.h"
+#include "Utilities/ProgressBar.h"
 
 extern DatabaseType LoginDatabase;
 
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
index 208a09aa0b2..08e93fca232 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
@@ -2,7 +2,7 @@
 #define AUCTION_HOUSE_BOT_H
 
 #include "World.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "ItemPrototype.h"
 
 #define AHB_GREY        0
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index ddd44bbefa2..5f00d36ba45 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -20,8 +20,8 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "World.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
+#include "Packets/WorldPacket.h"
+#include "Server/WorldSession.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/SQLStorage.h"
 #include "Policies/SingletonImp.h"
@@ -30,9 +30,9 @@
 #include "AccountMgr.h"
 #include "AuctionHouseMgr.h"
 #include "Item.h"
-#include "Language.h"
-#include "Log.h"
-#include "ProgressBar.h"
+#include "Miscellaneous/Language.h"
+#include "Logging/Log.h"
+#include "Utilities/ProgressBar.h"
 #include <vector>
 
 INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index b92cec986c7..2c29986f87a 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -23,9 +23,9 @@
 
 #include "Policies/Singleton.h"
 
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 
-#include "AuctionHouseBot.h"
+#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h"
 
 class Item;
 class Player;
diff --git a/src/server/game/BattleGrounds/ArenaTeam.cpp b/src/server/game/BattleGrounds/ArenaTeam.cpp
index 4224ff6357a..b5fe5c16dfe 100644
--- a/src/server/game/BattleGrounds/ArenaTeam.cpp
+++ b/src/server/game/BattleGrounds/ArenaTeam.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 #include "ArenaTeam.h"
 #include "World.h"
diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index 5bfe2e139b6..ed8ad8b62a8 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -21,21 +21,21 @@
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 #include "ArenaTeam.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
 #include "Creature.h"
-#include "Formulas.h"
-#include "GridNotifiersImpl.h"
+#include "Miscellaneous/Formulas.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
 #include "Group.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "MapManager.h"
 #include "Object.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 namespace Trinity
 {
@@ -1962,4 +1962,4 @@ void BattleGround::RewardXPAtKill(Player* plr, Player* victim)
         if (Pet* pet = plr->GetPet())
             pet->GivePetXP(xp);
     }    
-}
\ No newline at end of file
+}
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index 3bbe8c3cf31..faf8b517f15 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -21,33 +21,33 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "Policies/SingletonImp.h"
 
 #include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
-#include "BattleGroundAV.h"
-#include "BattleGroundAB.h"
-#include "BattleGroundEY.h"
-#include "BattleGroundWS.h"
-#include "BattleGroundNA.h"
-#include "BattleGroundBE.h"
-#include "BattleGroundAA.h"
-#include "BattleGroundRL.h"
-#include "BattleGroundSA.h"
-#include "BattleGroundDS.h"
-#include "BattleGroundRV.h"
-#include "BattleGroundIC.h"
-#include "BattleGroundRB.h"
+#include "Zones/BattleGroundAV.h"
+#include "Zones/BattleGroundAB.h"
+#include "Zones/BattleGroundEY.h"
+#include "Zones/BattleGroundWS.h"
+#include "Zones/BattleGroundNA.h"
+#include "Zones/BattleGroundBE.h"
+#include "Zones/BattleGroundAA.h"
+#include "Zones/BattleGroundRL.h"
+#include "Zones/BattleGroundSA.h"
+#include "Zones/BattleGroundDS.h"
+#include "Zones/BattleGroundRV.h"
+#include "Zones/BattleGroundIC.h"
+#include "Zones/BattleGroundRB.h"
 #include "Chat.h"
 #include "Map.h"
 #include "MapInstanced.h"
 #include "MapManager.h"
 #include "Player.h"
 #include "GameEventMgr.h"
-#include "ProgressBar.h"
-#include "SharedDefines.h"
-#include "Formulas.h"
+#include "Utilities/ProgressBar.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Miscellaneous/Formulas.h"
 
 INSTANTIATE_SINGLETON_1(BattleGroundMgr);
 
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
index 56cf3ebed15..9b2dd152c5e 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
@@ -20,7 +20,7 @@
 
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
 
 BattleGroundAA::BattleGroundAA()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
index 38671e85597..549b844cd20 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
@@ -19,16 +19,16 @@
  */
 
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
 #include "Creature.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "Player.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
index 7f5482cbf16..32334840f51 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
@@ -19,13 +19,13 @@
  */
 
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
-#include "Formulas.h"
+#include "Miscellaneous/Formulas.h"
 #include "GameObject.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
 #include "SpellAuras.h"
 
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
index d6debe45ae3..e5199115bcd 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 BattleGroundBE::BattleGroundBE()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
index 9036ef83f93..8a4ca9fb497 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
@@ -18,11 +18,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
 #include "Object.h"
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 BattleGroundDS::BattleGroundDS()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
index 20f023e4c2a..a81a54f6b98 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
@@ -20,15 +20,15 @@
 
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "BattleGroundEY.h"
 #include "Creature.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "Player.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_EY_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
index 4fe23c4c821..d4bd89552be 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
@@ -21,7 +21,7 @@
 #ifndef __BATTLEGROUNDEY_H
 #define __BATTLEGROUNDEY_H
 
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 
 class BattleGround;
 
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
index 8dbcc81e5c6..8e759046f47 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
@@ -19,7 +19,7 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundIC.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 
 BattleGroundIC::BattleGroundIC()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
index 793cf13b3cb..09f8fef44de 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 BattleGroundNA::BattleGroundNA()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
index cf22154ed11..2777268a33c 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
@@ -21,7 +21,7 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRB.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 
 BattleGroundRB::BattleGroundRB()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
index ef2ec3cfa94..94374ace289 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 BattleGroundRL::BattleGroundRL()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
index fcc53dbbcf9..32e578ae5ed 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
@@ -21,9 +21,9 @@
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
 #include "ObjectAccessor.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "GameObject.h"
 
 BattleGroundRV::BattleGroundRV()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
index ccde43ce948..f67ad9b3300 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
@@ -18,11 +18,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Player.h"
 #include "GameObject.h"
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 
 BattleGroundSA::BattleGroundSA()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
index 71872511274..2eb94ca9958 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
@@ -22,13 +22,13 @@
 #include "BattleGroundWS.h"
 #include "Creature.h"
 #include "GameObject.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "Player.h"
 #include "World.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here
 enum BG_WSG_Rewards
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index d0b5923e30e..cafa814e1c9 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -27,9 +27,9 @@
 
 #include "Common.h"
 
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Player.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 enum ChatNotify
 {
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 58e6f6214c8..6aa42995663 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -21,7 +21,7 @@
 #ifndef TRINITYCORE_CHAT_H
 #define TRINITYCORE_CHAT_H
 
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 
 class ChatHandler;
 class WorldSession;
diff --git a/src/server/game/Chat/Commands/Debugcmds.cpp b/src/server/game/Chat/Commands/Debugcmds.cpp
index ee8c623c3d0..247e67ed135 100644
--- a/src/server/game/Chat/Commands/Debugcmds.cpp
+++ b/src/server/game/Chat/Commands/Debugcmds.cpp
@@ -20,22 +20,22 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "Vehicle.h"
 #include "Player.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Chat.h"
-#include "Log.h"
+#include "Logging/Log.h"
 #include "Unit.h"
 #include "GossipDef.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "BattleGroundMgr.h"
 #include <fstream>
 #include "ObjectMgr.h"
-#include "Cell.h"
-#include "CellImpl.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
+#include "Grids/Cells/Cell.h"
+#include "Grids/Cells/CellImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
 #include "SpellMgr.h"
 #include "ScriptMgr.h"
 
diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
index ed021ac00d4..fd6dc165fc6 100644
--- a/src/server/game/Chat/Commands/Level0.cpp
+++ b/src/server/game/Chat/Commands/Level0.cpp
@@ -22,14 +22,14 @@
 #include "Database/DatabaseEnv.h"
 #include "World.h"
 #include "Player.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Chat.h"
 #include "ObjectAccessor.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "AccountMgr.h"
 #include "SystemConfig.h"
 #include "revision.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 bool ChatHandler::HandleHelpCommand(const char* args)
 {
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
index b14814e07a1..f4404bce447 100644
--- a/src/server/game/DataStores/DBCStores.h
+++ b/src/server/game/DataStores/DBCStores.h
@@ -20,8 +20,8 @@
 #define TRINITY_DBCSTORES_H
 
 #include "Common.h"
-#include "Database/DBCStore.h"
-#include "DBCStructure.h"
+#include "DataStores/DBCStore.h"
+#include "DataStores/DBCStructure.h"
 
 #include <list>
 
diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h
index c1b55443852..a5461029c8d 100644
--- a/src/server/game/DungeonFinding/LFG.h
+++ b/src/server/game/DungeonFinding/LFG.h
@@ -19,7 +19,7 @@
 #ifndef _LFG_H
 #define _LFG_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Object.h"
 
 enum LfgRoles
diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h
index bab95e99d14..17c8e597d87 100644
--- a/src/server/game/Entities/Corpse/Corpse.h
+++ b/src/server/game/Entities/Corpse/Corpse.h
@@ -23,7 +23,7 @@
 
 #include "Object.h"
 #include "Database/DatabaseEnv.h"
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "LootMgr.h"
 
 enum CorpseType
diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
index ce2049cc23f..42ca4cc4ab3 100644
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include "QuestDef.h"
-#include "NPCHandler.h"
+#include "Server/Protocol/Handlers/NPCHandler.h"
 
 class WorldSession;
 
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index 2154adf80c0..be760e9bf41 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -22,7 +22,7 @@
 #define TRINITYCORE_GAMEOBJECT_H
 
 #include "Common.h"
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "Object.h"
 #include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 314b122d346..983d10f5e02 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -34,12 +34,12 @@
 #include "Server/WorldSession.h"
 #include "Pet.h"
 #include "MapReference.h"
-#include "Util.h"                                           // for Tokens typedef
-#include "AchievementMgr.h"
-#include "ReputationMgr.h"
-#include "BattleGround.h"
-#include "DBCEnums.h"
-#include "LFG.h"
+#include "Utilities/Util.h"                                           // for Tokens typedef
+#include "Achievements/AchievementMgr.h"
+#include "Reputation/ReputationMgr.h"
+#include "BattleGrounds/BattleGround.h"
+#include "DataStores/DBCEnums.h"
+#include "DungeonFinding/LFG.h"
 
 #include<string>
 #include<vector>
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 2c3e41f5f20..2ad8fd3de59 100644
--- a/src/server/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
@@ -22,8 +22,8 @@
 #define TRINITY_GAMEEVENT_MGR_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Platform/Define.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 
 #define max_ge_check_delay DAY  // 1 day in seconds
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 79b6ffdd0eb..d8a0f81c698 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -21,18 +21,18 @@
 #ifndef _OBJECTMGR_H
 #define _OBJECTMGR_H
 
-#include "Log.h"
+#include "Logging/Log.h"
 #include "Object.h"
-#include "Bag.h"
+#include "Entities/Item/Container/Bag.h"
 #include "Creature.h"
 #include "Player.h"
-#include "DynamicObject.h"
+#include "Entities/DynamicObject/DynamicObject.h"
 #include "GameObject.h"
-#include "Corpse.h"
+#include "Entities/Corpse/Corpse.h"
 #include "QuestDef.h"
-#include "Path.h"
+#include "Movement/Waypoints/Path.h"
 #include "ItemPrototype.h"
-#include "NPCHandler.h"
+#include "Server/Protocol/Handlers/NPCHandler.h"
 #include "Database/DatabaseEnv.h"
 #include "Mail.h"
 #include "Map.h"
diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h
index 03fa0f5b813..191ace29d34 100644
--- a/src/server/game/Grids/GridLoader.h
+++ b/src/server/game/Grids/GridLoader.h
@@ -32,9 +32,9 @@
   GridLoader manages the grid (both local and remote).
  */
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Grid.h"
-#include "TypeContainerVisitor.h"
+#include "Dynamic/TypeContainerVisitor.h"
 
 template
 <
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index b0abf0aae79..9cbcb078128 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -21,13 +21,13 @@
 #ifndef TRINITY_GRIDNOTIFIERS_H
 #define TRINITY_GRIDNOTIFIERS_H
 
-#include "ObjectGridLoader.h"
-#include "UpdateData.h"
+#include "Grids/ObjectGridLoader.h"
+#include "Updates/UpdateData.h"
 #include <iostream>
 
-#include "Corpse.h"
+#include "Entities/Corpse/Corpse.h"
 #include "Object.h"
-#include "DynamicObject.h"
+#include "Entities/DynamicObject/DynamicObject.h"
 #include "GameObject.h"
 #include "Player.h"
 #include "Unit.h"
diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
index 26a9c0bd328..43cb94540c3 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
@@ -22,10 +22,10 @@
 #define TRINITY_GRIDNOTIFIERSIMPL_H
 
 #include "GridNotifiers.h"
-#include "WorldPacket.h"
-#include "Corpse.h"
+#include "Packets/WorldPacket.h"
+#include "Corpse/Corpse.h"
 #include "Player.h"
-#include "UpdateData.h"
+#include "Updates/UpdateData.h"
 #include "CreatureAI.h"
 #include "SpellAuras.h"
 
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index e890bf8d482..90e3383fbc8 100644
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -21,11 +21,11 @@
 #ifndef TRINITY_OBJECTGRIDLOADER_H
 #define TRINITY_OBJECTGRIDLOADER_H
 
-#include "Utilities/TypeList.h"
-#include "Platform/Define.h"
-#include "GameSystem/GridLoader.h"
-#include "GridDefines.h"
-#include "Cell.h"
+#include "Dynamic/TypeList.h"
+#include "Define.h"
+#include "Grids/GridLoader.h"
+#include "Grids/GridDefines.h"
+#include "Grids/Cells/Cell.h"
 
 class ObjectWorldLoader;
 
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index d67364966d6..2d3ba0d3b75 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -31,7 +31,7 @@
 #include "MapManager.h"
 #include "MapInstanced.h"
 #include "InstanceSaveMgr.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 #include "GridNotifiersImpl.h"
 #include "Config/ConfigEnv.h"
 #include "Transports.h"
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 91cd3d9ebe6..c8f6c756f2c 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -22,12 +22,12 @@
 #ifndef __InstanceSaveMgr_H
 #define __InstanceSaveMgr_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include <list>
 #include <map>
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "ObjectDefines.h"
diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h
index 7cd4fcde76c..c32be406af0 100644
--- a/src/server/game/Maps/MapReference.h
+++ b/src/server/game/Maps/MapReference.h
@@ -19,7 +19,7 @@
 #ifndef _MAPREFERENCE_H
 #define _MAPREFERENCE_H
 
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedReference/Reference.h"
 #include "Map.h"
 
 class MapReference : public Reference<Map, Player>
diff --git a/src/server/game/Movement/DestinationHolder.h b/src/server/game/Movement/DestinationHolder.h
index e09a153615c..7adf6f4cb11 100644
--- a/src/server/game/Movement/DestinationHolder.h
+++ b/src/server/game/Movement/DestinationHolder.h
@@ -21,8 +21,8 @@
 #ifndef TRINITY_DESTINATION_HOLDER_H
 #define TRINITY_DESTINATION_HOLDER_H
 
-#include "Platform/Define.h"
-#include "Timer.h"
+#include "Define.h"
+#include "Utilities/Timer.h"
 
 class WorldObject;
 class Map;
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index ab7a52c483e..fa7291b8601 100644
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_MOVEMENTGENERATOR_H
 #define TRINITY_MOVEMENTGENERATOR_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include "Dynamic/ObjectRegistry.h"
 #include "Dynamic/FactoryHolder.h"
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index 4b74e80e168..9216aac5d0c 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -29,8 +29,8 @@
 
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
-#include "WaypointManager.h"
-#include "Path.h"
+#include "Movement/Waypoints/WaypointManager.h"
+#include "Movement/Waypoints/Path.h"
 #include "Traveller.h"
 
 #include "Player.h"
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h
index cb42e4138e4..3587d270131 100644
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h
@@ -7,6 +7,6 @@
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
 #include "Database/SQLStorage.h"
-#include "Opcodes.h"
-#include "SharedDefines.h"
+#include "Server/Protocol/Opcodes.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index 4c0fd778a4d..9fc0efdf850 100644
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -20,10 +20,10 @@
 #define __TRINITY_REPUTATION_MGR_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Language.h"
-#include "DBCStructure.h"
-#include "QueryResult.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Miscellaneous/Language.h"
+#include "DataStores/DBCStructure.h"
+#include "Database/QueryResult.h"
 #include <map>
 
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index ed7200d5786..1814148e5e5 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -9,9 +9,9 @@
 #define SC_SCRIPTMGR_H
 
 #include "Common.h"
-#include "Platform/CompilerDefs.h"
+#include "CompilerDefs.h"
 #include "DBCStructure.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 
 class Player;
 class Creature;
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index a987e35e65d..ef21e4a14b3 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -21,8 +21,8 @@
 #ifndef __SPELL_H
 #define __SPELL_H
 
-#include "GridDefines.h"
-#include "SharedDefines.h"
+#include "Grids/GridDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 
 class Unit;
 class Player;
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index 224760029e7..b6768348417 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -24,13 +24,13 @@
 // For static or at-server-startup loaded spell data
 // For more high level function for sSpellStore data
 
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "SpellAuraDefines.h"
 #include "DBCStructure.h"
 #include "DBCStores.h"
 #include "Database/SQLStorage.h"
 
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 
 #include "Player.h"