* More cleanup

--HG--
branch : trunk

69 files changed, 509 insertions, 509 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"
 
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index b9dfbc5fab2..2a2e2c84e19 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -4,8 +4,8 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
 SET(scripts_STAT_SRCS
-   ../game/Scripting/ScriptedPch.cpp
-   ../game/Scripting/ScriptedPch.h
+   ../game/PrecompiledHeaders/ScriptPCH.cpp
+   ../game/PrecompiledHeaders/ScriptPCH.h
    ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
    ../game/AI/ScriptedAI/ScriptedEscortAI.h
    ../game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -19,176 +19,176 @@ SET(scripts_STAT_SRCS
    ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
    ../game/AI/ScriptedAI/ScriptedSimpleAI.h
    Custom/on_events.cpp
-   EasternKingdoms/alterac_valley/alterac_valley.cpp
-   EasternKingdoms/alterac_valley/boss_balinda.cpp
-   EasternKingdoms/alterac_valley/boss_drekthar.cpp
-   EasternKingdoms/alterac_valley/boss_galvangar.cpp
-   EasternKingdoms/alterac_valley/boss_vanndar.cpp
-   EasternKingdoms/blackrock_depths/blackrock_depths.cpp
-   EasternKingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
-   EasternKingdoms/blackrock_depths/boss_anubshiah.cpp
-   EasternKingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
-   EasternKingdoms/blackrock_depths/boss_general_angerforge.cpp
-   EasternKingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
-   EasternKingdoms/blackrock_depths/boss_grizzle.cpp
-   EasternKingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
-   EasternKingdoms/blackrock_depths/boss_magmus.cpp
-   EasternKingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
-   EasternKingdoms/blackrock_depths/boss_tomb_of_seven.cpp
-   EasternKingdoms/blackrock_depths/blackrock_depths.h
-   EasternKingdoms/blackrock_depths/instance_blackrock_depths.cpp
-   EasternKingdoms/blackrock_spire/blackrock_spire.cpp
-   EasternKingdoms/blackrock_spire/boss_drakkisath.cpp
-   EasternKingdoms/blackrock_spire/boss_gyth.cpp
-   EasternKingdoms/blackrock_spire/boss_halycon.cpp
-   EasternKingdoms/blackrock_spire/boss_highlord_omokk.cpp
-   EasternKingdoms/blackrock_spire/boss_mother_smolderweb.cpp
-   EasternKingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
-   EasternKingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
-   EasternKingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
-   EasternKingdoms/blackrock_spire/boss_rend_blackhand.cpp
-   EasternKingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
-   EasternKingdoms/blackrock_spire/boss_the_beast.cpp
-   EasternKingdoms/blackrock_spire/boss_warmaster_voone.cpp
-   EasternKingdoms/blackrock_spire/blackrock_spire.h
-   EasternKingdoms/blackrock_spire/instance_blackrock_spire.cpp
-   EasternKingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
-   EasternKingdoms/blackwing_lair/boss_chromaggus.cpp
-   EasternKingdoms/blackwing_lair/boss_ebonroc.cpp
-   EasternKingdoms/blackwing_lair/boss_firemaw.cpp
-   EasternKingdoms/blackwing_lair/boss_flamegor.cpp
-   EasternKingdoms/blackwing_lair/boss_nefarian.cpp
-   EasternKingdoms/blackwing_lair/boss_razorgore.cpp
-   EasternKingdoms/blackwing_lair/boss_vaelastrasz.cpp
-   EasternKingdoms/blackwing_lair/boss_victor_nefarius.cpp
-   EasternKingdoms/blackwing_lair/instance_blackwing_lair.cpp
-   EasternKingdoms/deadmines/boss_mr_smite.cpp
-   EasternKingdoms/deadmines/deadmines.h
-   EasternKingdoms/deadmines/deadmines.cpp
-   EasternKingdoms/deadmines/instance_deadmines.cpp
-   EasternKingdoms/gnomeregan/gnomeregan.h
-   EasternKingdoms/gnomeregan/gnomeregan.cpp
-   EasternKingdoms/gnomeregan/instance_gnomeregan.cpp
-   EasternKingdoms/karazhan/boss_curator.cpp
-   EasternKingdoms/karazhan/boss_maiden_of_virtue.cpp
-   EasternKingdoms/karazhan/boss_midnight.cpp
-   EasternKingdoms/karazhan/boss_moroes.cpp
-   EasternKingdoms/karazhan/boss_netherspite.cpp
-   EasternKingdoms/karazhan/boss_nightbane.cpp
-   EasternKingdoms/karazhan/boss_prince_malchezaar.cpp
-   EasternKingdoms/karazhan/boss_shade_of_aran.cpp
-   EasternKingdoms/karazhan/boss_terestian_illhoof.cpp
-   EasternKingdoms/karazhan/bosses_opera.cpp
-   EasternKingdoms/karazhan/karazhan.h
-   EasternKingdoms/karazhan/instance_karazhan.cpp
-   EasternKingdoms/karazhan/karazhan.cpp
-   EasternKingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
-   EasternKingdoms/magisters_terrace/boss_priestess_delrissa.cpp
-   EasternKingdoms/magisters_terrace/boss_selin_fireheart.cpp
-   EasternKingdoms/magisters_terrace/boss_vexallus.cpp
-   EasternKingdoms/magisters_terrace/magisters_terrace.h
-   EasternKingdoms/magisters_terrace/instance_magisters_terrace.cpp
-   EasternKingdoms/magisters_terrace/magisters_terrace.cpp
-   EasternKingdoms/molten_core/boss_baron_geddon.cpp
-   EasternKingdoms/molten_core/boss_garr.cpp
-   EasternKingdoms/molten_core/boss_gehennas.cpp
-   EasternKingdoms/molten_core/boss_golemagg.cpp
-   EasternKingdoms/molten_core/boss_lucifron.cpp
-   EasternKingdoms/molten_core/boss_magmadar.cpp
-   EasternKingdoms/molten_core/boss_majordomo_executus.cpp
-   EasternKingdoms/molten_core/boss_ragnaros.cpp
-   EasternKingdoms/molten_core/boss_shazzrah.cpp
-   EasternKingdoms/molten_core/boss_sulfuron_harbinger.cpp
-   EasternKingdoms/molten_core/molten_core.h
-   EasternKingdoms/molten_core/instance_molten_core.cpp
-   EasternKingdoms/molten_core/molten_core.cpp
-   EasternKingdoms/scarlet_enclave/the_scarlet_enclave.cpp
-   EasternKingdoms/scarlet_enclave/chapter1.cpp
-   EasternKingdoms/scarlet_enclave/chapter2.cpp
-   EasternKingdoms/scarlet_enclave/chapter5.cpp
-   EasternKingdoms/scarlet_monastery/boss_arcanist_doan.cpp
-   EasternKingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
-   EasternKingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
-   EasternKingdoms/scarlet_monastery/boss_herod.cpp
-   EasternKingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
-   EasternKingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
-   EasternKingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
-   EasternKingdoms/scarlet_monastery/boss_scorn.cpp
-   EasternKingdoms/scarlet_monastery/boss_headless_horseman.cpp
-   EasternKingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
-   EasternKingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
-   EasternKingdoms/scarlet_monastery/scarlet_monastery.h
-   EasternKingdoms/scholomance/boss_darkmaster_gandling.cpp
-   EasternKingdoms/scholomance/boss_death_knight_darkreaver.cpp
-   EasternKingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
-   EasternKingdoms/scholomance/boss_illucia_barov.cpp
-   EasternKingdoms/scholomance/boss_instructor_malicia.cpp
-   EasternKingdoms/scholomance/boss_jandice_barov.cpp
-   EasternKingdoms/scholomance/boss_kormok.cpp
-   EasternKingdoms/scholomance/boss_lord_alexei_barov.cpp
-   EasternKingdoms/scholomance/boss_lorekeeper_polkelt.cpp
-   EasternKingdoms/scholomance/boss_ras_frostwhisper.cpp
-   EasternKingdoms/scholomance/boss_the_ravenian.cpp
-   EasternKingdoms/scholomance/boss_vectus.cpp
-   EasternKingdoms/scholomance/scholomance.h
-   EasternKingdoms/scholomance/instance_scholomance.cpp
-   EasternKingdoms/shadowfang_keep/shadowfang_keep.h
-   EasternKingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
-   EasternKingdoms/shadowfang_keep/shadowfang_keep.cpp
-   EasternKingdoms/stratholme/boss_baron_rivendare.cpp
-   EasternKingdoms/stratholme/boss_baroness_anastari.cpp
-   EasternKingdoms/stratholme/boss_cannon_master_willey.cpp
-   EasternKingdoms/stratholme/boss_dathrohan_balnazzar.cpp
-   EasternKingdoms/stratholme/boss_magistrate_barthilas.cpp
-   EasternKingdoms/stratholme/boss_maleki_the_pallid.cpp
-   EasternKingdoms/stratholme/boss_nerubenkan.cpp
-   EasternKingdoms/stratholme/boss_order_of_silver_hand.cpp
-   EasternKingdoms/stratholme/boss_postmaster_malown.cpp
-   EasternKingdoms/stratholme/boss_ramstein_the_gorger.cpp
-   EasternKingdoms/stratholme/boss_timmy_the_cruel.cpp
-   EasternKingdoms/stratholme/stratholme.h
-   EasternKingdoms/stratholme/instance_stratholme.cpp
-   EasternKingdoms/stratholme/stratholme.cpp
-   EasternKingdoms/sunken_temple/sunken_temple.h
-   EasternKingdoms/sunken_temple/instance_sunken_temple.cpp
-   EasternKingdoms/sunken_temple/sunken_temple.cpp
-   EasternKingdoms/sunwell_plateau/boss_kiljaeden.cpp
-   EasternKingdoms/sunwell_plateau/boss_muru.cpp
-   EasternKingdoms/sunwell_plateau/boss_eredar_twins.cpp
-   EasternKingdoms/sunwell_plateau/boss_felmyst.cpp
-   EasternKingdoms/sunwell_plateau/boss_brutallus.cpp
-   EasternKingdoms/sunwell_plateau/boss_kalecgos.cpp
-   EasternKingdoms/sunwell_plateau/sunwell_plateau.cpp
-   EasternKingdoms/sunwell_plateau/sunwell_plateau.h
-   EasternKingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
-   EasternKingdoms/uldaman/boss_archaedas.cpp
-   EasternKingdoms/uldaman/instance_uldaman.cpp
-   EasternKingdoms/uldaman/boss_ironaya.cpp
-   EasternKingdoms/uldaman/uldaman.cpp
-   EasternKingdoms/zulaman/boss_akilzon.cpp
-   EasternKingdoms/zulaman/boss_halazzi.cpp
-   EasternKingdoms/zulaman/boss_hexlord.cpp
-   EasternKingdoms/zulaman/boss_janalai.cpp
-   EasternKingdoms/zulaman/boss_nalorakk.cpp
-   EasternKingdoms/zulaman/boss_zuljin.cpp
-   EasternKingdoms/zulaman/zulaman.h
-   EasternKingdoms/zulaman/instance_zulaman.cpp
-   EasternKingdoms/zulaman/zulaman.cpp
-   EasternKingdoms/zulgurub/boss_arlokk.cpp
-   EasternKingdoms/zulgurub/boss_gahzranka.cpp
-   EasternKingdoms/zulgurub/boss_grilek.cpp
-   EasternKingdoms/zulgurub/boss_hakkar.cpp
-   EasternKingdoms/zulgurub/boss_hazzarah.cpp
-   EasternKingdoms/zulgurub/boss_jeklik.cpp
-   EasternKingdoms/zulgurub/boss_jindo.cpp
-   EasternKingdoms/zulgurub/boss_mandokir.cpp
-   EasternKingdoms/zulgurub/boss_marli.cpp
-   EasternKingdoms/zulgurub/boss_renataki.cpp
-   EasternKingdoms/zulgurub/boss_thekal.cpp
-   EasternKingdoms/zulgurub/boss_venoxis.cpp
-   EasternKingdoms/zulgurub/boss_wushoolay.cpp
-   EasternKingdoms/zulgurub/zulgurub.h
-   EasternKingdoms/zulgurub/instance_zulgurub.cpp
+   EasternKingdoms/AlteracValley/alterac_valley.cpp
+   EasternKingdoms/AlteracValley/boss_balinda.cpp
+   EasternKingdoms/AlteracValley/boss_drekthar.cpp
+   EasternKingdoms/AlteracValley/boss_galvangar.cpp
+   EasternKingdoms/AlteracValley/boss_vanndar.cpp
+   EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+   EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
+   EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
+   EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+   EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+   EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
+   EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+   EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+   EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+   EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
+   EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+   EasternKingdoms/BlackrockDepths//blackrock_depths.h
+   EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+   EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
+   EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
+   EasternKingdoms/BlackrockSpire/boss_gyth.cpp
+   EasternKingdoms/BlackrockSpire/boss_halycon.cpp
+   EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
+   EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
+   EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+   EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
+   EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
+   EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
+   EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+   EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
+   EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
+   EasternKingdoms/BlackrockSpire/blackrock_spire.h
+   EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+   EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+   EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
+   EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
+   EasternKingdoms/BlackwingLair/boss_firemaw.cpp
+   EasternKingdoms/BlackwingLair/boss_flamegor.cpp
+   EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+   EasternKingdoms/BlackwingLair/boss_razorgore.cpp
+   EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+   EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+   EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
+   EasternKingdoms/Deadmines/boss_mr_smite.cpp
+   EasternKingdoms/Deadmines/deadmines.h
+   EasternKingdoms/Deadmines/deadmines.cpp
+   EasternKingdoms/Deadmines/instance_deadmines.cpp
+   EasternKingdoms/Gnomeregan/gnomeregan.h
+   EasternKingdoms/Gnomeregan/gnomeregan.cpp
+   EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+   EasternKingdoms/Karazhan/boss_curator.cpp
+   EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+   EasternKingdoms/Karazhan/boss_midnight.cpp
+   EasternKingdoms/Karazhan/boss_moroes.cpp
+   EasternKingdoms/Karazhan/boss_netherspite.cpp
+   EasternKingdoms/Karazhan/boss_nightbane.cpp
+   EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+   EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+   EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+   EasternKingdoms/Karazhan/bosses_opera.cpp
+   EasternKingdoms/Karazhan/karazhan.h
+   EasternKingdoms/Karazhan/instance_karazhan.cpp
+   EasternKingdoms/Karazhan/karazhan.cpp
+   EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+   EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+   EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+   EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+   EasternKingdoms/MagistersTerrace/magisters_terrace.h
+   EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+   EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+   EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
+   EasternKingdoms/MoltenCore/boss_garr.cpp
+   EasternKingdoms/MoltenCore/boss_gehennas.cpp
+   EasternKingdoms/MoltenCore/boss_golemagg.cpp
+   EasternKingdoms/MoltenCore/boss_lucifron.cpp
+   EasternKingdoms/MoltenCore/boss_magmadar.cpp
+   EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+   EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+   EasternKingdoms/MoltenCore/boss_shazzrah.cpp
+   EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
+   EasternKingdoms/MoltenCore/molten_core.h
+   EasternKingdoms/MoltenCore/instance_molten_core.cpp
+   EasternKingdoms/MoltenCore/molten_core.cpp
+   EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+   EasternKingdoms/ScarletEnclave/chapter1.cpp
+   EasternKingdoms/ScarletEnclave/chapter2.cpp
+   EasternKingdoms/ScarletEnclave/chapter5.cpp
+   EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+   EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+   EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+   EasternKingdoms/ScarletMonastery/boss_herod.cpp
+   EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+   EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+   EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+   EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+   EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+   EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+   EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+   EasternKingdoms/ScarletMonastery/scarlet_monastery.h
+   EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+   EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
+   EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+   EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+   EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+   EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+   EasternKingdoms/Scholomance/boss_kormok.cpp
+   EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+   EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+   EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+   EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+   EasternKingdoms/Scholomance/boss_vectus.cpp
+   EasternKingdoms/Scholomance/scholomance.h
+   EasternKingdoms/Scholomance/instance_scholomance.cpp
+   EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+   EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+   EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+   EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+   EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+   EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+   EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+   EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+   EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+   EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+   EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+   EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+   EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+   EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+   EasternKingdoms/Stratholme/stratholme.h
+   EasternKingdoms/Stratholme/instance_stratholme.cpp
+   EasternKingdoms/Stratholme/stratholme.cpp
+   EasternKingdoms/SunkenTemple/sunken_temple.h
+   EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+   EasternKingdoms/SunkenTemple/sunken_temple.cpp
+   EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+   EasternKingdoms/SunwellPlateau/boss_muru.cpp
+   EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+   EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+   EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+   EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+   EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
+   EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+   EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+   EasternKingdoms/Uldaman/boss_archaedas.cpp
+   EasternKingdoms/Uldaman/instance_uldaman.cpp
+   EasternKingdoms/Uldaman/boss_ironaya.cpp
+   EasternKingdoms/Uldaman/uldaman.cpp
+   EasternKingdoms/ZulAman/boss_akilzon.cpp
+   EasternKingdoms/ZulAman/boss_halazzi.cpp
+   EasternKingdoms/ZulAman/boss_hexlord.cpp
+   EasternKingdoms/ZulAman/boss_janalai.cpp
+   EasternKingdoms/ZulAman/boss_nalorakk.cpp
+   EasternKingdoms/ZulAman/boss_zuljin.cpp
+   EasternKingdoms/ZulAman/zulaman.h
+   EasternKingdoms/ZulAman/instance_zulaman.cpp
+   EasternKingdoms/ZulAman/zulaman.cpp
+   EasternKingdoms/ZulGurub/boss_arlokk.cpp
+   EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+   EasternKingdoms/ZulGurub/boss_grilek.cpp
+   EasternKingdoms/ZulGurub/boss_hakkar.cpp
+   EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+   EasternKingdoms/ZulGurub/boss_jeklik.cpp
+   EasternKingdoms/ZulGurub/boss_jindo.cpp
+   EasternKingdoms/ZulGurub/boss_mandokir.cpp
+   EasternKingdoms/ZulGurub/boss_marli.cpp
+   EasternKingdoms/ZulGurub/boss_renataki.cpp
+   EasternKingdoms/ZulGurub/boss_thekal.cpp
+   EasternKingdoms/ZulGurub/boss_venoxis.cpp
+   EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+   EasternKingdoms/ZulGurub/zulgurub.h
+   EasternKingdoms/ZulGurub/instance_zulgurub.cpp
    EasternKingdoms/alterac_mountains.cpp
    EasternKingdoms/arathi_highlands.cpp
    EasternKingdoms/blasted_lands.cpp
@@ -219,82 +219,82 @@ SET(scripts_STAT_SRCS
    Examples/example_escort.cpp
    Examples/example_gossip_codebox.cpp
    Examples/example_misc.cpp
-   Kalimdor/blackfathom_depths/boss_gelihast.cpp
-   Kalimdor/blackfathom_depths/boss_kelris.cpp
-   Kalimdor/blackfathom_depths/boss_aku_mai.cpp
-   Kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
-   Kalimdor/blackfathom_depths/blackfathom_deeps.cpp
-   Kalimdor/blackfathom_depths/blackfathom_deeps.h
-   Kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
-   Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
-   Kalimdor/caverns_of_time/dark_portal/dark_portal.h
-   Kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
-   Kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
-   Kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
-   Kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
-   Kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
-   Kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
-   Kalimdor/caverns_of_time/hyjal/hyjal.h
-   Kalimdor/caverns_of_time/hyjal/hyjal.cpp
-   Kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
-   Kalimdor/caverns_of_time/hyjal/hyjal_trash.h
-   Kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
-   Kalimdor/caverns_of_time/hyjal/hyjalAI.h
-   Kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
-   Kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
-   Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
-   Kalimdor/maraudon/boss_celebras_the_cursed.cpp
-   Kalimdor/maraudon/boss_landslide.cpp
-   Kalimdor/maraudon/boss_noxxion.cpp
-   Kalimdor/maraudon/boss_princess_theradras.cpp
-   Kalimdor/onyxias_lair/boss_onyxia.cpp
-   Kalimdor/onyxias_lair/instance_onyxias_lair.cpp
-   Kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
-   Kalimdor/razorfen_downs/razorfen_downs.cpp
-   Kalimdor/razorfen_downs/instance_razorfen_downs.cpp
-   Kalimdor/razorfen_downs/razorfen_downs.h
-   Kalimdor/razorfen_kraul/razorfen_kraul.h
-   Kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
-   Kalimdor/razorfen_kraul/razorfen_kraul.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
-   Kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
-   Kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
-   Kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
-   Kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
-   Kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
-   Kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
-   Kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
-   Kalimdor/wailing_caverns/wailing_caverns.h
-   Kalimdor/wailing_caverns/instance_wailing_caverns.cpp
-   Kalimdor/wailing_caverns/wailing_caverns.cpp
-   Kalimdor/zulfarrak/zulfarrak.cpp
-   Kalimdor/zulfarrak/instance_zulfarrak.cpp
+   Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+   Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+   Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+   Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+   Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+   Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal.h
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal_trash.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal_trash.h
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjalAI.cpp
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjalAI.h
+   Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_BattleForMountHyjal.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/instance_CullingOfStratholme.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/CullingOfStratholme.cpp
+   Kalimdor/CavernsOfTime/CullingOfStratholme/CullingOfStratholme.h
+   Kalimdor/CavernsOfTime/DarkPortal/DarkPortal.h
+   Kalimdor/CavernsOfTime/DarkPortal/instance_DarkPortal.cpp
+   Kalimdor/CavernsOfTime/DarkPortal/DarkPortal.cpp
+   Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
+   Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+   Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/EscapeFromDurnholdeKeep.h
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_EscapeFromDurnholdeKeep.cpp
+   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/EscapeFromDurnholdeKeep.cpp
+   Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+   Kalimdor/Maraudon/boss_landslide.cpp
+   Kalimdor/Maraudon/boss_noxxion.cpp
+   Kalimdor/Maraudon/boss_princess_theradras.cpp
+   Kalimdor/OnyxiasLair/boss_onyxia.cpp
+   Kalimdor/OnyxiasLair/instance_OnyxiasLair.cpp
+   Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+   Kalimdor/RazorfenDowns/RazorfenDowns.cpp
+   Kalimdor/RazorfenDowns/instance_RazorfenDowns.cpp
+   Kalimdor/RazorfenDowns/RazorfenDowns.h
+   Kalimdor/RazorfenKraul/RazorfenKraul.h
+   Kalimdor/RazorfenKraul/instance_RazorfenKraul.cpp
+   Kalimdor/RazorfenKraul/RazorfenKraul.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+   Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+   Kalimdor/RuinsOfAhnQiraj/RuinsOfAhnQiraj.h
+   Kalimdor/RuinsOfAhnQiraj/instance_RuinsOfAhnQiraj.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+   Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+   Kalimdor/TempleOfAhnQiraj/TempleOfAhnQiraj.h
+   Kalimdor/TempleOfAhnQiraj/instance_TempleOfAhnQiraj.cpp
+   Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+   Kalimdor/WailingCaverns/WailingCaverns.h
+   Kalimdor/WailingCaverns/instance_WailingCaverns.cpp
+   Kalimdor/WailingCaverns/WailingCaverns.cpp
+   Kalimdor/ZulFarrak/ZulFarrak.cpp
+   Kalimdor/ZulFarrak/instance_ZulFarrak.cpp
    Kalimdor/ashenvale.cpp
    Kalimdor/azshara.cpp
    Kalimdor/azuremyst_isle.cpp
@@ -318,88 +318,88 @@ SET(scripts_STAT_SRCS
    Kalimdor/thunder_bluff.cpp
    Kalimdor/ungoro_crater.cpp
    Kalimdor/winterspring.cpp
-   Northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
-   Northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
-   Northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
-   Northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
-   Northrend/azjol_nerub/azjol_nerub/azjol_nerub.h
-   Northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
-   Northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
-   Northrend/azjol_nerub/ahnkahet/ahnkahet.h
-   Northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
-   Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
-   Northrend/draktharon_keep/instance_drak_tharon_keep.cpp
-   Northrend/draktharon_keep/boss_trollgore.cpp
-   Northrend/draktharon_keep/boss_novos.cpp
-   Northrend/draktharon_keep/boss_dred.cpp
-   Northrend/draktharon_keep/boss_tharon_ja.cpp
-   Northrend/draktharon_keep/drak_tharon_keep.h
-   Northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
-   Northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp
-   Northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
-   Northrend/frozen_halls/forge_of_souls/forge_of_souls.h
-   Northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
-   Northrend/frozen_halls/halls_of_reflection/boss_falric.cpp
-   Northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp
-   Northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
-   Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
-   Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h
-   Northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
-   Northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp
-   Northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
-   Northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
-   Northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp
-   Northrend/frozen_halls/pit_of_saron/pit_of_saron.h
-   Northrend/gundrak/instance_gundrak.cpp
-   Northrend/gundrak/boss_slad_ran.cpp
-   Northrend/gundrak/boss_moorabi.cpp
-   Northrend/gundrak/boss_drakkari_colossus.cpp
-   Northrend/gundrak/boss_gal_darah.cpp
-   Northrend/gundrak/boss_eck.cpp
-   Northrend/gundrak/gundrak.h
-   Northrend/naxxramas/boss_anubrekhan.cpp
-   Northrend/naxxramas/boss_faerlina.cpp
-   Northrend/naxxramas/boss_gluth.cpp
-   Northrend/naxxramas/boss_gothik.cpp
-   Northrend/naxxramas/boss_grobbulus.cpp
-   Northrend/naxxramas/boss_heigan.cpp
-   Northrend/naxxramas/boss_kelthuzad.cpp
-   Northrend/naxxramas/boss_four_horsemen.cpp
-   Northrend/naxxramas/boss_loatheb.cpp
-   Northrend/naxxramas/boss_maexxna.cpp
-   Northrend/naxxramas/boss_noth.cpp
-   Northrend/naxxramas/boss_patchwerk.cpp
-   Northrend/naxxramas/boss_razuvious.cpp
-   Northrend/naxxramas/boss_sapphiron.cpp
-   Northrend/naxxramas/boss_thaddius.cpp
-   Northrend/naxxramas/naxxramas.h
-   Northrend/naxxramas/instance_naxxramas.cpp
-   Northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
-   Northrend/nexus/eye_of_eternity/boss_malygos.cpp
-   Northrend/nexus/eye_of_eternity/eye_of_eternity.h
-   Northrend/nexus/nexus/instance_nexus.cpp
-   Northrend/nexus/nexus/boss_magus_telestra.cpp
-   Northrend/nexus/nexus/boss_anomalus.cpp
-   Northrend/nexus/nexus/boss_ormorok.cpp
-   Northrend/nexus/nexus/boss_keristrasza.cpp
-   Northrend/nexus/nexus/commander_stoutbeard.cpp
-   Northrend/nexus/nexus/commander_kolurg.cpp
-   Northrend/nexus/nexus/nexus.h
-   Northrend/nexus/oculus/instance_oculus.cpp
-   Northrend/nexus/oculus/boss_drakos.cpp
-   Northrend/nexus/oculus/boss_urom.cpp
-   Northrend/nexus/oculus/boss_varos.cpp
-   Northrend/nexus/oculus/boss_eregos.cpp
-   Northrend/nexus/oculus/oculus.h
-   Northrend/nexus/oculus/oculus.cpp
+   Northrend/AzjolNerub/AzjolNerub/instance_AzjolNerub.cpp
+   Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+   Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+   Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+   Northrend/AzjolNerub/AzjolNerub/AzjolNerub.h
+   Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+   Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+   Northrend/AzjolNerub/ahnkahet/ahnkahet.h
+   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/instance_TrialOfTheChampion.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.cpp
+   Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.h
+   Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+   Northrend/DraktharonKeep/boss_trollgore.cpp
+   Northrend/DraktharonKeep/boss_novos.cpp
+   Northrend/DraktharonKeep/boss_dred.cpp
+   Northrend/DraktharonKeep/boss_tharon_ja.cpp
+   Northrend/DraktharonKeep/drak_tharon_keep.h
+   Northrend/FrozenHalls/ForgeOfSouls/instance_ForgeOfSouls.cpp
+   Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+   Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+   Northrend/FrozenHalls/ForgeOfSouls/ForgeOfSouls.h
+   Northrend/FrozenHalls/ForgeOfSouls/ForgeOfSouls.cpp
+   Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+   Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+   Northrend/FrozenHalls/HallsOfReflection/instance_HallsOfReflection.cpp
+   Northrend/FrozenHalls/HallsOfReflection/HallsOfReflection.cpp
+   Northrend/FrozenHalls/HallsOfReflection/HallsOfReflection.h
+   Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+   Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+   Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+   Northrend/FrozenHalls/PitOfSaron/instance_PitOfSaron.cpp
+   Northrend/FrozenHalls/PitOfSaron/PitOfSaron.cpp
+   Northrend/FrozenHalls/PitOfSaron/PitOfSaron.h
+   Northrend/Gundrak/instance_Gundrak.cpp
+   Northrend/Gundrak/boss_slad_ran.cpp
+   Northrend/Gundrak/boss_moorabi.cpp
+   Northrend/Gundrak/boss_drakkari_colossus.cpp
+   Northrend/Gundrak/boss_gal_darah.cpp
+   Northrend/Gundrak/boss_eck.cpp
+   Northrend/Gundrak/Gundrak.h
+   Northrend/Naxxramas/boss_anubrekhan.cpp
+   Northrend/Naxxramas/boss_faerlina.cpp
+   Northrend/Naxxramas/boss_gluth.cpp
+   Northrend/Naxxramas/boss_gothik.cpp
+   Northrend/Naxxramas/boss_grobbulus.cpp
+   Northrend/Naxxramas/boss_heigan.cpp
+   Northrend/Naxxramas/boss_kelthuzad.cpp
+   Northrend/Naxxramas/boss_four_horsemen.cpp
+   Northrend/Naxxramas/boss_loatheb.cpp
+   Northrend/Naxxramas/boss_maexxna.cpp
+   Northrend/Naxxramas/boss_noth.cpp
+   Northrend/Naxxramas/boss_patchwerk.cpp
+   Northrend/Naxxramas/boss_razuvious.cpp
+   Northrend/Naxxramas/boss_sapphiron.cpp
+   Northrend/Naxxramas/boss_thaddius.cpp
+   Northrend/Naxxramas/Naxxramas.h
+   Northrend/Naxxramas/instance_Naxxramas.cpp
+   Northrend/Nexus/EyeOfEternity/instance_EyeOfEternity.cpp
+   Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+   Northrend/Nexus/EyeOfEternity/EyeOfEternity.h
+   Northrend/Nexus/Nexus/instance_Nexus.cpp
+   Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+   Northrend/Nexus/Nexus/boss_anomalus.cpp
+   Northrend/Nexus/Nexus/boss_ormorok.cpp
+   Northrend/Nexus/Nexus/boss_keristrasza.cpp
+   Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+   Northrend/Nexus/Nexus/commander_kolurg.cpp
+   Northrend/Nexus/Nexus/Nexus.h
+   Northrend/Nexus/Oculus/instance_Oculus.cpp
+   Northrend/Nexus/Oculus/boss_drakos.cpp
+   Northrend/Nexus/Oculus/boss_urom.cpp
+   Northrend/Nexus/Oculus/boss_varos.cpp
+   Northrend/Nexus/Oculus/boss_eregos.cpp
+   Northrend/Nexus/Oculus/Oculus.h
+   Northrend/Nexus/Oculus/Oculus.cpp
    Northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
    Northrend/obsidian_sanctum/boss_sartharion.cpp
    Northrend/obsidian_sanctum/obsidian_sanctum.h
@@ -472,7 +472,7 @@ SET(scripts_STAT_SRCS
    Northrend/crystalsong_forest.cpp
    Outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
    Outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
-   Outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+   Outland/auchindoun/mana_tombs/boss_Nexusprince_shaffar.cpp
    Outland/auchindoun/mana_tombs/boss_pandemonius.cpp
    Outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
    Outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index 61e2f7a6d06..cd1d1881d68 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -20,7 +20,7 @@
 #define DBCSTORE_H
 
 #include "DBCFileLoader.h"
-#include "Log.h"
+#include "Logging/Log.h"
 
 struct SqlDbc
 {
diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h
index 282968d6097..fd5925f5f75 100644
--- a/src/server/shared/Dynamic/FactoryHolder.h
+++ b/src/server/shared/Dynamic/FactoryHolder.h
@@ -21,8 +21,8 @@
 #ifndef TRINITY_FACTORY_HOLDER
 #define TRINITY_FACTORY_HOLDER
 
-#include "Platform/Define.h"
-#include "Utilities/TypeList.h"
+#include "Define.h"
+#include "Dynamic/TypeList.h"
 #include "ObjectRegistry.h"
 #include "Policies/SingletonImp.h"
 
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index e6619427885..eaf8e1acd2d 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -21,8 +21,8 @@
 #ifndef TRINITY_OBJECTREGISTRY_H
 #define TRINITY_OBJECTREGISTRY_H
 
-#include "Platform/Define.h"
-#include "Utilities/UnorderedMap.h"
+#include "Define.h"
+#include "Dynamic/UnorderedMap.h"
 #include "Policies/Singleton.h"
 
 #include <string>
diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h
index ac531cbbc94..fd380d72b79 100644
--- a/src/server/shared/SystemConfig.h
+++ b/src/server/shared/SystemConfig.h
@@ -24,7 +24,7 @@
 #ifndef TRINITY_SYSTEMCONFIG_H
 #define TRINITY_SYSTEMCONFIG_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "revision.h"
 
 #define _PACKAGENAME "TrinityCore "