18 files changed, 66 insertions, 66 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 6e1adffa625..0d9f1485d20 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -21,19 +21,19 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
+#include "Packets/WorldPacket.h"
+#include "Server/WorldSession.h"
 #include "Database/DatabaseEnv.h"
 
 #include "AccountMgr.h"
-#include "CellImpl.h"
+#include "Grids/Cells/CellImpl.h"
 #include "Chat.h"
-#include "GridNotifiersImpl.h"
-#include "Language.h"
-#include "Log.h"
-#include "Opcodes.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Miscellaneous/Language.h"
+#include "Logging/Log.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Player.h"
-#include "UpdateMask.h"
+#include "Entities/Object/Updates/UpdateMask.h"
 #include "SpellMgr.h"
 
 // Supported shift-links (client generated and server side)
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index 4f299c932e8..fbca47ebad0 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -25,17 +25,17 @@
 #include "Player.h"
 #include "Item.h"
 #include "GameObject.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Chat.h"
 #include "MapManager.h"
-#include "Language.h"
+#include "Miscellaneous/Language.h"
 #include "World.h"
 #include "GameEventMgr.h"
 #include "SpellMgr.h"
 #include "PoolHandler.h"
 #include "AccountMgr.h"
-#include "WaypointManager.h"
-#include "Util.h"
+#include "Movement/Waypoints/WaypointManager.h"
+#include "Utilities/Util.h"
 #include <cctype>
 #include <iostream>
 #include <fstream>
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index 8ac26cc5e8f..deabbe62871 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
+#include "Packets/WorldPacket.h"
+#include "Server/WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "AuctionHouseMgr.h"
@@ -29,29 +29,29 @@
 #include "PlayerDump.h"
 #include "SpellMgr.h"
 #include "Player.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "GameObject.h"
 #include "Chat.h"
-#include "Log.h"
+#include "Logging/Log.h"
 #include "Guild.h"
 #include "ObjectAccessor.h"
 #include "MapManager.h"
-#include "Language.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
+#include "Miscellaneous/Language.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Grids/Cells/CellImpl.h"
 #include "Weather.h"
 #include "PointMovementGenerator.h"
 #include "TargetedMovementGenerator.h"
 #include "SkillDiscovery.h"
 #include "SkillExtraItems.h"
 #include "SystemConfig.h"
-#include "Config/ConfigEnv.h"
-#include "Util.h"
+#include "Configuration/ConfigEnv.h"
+#include "Utilities/Util.h"
 #include "ItemEnchantmentMgr.h"
 #include "BattleGroundMgr.h"
 #include "InstanceSaveMgr.h"
 #include "InstanceData.h"
-#include "AuctionHouseBot.h"
+#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h"
 #include "CreatureEventAIMgr.h"
 #include "SpellAuraEffects.h"
 #include "DBCEnums.h"
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 8e5a7e5677e..bdd475f884d 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -25,7 +25,7 @@
 #include "SpellMgr.h"
 #include "GameEventMgr.h"
 #include "ObjectMgr.h"
-#include "ProgressBar.h"
+#include "Utilities/ProgressBar.h"
 #include "InstanceData.h"
 #include "ConditionMgr.h"
 
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index ba0e3af9a64..55eb63ddb1e 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -20,9 +20,9 @@
 
 #include "DBCStores.h"
 #include "Policies/SingletonImp.h"
-#include "Log.h"
-#include "ProgressBar.h"
-#include "SharedDefines.h"
+#include "Logging/Log.h"
+#include "Utilities/ProgressBar.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "SpellMgr.h"
 
 #include "DBCfmt.h"
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index ba418cdb191..71f27ead4d5 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -17,12 +17,12 @@
  */
 #include "Policies/SingletonImp.h"
 #include "Common.h"
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "Group.h"
 #include "Player.h"
 #include "LFGMgr.h"
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 
 INSTANTIATE_SINGLETON_1(LFGMgr);
 
diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
index 510ea13e78b..96e5423a085 100644
--- a/src/server/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
@@ -21,10 +21,10 @@
 #include "Common.h"
 #include "Corpse.h"
 #include "Player.h"
-#include "UpdateMask.h"
+#include "Entities/Object/Updates/UpdateMask.h"
 #include "ObjectAccessor.h"
 #include "Database/DatabaseEnv.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "GossipDef.h"
 #include "World.h"
 
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index fbfae17a48b..f7ac131342e 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -20,7 +20,7 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -29,20 +29,20 @@
 #include "GossipDef.h"
 #include "Player.h"
 #include "PoolHandler.h"
-#include "Opcodes.h"
-#include "Log.h"
+#include "Server/Protocol/Opcodes.h"
+#include "Logging/Log.h"
 #include "LootMgr.h"
 #include "MapManager.h"
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
-#include "Formulas.h"
+#include "Miscellaneous/Formulas.h"
 #include "WaypointMovementGenerator.h"
 #include "InstanceData.h"
 #include "BattleGroundMgr.h"
-#include "Util.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
+#include "Utilities/Util.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Grids/Cells/CellImpl.h"
 #include "OutdoorPvPMgr.h"
 #include "GameEventMgr.h"
 #include "CreatureGroups.h"
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index c2af59458f7..03cb8da00bf 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -21,7 +21,7 @@
 #include "Creature.h"
 #include "CreatureGroups.h"
 #include "ObjectMgr.h"
-#include "ProgressBar.h"
+#include "Utilities/ProgressBar.h"
 #include "Policies/SingletonImp.h"
 #include "CreatureAI.h"
 
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index 3e0fec52bc7..e2cd8965373 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -21,10 +21,10 @@
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
-#include "Formulas.h"
+#include "Server/Protocol/Opcodes.h"
+#include "Packets/WorldPacket.h"
+#include "Server/WorldSession.h"
+#include "Miscellaneous/Formulas.h"
 
 GossipMenu::GossipMenu()
 {
diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
index 11652460fc5..860bdf21803 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.cpp
+++ b/src/server/game/Entities/Creature/TemporarySummon.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Log.h"
+#include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
index 48179190a6e..49f82f19b80 100644
--- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
@@ -19,14 +19,14 @@
  */
 
 #include "Common.h"
-#include "UpdateMask.h"
-#include "Opcodes.h"
+#include "Entities/Object/Updates/UpdateMask.h"
+#include "Server/Protocol/Opcodes.h"
 #include "World.h"
 #include "ObjectAccessor.h"
 #include "Database/DatabaseEnv.h"
-#include "GridNotifiers.h"
-#include "CellImpl.h"
-#include "GridNotifiersImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Cells/CellImpl.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
 
 DynamicObject::DynamicObject() : WorldObject()
 {
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 596b156bd35..9bc1e2ff5e2 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -25,20 +25,20 @@
 #include "PoolHandler.h"
 #include "SpellMgr.h"
 #include "Spell.h"
-#include "UpdateMask.h"
-#include "Opcodes.h"
-#include "WorldPacket.h"
+#include "Entities/Object/Updates/UpdateMask.h"
+#include "Server/Protocol/Opcodes.h"
+#include "Packets/WorldPacket.h"
 #include "World.h"
 #include "Database/DatabaseEnv.h"
 #include "LootMgr.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"
 #include "InstanceData.h"
 #include "BattleGround.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 #include "OutdoorPvPMgr.h"
-#include "BattleGroundAV.h"
+#include "BattleGrounds/Zones/BattleGroundAV.h"
 #include "ScriptMgr.h"
 
 GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue)
diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp
index aa78126b198..e1488e2390c 100644
--- a/src/server/game/Entities/Item/Container/Bag.cpp
+++ b/src/server/game/Entities/Item/Container/Bag.cpp
@@ -23,8 +23,8 @@
 #include "Database/DatabaseEnv.h"
 
 #include "Bag.h"
-#include "Log.h"
-#include "UpdateData.h"
+#include "Logging/Log.h"
+#include "Entities/Object/Updates/UpdateData.h"
 
 Bag::Bag(): Item()
 {
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 5c2d94d399b..d6b07ecac01 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -21,7 +21,7 @@
 #include "Common.h"
 #include "Item.h"
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
+#include "Packets/WorldPacket.h"
 #include "Database/DatabaseEnv.h"
 #include "ItemEnchantmentMgr.h"
 #include "SpellMgr.h"
@@ -1147,4 +1147,4 @@ uint32 Item::GetPlayedTime()
 bool Item::IsRefundExpired()
 {
     return (GetPlayedTime() > 2*HOUR);
-}
-\ No newline at end of file
+}
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
index 55ea98a2a1f..4f8d32c9383 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.h
@@ -19,8 +19,8 @@
 #ifndef OUTDOOR_PVP_H_
 #define OUTDOOR_PVP_H_
 
-#include "Util.h"
-#include "SharedDefines.h"
+#include "Utilities/Util.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "ZoneScript.h"
 
 class GameObject;
diff --git a/src/server/game/Pools/PoolHandler.h b/src/server/game/Pools/PoolHandler.h
index 0ba4cc7769f..7263eb7a7f7 100644
--- a/src/server/game/Pools/PoolHandler.h
+++ b/src/server/game/Pools/PoolHandler.h
@@ -19,7 +19,7 @@
 #ifndef TRINITY_POOLHANDLER_H
 #define TRINITY_POOLHANDLER_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include "Creature.h"
 #include "GameObject.h"
diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h
index 874eccba64f..35012a5f9dc 100644
--- a/src/server/game/Weather/Weather.h
+++ b/src/server/game/Weather/Weather.h
@@ -26,8 +26,8 @@
 #define __WEATHER_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Timer.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Utilities/Timer.h"
 
 class Player;