diff --git a/src/server/game/AuctionHouseBot.cpp b/src/server/game/AI/AuctionHouseBot/AuctionHouseBot.cpp
similarity index 100%
rename from src/server/game/AuctionHouseBot.cpp
rename to src/server/game/AI/AuctionHouseBot/AuctionHouseBot.cpp
diff --git a/src/server/game/AuctionHouseBot.h b/src/server/game/AI/AuctionHouseBot/AuctionHouseBot.h
similarity index 100%
rename from src/server/game/AuctionHouseBot.h
rename to src/server/game/AI/AuctionHouseBot/AuctionHouseBot.h
diff --git a/src/server/game/CombatAI.cpp b/src/server/game/AI/CombatAI.cpp
similarity index 100%
rename from src/server/game/CombatAI.cpp
rename to src/server/game/AI/CombatAI.cpp
diff --git a/src/server/game/CombatAI.h b/src/server/game/AI/CombatAI.h
similarity index 100%
rename from src/server/game/CombatAI.h
rename to src/server/game/AI/CombatAI.h
diff --git a/src/server/game/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
similarity index 100%
rename from src/server/game/CreatureAI.cpp
rename to src/server/game/AI/CreatureAI.cpp
diff --git a/src/server/game/CreatureAI.h b/src/server/game/AI/CreatureAI.h
similarity index 100%
rename from src/server/game/CreatureAI.h
rename to src/server/game/AI/CreatureAI.h
diff --git a/src/server/game/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h
similarity index 100%
rename from src/server/game/CreatureAIFactory.h
rename to src/server/game/AI/CreatureAIFactory.h
diff --git a/src/server/game/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
similarity index 100%
rename from src/server/game/CreatureAIImpl.h
rename to src/server/game/AI/CreatureAIImpl.h
diff --git a/src/server/game/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
similarity index 100%
rename from src/server/game/CreatureAIRegistry.cpp
rename to src/server/game/AI/CreatureAIRegistry.cpp
diff --git a/src/server/game/CreatureAIRegistry.h b/src/server/game/AI/CreatureAIRegistry.h
similarity index 100%
rename from src/server/game/CreatureAIRegistry.h
rename to src/server/game/AI/CreatureAIRegistry.h
diff --git a/src/server/game/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
similarity index 100%
rename from src/server/game/CreatureAISelector.cpp
rename to src/server/game/AI/CreatureAISelector.cpp
diff --git a/src/server/game/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h
similarity index 100%
rename from src/server/game/CreatureAISelector.h
rename to src/server/game/AI/CreatureAISelector.h
diff --git a/src/server/game/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
similarity index 100%
rename from src/server/game/CreatureEventAI.cpp
rename to src/server/game/AI/EventAI/CreatureEventAI.cpp
diff --git a/src/server/game/CreatureEventAI.h b/src/server/game/AI/EventAI/CreatureEventAI.h
similarity index 100%
rename from src/server/game/CreatureEventAI.h
rename to src/server/game/AI/EventAI/CreatureEventAI.h
diff --git a/src/server/game/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
similarity index 100%
rename from src/server/game/CreatureEventAIMgr.cpp
rename to src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
diff --git a/src/server/game/CreatureEventAIMgr.h b/src/server/game/AI/EventAI/CreatureEventAIMgr.h
similarity index 100%
rename from src/server/game/CreatureEventAIMgr.h
rename to src/server/game/AI/EventAI/CreatureEventAIMgr.h
diff --git a/src/server/game/GuardAI.cpp b/src/server/game/AI/GuardAI.cpp
similarity index 100%
rename from src/server/game/GuardAI.cpp
rename to src/server/game/AI/GuardAI.cpp
diff --git a/src/server/game/GuardAI.h b/src/server/game/AI/GuardAI.h
similarity index 100%
rename from src/server/game/GuardAI.h
rename to src/server/game/AI/GuardAI.h
diff --git a/src/server/game/PassiveAI.cpp b/src/server/game/AI/PassiveAI.cpp
similarity index 100%
rename from src/server/game/PassiveAI.cpp
rename to src/server/game/AI/PassiveAI.cpp
diff --git a/src/server/game/PassiveAI.h b/src/server/game/AI/PassiveAI.h
similarity index 100%
rename from src/server/game/PassiveAI.h
rename to src/server/game/AI/PassiveAI.h
diff --git a/src/server/game/PetAI.cpp b/src/server/game/AI/PetAI.cpp
similarity index 100%
rename from src/server/game/PetAI.cpp
rename to src/server/game/AI/PetAI.cpp
diff --git a/src/server/game/PetAI.h b/src/server/game/AI/PetAI.h
similarity index 100%
rename from src/server/game/PetAI.h
rename to src/server/game/AI/PetAI.h
diff --git a/src/server/game/ReactorAI.cpp b/src/server/game/AI/ReactorAI.cpp
similarity index 100%
rename from src/server/game/ReactorAI.cpp
rename to src/server/game/AI/ReactorAI.cpp
diff --git a/src/server/game/ReactorAI.h b/src/server/game/AI/ReactorAI.h
similarity index 100%
rename from src/server/game/ReactorAI.h
rename to src/server/game/AI/ReactorAI.h
diff --git a/src/server/game/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
similarity index 100%
rename from src/server/game/ScriptedCreature.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
diff --git a/src/server/game/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
similarity index 100%
rename from src/server/game/ScriptedCreature.h
rename to src/server/game/AI/ScriptedAI/ScriptedCreature.h
diff --git a/src/server/game/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
similarity index 100%
rename from src/server/game/ScriptedEscortAI.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
diff --git a/src/server/game/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
similarity index 100%
rename from src/server/game/ScriptedEscortAI.h
rename to src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
diff --git a/src/server/game/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
similarity index 100%
rename from src/server/game/ScriptedFollowerAI.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
diff --git a/src/server/game/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
similarity index 100%
rename from src/server/game/ScriptedFollowerAI.h
rename to src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
diff --git a/src/server/game/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h
similarity index 100%
rename from src/server/game/ScriptedGossip.h
rename to src/server/game/AI/ScriptedAI/ScriptedGossip.h
diff --git a/src/server/game/ScriptedGuardAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp
similarity index 100%
rename from src/server/game/ScriptedGuardAI.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp
diff --git a/src/server/game/ScriptedGuardAI.h b/src/server/game/AI/ScriptedAI/ScriptedGuardAI.h
similarity index 100%
rename from src/server/game/ScriptedGuardAI.h
rename to src/server/game/AI/ScriptedAI/ScriptedGuardAI.h
diff --git a/src/server/game/ScriptedInstance.h b/src/server/game/AI/ScriptedAI/ScriptedInstance.h
similarity index 100%
rename from src/server/game/ScriptedInstance.h
rename to src/server/game/AI/ScriptedAI/ScriptedInstance.h
diff --git a/src/server/game/ScriptedSimpleAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp
similarity index 100%
rename from src/server/game/ScriptedSimpleAI.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp
diff --git a/src/server/game/ScriptedSimpleAI.h b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h
similarity index 100%
rename from src/server/game/ScriptedSimpleAI.h
rename to src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h
diff --git a/src/server/game/ScriptedSmartAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedSmartAI.cpp
similarity index 100%
rename from src/server/game/ScriptedSmartAI.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedSmartAI.cpp
diff --git a/src/server/game/ScriptedSmartAI.h b/src/server/game/AI/ScriptedAI/ScriptedSmartAI.h
similarity index 100%
rename from src/server/game/ScriptedSmartAI.h
rename to src/server/game/AI/ScriptedAI/ScriptedSmartAI.h
diff --git a/src/server/game/TotemAI.cpp b/src/server/game/AI/TotemAI.cpp
similarity index 100%
rename from src/server/game/TotemAI.cpp
rename to src/server/game/AI/TotemAI.cpp
diff --git a/src/server/game/TotemAI.h b/src/server/game/AI/TotemAI.h
similarity index 100%
rename from src/server/game/TotemAI.h
rename to src/server/game/AI/TotemAI.h
diff --git a/src/server/game/UnitAI.cpp b/src/server/game/AI/UnitAI.cpp
similarity index 100%
rename from src/server/game/UnitAI.cpp
rename to src/server/game/AI/UnitAI.cpp
diff --git a/src/server/game/UnitAI.h b/src/server/game/AI/UnitAI.h
similarity index 100%
rename from src/server/game/UnitAI.h
rename to src/server/game/AI/UnitAI.h
diff --git a/src/server/game/AccountMgr.cpp b/src/server/game/Account/AccountMgr.cpp
similarity index 100%
rename from src/server/game/AccountMgr.cpp
rename to src/server/game/Account/AccountMgr.cpp
diff --git a/src/server/game/AccountMgr.h b/src/server/game/Account/AccountMgr.h
similarity index 100%
rename from src/server/game/AccountMgr.h
rename to src/server/game/Account/AccountMgr.h
diff --git a/src/server/game/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
similarity index 100%
rename from src/server/game/AchievementMgr.cpp
rename to src/server/game/Achievements/AchievementMgr.cpp
diff --git a/src/server/game/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
similarity index 100%
rename from src/server/game/AchievementMgr.h
rename to src/server/game/Achievements/AchievementMgr.h
diff --git a/src/server/game/AddonHandler.cpp b/src/server/game/Addons/AddonHandler.cpp
similarity index 100%
rename from src/server/game/AddonHandler.cpp
rename to src/server/game/Addons/AddonHandler.cpp
diff --git a/src/server/game/AddonHandler.h b/src/server/game/Addons/AddonHandler.h
similarity index 100%
rename from src/server/game/AddonHandler.h
rename to src/server/game/Addons/AddonHandler.h
diff --git a/src/server/game/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
similarity index 100%
rename from src/server/game/AddonMgr.cpp
rename to src/server/game/Addons/AddonMgr.cpp
diff --git a/src/server/game/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
similarity index 100%
rename from src/server/game/AddonMgr.h
rename to src/server/game/Addons/AddonMgr.h
diff --git a/src/server/game/AuctionHouseHandler.cpp b/src/server/game/AuctionHouse/AuctionHouseHandler.cpp
similarity index 100%
rename from src/server/game/AuctionHouseHandler.cpp
rename to src/server/game/AuctionHouse/AuctionHouseHandler.cpp
diff --git a/src/server/game/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src/server/game/AuctionHouseMgr.cpp
rename to src/server/game/AuctionHouse/AuctionHouseMgr.cpp
diff --git a/src/server/game/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
similarity index 100%
rename from src/server/game/AuctionHouseMgr.h
rename to src/server/game/AuctionHouse/AuctionHouseMgr.h
diff --git a/src/server/game/ArenaTeam.cpp b/src/server/game/BattleGrounds/ArenaTeam.cpp
similarity index 100%
rename from src/server/game/ArenaTeam.cpp
rename to src/server/game/BattleGrounds/ArenaTeam.cpp
diff --git a/src/server/game/ArenaTeam.h b/src/server/game/BattleGrounds/ArenaTeam.h
similarity index 100%
rename from src/server/game/ArenaTeam.h
rename to src/server/game/BattleGrounds/ArenaTeam.h
diff --git a/src/server/game/ArenaTeamHandler.cpp b/src/server/game/BattleGrounds/ArenaTeamHandler.cpp
similarity index 100%
rename from src/server/game/ArenaTeamHandler.cpp
rename to src/server/game/BattleGrounds/ArenaTeamHandler.cpp
diff --git a/src/server/game/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
similarity index 100%
rename from src/server/game/BattleGround.cpp
rename to src/server/game/BattleGrounds/BattleGround.cpp
diff --git a/src/server/game/BattleGround.h b/src/server/game/BattleGrounds/BattleGround.h
similarity index 100%
rename from src/server/game/BattleGround.h
rename to src/server/game/BattleGrounds/BattleGround.h
diff --git a/src/server/game/BattleGroundAA.cpp b/src/server/game/BattleGrounds/BattleGroundAA.cpp
similarity index 100%
rename from src/server/game/BattleGroundAA.cpp
rename to src/server/game/BattleGrounds/BattleGroundAA.cpp
diff --git a/src/server/game/BattleGroundAA.h b/src/server/game/BattleGrounds/BattleGroundAA.h
similarity index 100%
rename from src/server/game/BattleGroundAA.h
rename to src/server/game/BattleGrounds/BattleGroundAA.h
diff --git a/src/server/game/BattleGroundAB.cpp b/src/server/game/BattleGrounds/BattleGroundAB.cpp
similarity index 100%
rename from src/server/game/BattleGroundAB.cpp
rename to src/server/game/BattleGrounds/BattleGroundAB.cpp
diff --git a/src/server/game/BattleGroundAB.h b/src/server/game/BattleGrounds/BattleGroundAB.h
similarity index 100%
rename from src/server/game/BattleGroundAB.h
rename to src/server/game/BattleGrounds/BattleGroundAB.h
diff --git a/src/server/game/BattleGroundAV.cpp b/src/server/game/BattleGrounds/BattleGroundAV.cpp
similarity index 100%
rename from src/server/game/BattleGroundAV.cpp
rename to src/server/game/BattleGrounds/BattleGroundAV.cpp
diff --git a/src/server/game/BattleGroundAV.h b/src/server/game/BattleGrounds/BattleGroundAV.h
similarity index 100%
rename from src/server/game/BattleGroundAV.h
rename to src/server/game/BattleGrounds/BattleGroundAV.h
diff --git a/src/server/game/BattleGroundBE.cpp b/src/server/game/BattleGrounds/BattleGroundBE.cpp
similarity index 100%
rename from src/server/game/BattleGroundBE.cpp
rename to src/server/game/BattleGrounds/BattleGroundBE.cpp
diff --git a/src/server/game/BattleGroundBE.h b/src/server/game/BattleGrounds/BattleGroundBE.h
similarity index 100%
rename from src/server/game/BattleGroundBE.h
rename to src/server/game/BattleGrounds/BattleGroundBE.h
diff --git a/src/server/game/BattleGroundDS.cpp b/src/server/game/BattleGrounds/BattleGroundDS.cpp
similarity index 100%
rename from src/server/game/BattleGroundDS.cpp
rename to src/server/game/BattleGrounds/BattleGroundDS.cpp
diff --git a/src/server/game/BattleGroundDS.h b/src/server/game/BattleGrounds/BattleGroundDS.h
similarity index 100%
rename from src/server/game/BattleGroundDS.h
rename to src/server/game/BattleGrounds/BattleGroundDS.h
diff --git a/src/server/game/BattleGroundEY.cpp b/src/server/game/BattleGrounds/BattleGroundEY.cpp
similarity index 100%
rename from src/server/game/BattleGroundEY.cpp
rename to src/server/game/BattleGrounds/BattleGroundEY.cpp
diff --git a/src/server/game/BattleGroundEY.h b/src/server/game/BattleGrounds/BattleGroundEY.h
similarity index 100%
rename from src/server/game/BattleGroundEY.h
rename to src/server/game/BattleGrounds/BattleGroundEY.h
diff --git a/src/server/game/BattleGroundHandler.cpp b/src/server/game/BattleGrounds/BattleGroundHandler.cpp
similarity index 100%
rename from src/server/game/BattleGroundHandler.cpp
rename to src/server/game/BattleGrounds/BattleGroundHandler.cpp
diff --git a/src/server/game/BattleGroundIC.cpp b/src/server/game/BattleGrounds/BattleGroundIC.cpp
similarity index 100%
rename from src/server/game/BattleGroundIC.cpp
rename to src/server/game/BattleGrounds/BattleGroundIC.cpp
diff --git a/src/server/game/BattleGroundIC.h b/src/server/game/BattleGrounds/BattleGroundIC.h
similarity index 100%
rename from src/server/game/BattleGroundIC.h
rename to src/server/game/BattleGrounds/BattleGroundIC.h
diff --git a/src/server/game/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
similarity index 100%
rename from src/server/game/BattleGroundMgr.cpp
rename to src/server/game/BattleGrounds/BattleGroundMgr.cpp
diff --git a/src/server/game/BattleGroundMgr.h b/src/server/game/BattleGrounds/BattleGroundMgr.h
similarity index 100%
rename from src/server/game/BattleGroundMgr.h
rename to src/server/game/BattleGrounds/BattleGroundMgr.h
diff --git a/src/server/game/BattleGroundNA.cpp b/src/server/game/BattleGrounds/BattleGroundNA.cpp
similarity index 100%
rename from src/server/game/BattleGroundNA.cpp
rename to src/server/game/BattleGrounds/BattleGroundNA.cpp
diff --git a/src/server/game/BattleGroundNA.h b/src/server/game/BattleGrounds/BattleGroundNA.h
similarity index 100%
rename from src/server/game/BattleGroundNA.h
rename to src/server/game/BattleGrounds/BattleGroundNA.h
diff --git a/src/server/game/BattleGroundRB.cpp b/src/server/game/BattleGrounds/BattleGroundRB.cpp
similarity index 100%
rename from src/server/game/BattleGroundRB.cpp
rename to src/server/game/BattleGrounds/BattleGroundRB.cpp
diff --git a/src/server/game/BattleGroundRB.h b/src/server/game/BattleGrounds/BattleGroundRB.h
similarity index 100%
rename from src/server/game/BattleGroundRB.h
rename to src/server/game/BattleGrounds/BattleGroundRB.h
diff --git a/src/server/game/BattleGroundRL.cpp b/src/server/game/BattleGrounds/BattleGroundRL.cpp
similarity index 100%
rename from src/server/game/BattleGroundRL.cpp
rename to src/server/game/BattleGrounds/BattleGroundRL.cpp
diff --git a/src/server/game/BattleGroundRL.h b/src/server/game/BattleGrounds/BattleGroundRL.h
similarity index 100%
rename from src/server/game/BattleGroundRL.h
rename to src/server/game/BattleGrounds/BattleGroundRL.h
diff --git a/src/server/game/BattleGroundRV.cpp b/src/server/game/BattleGrounds/BattleGroundRV.cpp
similarity index 100%
rename from src/server/game/BattleGroundRV.cpp
rename to src/server/game/BattleGrounds/BattleGroundRV.cpp
diff --git a/src/server/game/BattleGroundRV.h b/src/server/game/BattleGrounds/BattleGroundRV.h
similarity index 100%
rename from src/server/game/BattleGroundRV.h
rename to src/server/game/BattleGrounds/BattleGroundRV.h
diff --git a/src/server/game/BattleGroundSA.cpp b/src/server/game/BattleGrounds/BattleGroundSA.cpp
similarity index 100%
rename from src/server/game/BattleGroundSA.cpp
rename to src/server/game/BattleGrounds/BattleGroundSA.cpp
diff --git a/src/server/game/BattleGroundSA.h b/src/server/game/BattleGrounds/BattleGroundSA.h
similarity index 100%
rename from src/server/game/BattleGroundSA.h
rename to src/server/game/BattleGrounds/BattleGroundSA.h
diff --git a/src/server/game/BattleGroundWS.cpp b/src/server/game/BattleGrounds/BattleGroundWS.cpp
similarity index 100%
rename from src/server/game/BattleGroundWS.cpp
rename to src/server/game/BattleGrounds/BattleGroundWS.cpp
diff --git a/src/server/game/BattleGroundWS.h b/src/server/game/BattleGrounds/BattleGroundWS.h
similarity index 100%
rename from src/server/game/BattleGroundWS.h
rename to src/server/game/BattleGrounds/BattleGroundWS.h
diff --git a/src/server/game/Calendar.cpp b/src/server/game/Calender/Calendar.cpp
similarity index 100%
rename from src/server/game/Calendar.cpp
rename to src/server/game/Calender/Calendar.cpp
diff --git a/src/server/game/Calendar.h b/src/server/game/Calender/Calendar.h
similarity index 100%
rename from src/server/game/Calendar.h
rename to src/server/game/Calender/Calendar.h
diff --git a/src/server/game/CalendarHandler.cpp b/src/server/game/Calender/CalendarHandler.cpp
similarity index 100%
rename from src/server/game/CalendarHandler.cpp
rename to src/server/game/Calender/CalendarHandler.cpp
diff --git a/src/server/game/Channel.cpp b/src/server/game/Chat/Channel.cpp
similarity index 100%
rename from src/server/game/Channel.cpp
rename to src/server/game/Chat/Channel.cpp
diff --git a/src/server/game/Channel.h b/src/server/game/Chat/Channel.h
similarity index 100%
rename from src/server/game/Channel.h
rename to src/server/game/Chat/Channel.h
diff --git a/src/server/game/ChannelHandler.cpp b/src/server/game/Chat/ChannelHandler.cpp
similarity index 100%
rename from src/server/game/ChannelHandler.cpp
rename to src/server/game/Chat/ChannelHandler.cpp
diff --git a/src/server/game/ChannelMgr.cpp b/src/server/game/Chat/ChannelMgr.cpp
similarity index 100%
rename from src/server/game/ChannelMgr.cpp
rename to src/server/game/Chat/ChannelMgr.cpp
diff --git a/src/server/game/ChannelMgr.h b/src/server/game/Chat/ChannelMgr.h
similarity index 100%
rename from src/server/game/ChannelMgr.h
rename to src/server/game/Chat/ChannelMgr.h
diff --git a/src/server/game/Chat.cpp b/src/server/game/Chat/Chat.cpp
similarity index 100%
rename from src/server/game/Chat.cpp
rename to src/server/game/Chat/Chat.cpp
diff --git a/src/server/game/Chat.h b/src/server/game/Chat/Chat.h
similarity index 100%
rename from src/server/game/Chat.h
rename to src/server/game/Chat/Chat.h
diff --git a/src/server/game/ChatHandler.cpp b/src/server/game/Chat/ChatHandler.cpp
similarity index 100%
rename from src/server/game/ChatHandler.cpp
rename to src/server/game/Chat/ChatHandler.cpp
diff --git a/src/server/game/Debugcmds.cpp b/src/server/game/Chat/Debugcmds.cpp
similarity index 100%
rename from src/server/game/Debugcmds.cpp
rename to src/server/game/Chat/Debugcmds.cpp
diff --git a/src/server/game/Level0.cpp b/src/server/game/Chat/Level0.cpp
similarity index 100%
rename from src/server/game/Level0.cpp
rename to src/server/game/Chat/Level0.cpp
diff --git a/src/server/game/Level1.cpp b/src/server/game/Chat/Level1.cpp
similarity index 100%
rename from src/server/game/Level1.cpp
rename to src/server/game/Chat/Level1.cpp
diff --git a/src/server/game/Level2.cpp b/src/server/game/Chat/Level2.cpp
similarity index 100%
rename from src/server/game/Level2.cpp
rename to src/server/game/Chat/Level2.cpp
diff --git a/src/server/game/Level3.cpp b/src/server/game/Chat/Level3.cpp
similarity index 100%
rename from src/server/game/Level3.cpp
rename to src/server/game/Chat/Level3.cpp
diff --git a/src/server/game/CombatHandler.cpp b/src/server/game/Combat/CombatHandler.cpp
similarity index 100%
rename from src/server/game/CombatHandler.cpp
rename to src/server/game/Combat/CombatHandler.cpp
diff --git a/src/server/game/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp
similarity index 100%
rename from src/server/game/HostileRefManager.cpp
rename to src/server/game/Combat/HostileRefManager.cpp
diff --git a/src/server/game/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h
similarity index 100%
rename from src/server/game/HostileRefManager.h
rename to src/server/game/Combat/HostileRefManager.h
diff --git a/src/server/game/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
similarity index 100%
rename from src/server/game/ThreatManager.cpp
rename to src/server/game/Combat/ThreatManager.cpp
diff --git a/src/server/game/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
similarity index 100%
rename from src/server/game/ThreatManager.h
rename to src/server/game/Combat/ThreatManager.h
diff --git a/src/server/game/ConditionMgr.cpp b/src/server/game/ConditionMgr/ConditionMgr.cpp
similarity index 100%
rename from src/server/game/ConditionMgr.cpp
rename to src/server/game/ConditionMgr/ConditionMgr.cpp
diff --git a/src/server/game/ConditionMgr.h b/src/server/game/ConditionMgr/ConditionMgr.h
similarity index 100%
rename from src/server/game/ConditionMgr.h
rename to src/server/game/ConditionMgr/ConditionMgr.h
diff --git a/src/server/game/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
similarity index 100%
rename from src/server/game/DBCEnums.h
rename to src/server/game/DataStores/DBCEnums.h
diff --git a/src/server/game/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
similarity index 100%
rename from src/server/game/DBCStores.cpp
rename to src/server/game/DataStores/DBCStores.cpp
diff --git a/src/server/game/DBCStores.h b/src/server/game/DataStores/DBCStores.h
similarity index 100%
rename from src/server/game/DBCStores.h
rename to src/server/game/DataStores/DBCStores.h
diff --git a/src/server/game/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
similarity index 100%
rename from src/server/game/DBCStructure.h
rename to src/server/game/DataStores/DBCStructure.h
diff --git a/src/server/game/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
similarity index 100%
rename from src/server/game/DBCfmt.h
rename to src/server/game/DataStores/DBCfmt.h
diff --git a/src/server/game/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
similarity index 100%
rename from src/server/game/Creature.cpp
rename to src/server/game/Entities/Creature/Creature.cpp
diff --git a/src/server/game/Creature.h b/src/server/game/Entities/Creature/Creature.h
similarity index 100%
rename from src/server/game/Creature.h
rename to src/server/game/Entities/Creature/Creature.h
diff --git a/src/server/game/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
similarity index 100%
rename from src/server/game/CreatureGroups.cpp
rename to src/server/game/Entities/Creature/CreatureGroups.cpp
diff --git a/src/server/game/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h
similarity index 100%
rename from src/server/game/CreatureGroups.h
rename to src/server/game/Entities/Creature/CreatureGroups.h
diff --git a/src/server/game/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
similarity index 100%
rename from src/server/game/GossipDef.cpp
rename to src/server/game/Entities/Creature/GossipDef.cpp
diff --git a/src/server/game/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
similarity index 100%
rename from src/server/game/GossipDef.h
rename to src/server/game/Entities/Creature/GossipDef.h
diff --git a/src/server/game/NPCHandler.cpp b/src/server/game/Entities/Creature/NPCHandler.cpp
similarity index 100%
rename from src/server/game/NPCHandler.cpp
rename to src/server/game/Entities/Creature/NPCHandler.cpp
diff --git a/src/server/game/NPCHandler.h b/src/server/game/Entities/Creature/NPCHandler.h
similarity index 100%
rename from src/server/game/NPCHandler.h
rename to src/server/game/Entities/Creature/NPCHandler.h
diff --git a/src/server/game/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
similarity index 100%
rename from src/server/game/TemporarySummon.cpp
rename to src/server/game/Entities/Creature/TemporarySummon.cpp
diff --git a/src/server/game/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h
similarity index 100%
rename from src/server/game/TemporarySummon.h
rename to src/server/game/Entities/Creature/TemporarySummon.h
diff --git a/src/server/game/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
similarity index 100%
rename from src/server/game/GameObject.cpp
rename to src/server/game/Entities/GameObject/GameObject.cpp
diff --git a/src/server/game/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
similarity index 100%
rename from src/server/game/GameObject.h
rename to src/server/game/Entities/GameObject/GameObject.h
diff --git a/src/server/game/Bag.cpp b/src/server/game/Entities/Item/Bag.cpp
similarity index 100%
rename from src/server/game/Bag.cpp
rename to src/server/game/Entities/Item/Bag.cpp
diff --git a/src/server/game/Bag.h b/src/server/game/Entities/Item/Bag.h
similarity index 100%
rename from src/server/game/Bag.h
rename to src/server/game/Entities/Item/Bag.h
diff --git a/src/server/game/Item.cpp b/src/server/game/Entities/Item/Item.cpp
similarity index 100%
rename from src/server/game/Item.cpp
rename to src/server/game/Entities/Item/Item.cpp
diff --git a/src/server/game/Item.h b/src/server/game/Entities/Item/Item.h
similarity index 100%
rename from src/server/game/Item.h
rename to src/server/game/Entities/Item/Item.h
diff --git a/src/server/game/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
similarity index 100%
rename from src/server/game/ItemEnchantmentMgr.cpp
rename to src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
diff --git a/src/server/game/ItemEnchantmentMgr.h b/src/server/game/Entities/Item/ItemEnchantmentMgr.h
similarity index 100%
rename from src/server/game/ItemEnchantmentMgr.h
rename to src/server/game/Entities/Item/ItemEnchantmentMgr.h
diff --git a/src/server/game/ItemHandler.cpp b/src/server/game/Entities/Item/ItemHandler.cpp
similarity index 100%
rename from src/server/game/ItemHandler.cpp
rename to src/server/game/Entities/Item/ItemHandler.cpp
diff --git a/src/server/game/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
similarity index 100%
rename from src/server/game/ItemPrototype.h
rename to src/server/game/Entities/Item/ItemPrototype.h
diff --git a/src/server/game/Corpse.cpp b/src/server/game/Entities/Object/Corpse.cpp
similarity index 100%
rename from src/server/game/Corpse.cpp
rename to src/server/game/Entities/Object/Corpse.cpp
diff --git a/src/server/game/Corpse.h b/src/server/game/Entities/Object/Corpse.h
similarity index 100%
rename from src/server/game/Corpse.h
rename to src/server/game/Entities/Object/Corpse.h
diff --git a/src/server/game/DynamicObject.cpp b/src/server/game/Entities/Object/DynamicObject.cpp
similarity index 100%
rename from src/server/game/DynamicObject.cpp
rename to src/server/game/Entities/Object/DynamicObject.cpp
diff --git a/src/server/game/DynamicObject.h b/src/server/game/Entities/Object/DynamicObject.h
similarity index 100%
rename from src/server/game/DynamicObject.h
rename to src/server/game/Entities/Object/DynamicObject.h
diff --git a/src/server/game/Object.cpp b/src/server/game/Entities/Object/Object.cpp
similarity index 100%
rename from src/server/game/Object.cpp
rename to src/server/game/Entities/Object/Object.cpp
diff --git a/src/server/game/Object.h b/src/server/game/Entities/Object/Object.h
similarity index 100%
rename from src/server/game/Object.h
rename to src/server/game/Entities/Object/Object.h
diff --git a/src/server/game/ObjectAccessor.cpp b/src/server/game/Entities/Object/ObjectAccessor.cpp
similarity index 100%
rename from src/server/game/ObjectAccessor.cpp
rename to src/server/game/Entities/Object/ObjectAccessor.cpp
diff --git a/src/server/game/ObjectAccessor.h b/src/server/game/Entities/Object/ObjectAccessor.h
similarity index 100%
rename from src/server/game/ObjectAccessor.h
rename to src/server/game/Entities/Object/ObjectAccessor.h
diff --git a/src/server/game/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h
similarity index 100%
rename from src/server/game/ObjectDefines.h
rename to src/server/game/Entities/Object/ObjectDefines.h
diff --git a/src/server/game/ObjectMgr.cpp b/src/server/game/Entities/Object/ObjectMgr.cpp
similarity index 100%
rename from src/server/game/ObjectMgr.cpp
rename to src/server/game/Entities/Object/ObjectMgr.cpp
diff --git a/src/server/game/ObjectMgr.h b/src/server/game/Entities/Object/ObjectMgr.h
similarity index 100%
rename from src/server/game/ObjectMgr.h
rename to src/server/game/Entities/Object/ObjectMgr.h
diff --git a/src/server/game/UpdateData.cpp b/src/server/game/Entities/Object/UpdateData.cpp
similarity index 100%
rename from src/server/game/UpdateData.cpp
rename to src/server/game/Entities/Object/UpdateData.cpp
diff --git a/src/server/game/UpdateData.h b/src/server/game/Entities/Object/UpdateData.h
similarity index 100%
rename from src/server/game/UpdateData.h
rename to src/server/game/Entities/Object/UpdateData.h
diff --git a/src/server/game/UpdateFields.h b/src/server/game/Entities/Object/UpdateFields.h
similarity index 100%
rename from src/server/game/UpdateFields.h
rename to src/server/game/Entities/Object/UpdateFields.h
diff --git a/src/server/game/UpdateMask.h b/src/server/game/Entities/Object/UpdateMask.h
similarity index 100%
rename from src/server/game/UpdateMask.h
rename to src/server/game/Entities/Object/UpdateMask.h
diff --git a/src/server/game/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
similarity index 100%
rename from src/server/game/Pet.cpp
rename to src/server/game/Entities/Pet/Pet.cpp
diff --git a/src/server/game/Pet.h b/src/server/game/Entities/Pet/Pet.h
similarity index 100%
rename from src/server/game/Pet.h
rename to src/server/game/Entities/Pet/Pet.h
diff --git a/src/server/game/PetHandler.cpp b/src/server/game/Entities/Pet/PetHandler.cpp
similarity index 100%
rename from src/server/game/PetHandler.cpp
rename to src/server/game/Entities/Pet/PetHandler.cpp
diff --git a/src/server/game/CharacterHandler.cpp b/src/server/game/Entities/Player/CharacterHandler.cpp
similarity index 100%
rename from src/server/game/CharacterHandler.cpp
rename to src/server/game/Entities/Player/CharacterHandler.cpp
diff --git a/src/server/game/DuelHandler.cpp b/src/server/game/Entities/Player/DuelHandler.cpp
similarity index 100%
rename from src/server/game/DuelHandler.cpp
rename to src/server/game/Entities/Player/DuelHandler.cpp
diff --git a/src/server/game/MiscHandler.cpp b/src/server/game/Entities/Player/MiscHandler.cpp
similarity index 100%
rename from src/server/game/MiscHandler.cpp
rename to src/server/game/Entities/Player/MiscHandler.cpp
diff --git a/src/server/game/PetitionsHandler.cpp b/src/server/game/Entities/Player/PetitionsHandler.cpp
similarity index 100%
rename from src/server/game/PetitionsHandler.cpp
rename to src/server/game/Entities/Player/PetitionsHandler.cpp
diff --git a/src/server/game/Player.cpp b/src/server/game/Entities/Player/Player.cpp
similarity index 100%
rename from src/server/game/Player.cpp
rename to src/server/game/Entities/Player/Player.cpp
diff --git a/src/server/game/Player.h b/src/server/game/Entities/Player/Player.h
similarity index 100%
rename from src/server/game/Player.h
rename to src/server/game/Entities/Player/Player.h
diff --git a/src/server/game/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
similarity index 100%
rename from src/server/game/SocialMgr.cpp
rename to src/server/game/Entities/Player/SocialMgr.cpp
diff --git a/src/server/game/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
similarity index 100%
rename from src/server/game/SocialMgr.h
rename to src/server/game/Entities/Player/SocialMgr.h
diff --git a/src/server/game/TicketHandler.cpp b/src/server/game/Entities/Player/TicketHandler.cpp
similarity index 100%
rename from src/server/game/TicketHandler.cpp
rename to src/server/game/Entities/Player/TicketHandler.cpp
diff --git a/src/server/game/TradeHandler.cpp b/src/server/game/Entities/Player/TradeHandler.cpp
similarity index 100%
rename from src/server/game/TradeHandler.cpp
rename to src/server/game/Entities/Player/TradeHandler.cpp
diff --git a/src/server/game/VoiceChatHandler.cpp b/src/server/game/Entities/Player/VoiceChatHandler.cpp
similarity index 100%
rename from src/server/game/VoiceChatHandler.cpp
rename to src/server/game/Entities/Player/VoiceChatHandler.cpp
diff --git a/src/server/game/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp
similarity index 100%
rename from src/server/game/Totem.cpp
rename to src/server/game/Entities/Totem/Totem.cpp
diff --git a/src/server/game/Totem.h b/src/server/game/Entities/Totem/Totem.h
similarity index 100%
rename from src/server/game/Totem.h
rename to src/server/game/Entities/Totem/Totem.h
diff --git a/src/server/game/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
similarity index 100%
rename from src/server/game/StatSystem.cpp
rename to src/server/game/Entities/Unit/StatSystem.cpp
diff --git a/src/server/game/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
similarity index 100%
rename from src/server/game/Unit.cpp
rename to src/server/game/Entities/Unit/Unit.cpp
diff --git a/src/server/game/Unit.h b/src/server/game/Entities/Unit/Unit.h
similarity index 100%
rename from src/server/game/Unit.h
rename to src/server/game/Entities/Unit/Unit.h
diff --git a/src/server/game/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
similarity index 100%
rename from src/server/game/Vehicle.cpp
rename to src/server/game/Entities/Vehicle/Vehicle.cpp
diff --git a/src/server/game/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h
similarity index 100%
rename from src/server/game/Vehicle.h
rename to src/server/game/Entities/Vehicle/Vehicle.h
diff --git a/src/server/game/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
similarity index 100%
rename from src/server/game/GameEventMgr.cpp
rename to src/server/game/Events/GameEventMgr.cpp
diff --git a/src/server/game/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
similarity index 100%
rename from src/server/game/GameEventMgr.h
rename to src/server/game/Events/GameEventMgr.h
diff --git a/src/server/game/GlobalEvents.cpp b/src/server/game/Events/GlobalEvents.cpp
similarity index 100%
rename from src/server/game/GlobalEvents.cpp
rename to src/server/game/Events/GlobalEvents.cpp
diff --git a/src/server/game/GlobalEvents.h b/src/server/game/Events/GlobalEvents.h
similarity index 100%
rename from src/server/game/GlobalEvents.h
rename to src/server/game/Events/GlobalEvents.h
diff --git a/src/server/game/UnitEvents.h b/src/server/game/Events/UnitEvents.h
similarity index 100%
rename from src/server/game/UnitEvents.h
rename to src/server/game/Events/UnitEvents.h
diff --git a/src/server/game/Formulas.h b/src/server/game/Globals/Formulas.h
similarity index 100%
rename from src/server/game/Formulas.h
rename to src/server/game/Globals/Formulas.h
diff --git a/src/server/game/Language.h b/src/server/game/Globals/Language.h
similarity index 100%
rename from src/server/game/Language.h
rename to src/server/game/Globals/Language.h
diff --git a/src/server/game/SharedDefines.h b/src/server/game/Globals/SharedDefines.h
similarity index 100%
rename from src/server/game/SharedDefines.h
rename to src/server/game/Globals/SharedDefines.h
diff --git a/src/server/game/Group.cpp b/src/server/game/Groups/Group.cpp
similarity index 100%
rename from src/server/game/Group.cpp
rename to src/server/game/Groups/Group.cpp
diff --git a/src/server/game/Group.h b/src/server/game/Groups/Group.h
similarity index 100%
rename from src/server/game/Group.h
rename to src/server/game/Groups/Group.h
diff --git a/src/server/game/GroupHandler.cpp b/src/server/game/Groups/GroupHandler.cpp
similarity index 100%
rename from src/server/game/GroupHandler.cpp
rename to src/server/game/Groups/GroupHandler.cpp
diff --git a/src/server/game/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h
similarity index 100%
rename from src/server/game/GroupRefManager.h
rename to src/server/game/Groups/GroupRefManager.h
diff --git a/src/server/game/GroupReference.cpp b/src/server/game/Groups/GroupReference.cpp
similarity index 100%
rename from src/server/game/GroupReference.cpp
rename to src/server/game/Groups/GroupReference.cpp
diff --git a/src/server/game/GroupReference.h b/src/server/game/Groups/GroupReference.h
similarity index 100%
rename from src/server/game/GroupReference.h
rename to src/server/game/Groups/GroupReference.h
diff --git a/src/server/game/Guild.cpp b/src/server/game/Guilds/Guild.cpp
similarity index 100%
rename from src/server/game/Guild.cpp
rename to src/server/game/Guilds/Guild.cpp
diff --git a/src/server/game/Guild.h b/src/server/game/Guilds/Guild.h
similarity index 100%
rename from src/server/game/Guild.h
rename to src/server/game/Guilds/Guild.h
diff --git a/src/server/game/GuildHandler.cpp b/src/server/game/Guilds/GuildHandler.cpp
similarity index 100%
rename from src/server/game/GuildHandler.cpp
rename to src/server/game/Guilds/GuildHandler.cpp
diff --git a/src/server/game/InstanceData.cpp b/src/server/game/Instances/InstanceData.cpp
similarity index 100%
rename from src/server/game/InstanceData.cpp
rename to src/server/game/Instances/InstanceData.cpp
diff --git a/src/server/game/InstanceData.h b/src/server/game/Instances/InstanceData.h
similarity index 100%
rename from src/server/game/InstanceData.h
rename to src/server/game/Instances/InstanceData.h
diff --git a/src/server/game/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
similarity index 100%
rename from src/server/game/InstanceSaveMgr.cpp
rename to src/server/game/Instances/InstanceSaveMgr.cpp
diff --git a/src/server/game/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
similarity index 100%
rename from src/server/game/InstanceSaveMgr.h
rename to src/server/game/Instances/InstanceSaveMgr.h
diff --git a/src/server/game/LFG.h b/src/server/game/LookingForGroup/LFG.h
similarity index 100%
rename from src/server/game/LFG.h
rename to src/server/game/LookingForGroup/LFG.h
diff --git a/src/server/game/LFGHandler.cpp b/src/server/game/LookingForGroup/LFGHandler.cpp
similarity index 100%
rename from src/server/game/LFGHandler.cpp
rename to src/server/game/LookingForGroup/LFGHandler.cpp
diff --git a/src/server/game/LFGMgr.cpp b/src/server/game/LookingForGroup/LFGMgr.cpp
similarity index 100%
rename from src/server/game/LFGMgr.cpp
rename to src/server/game/LookingForGroup/LFGMgr.cpp
diff --git a/src/server/game/LFGMgr.h b/src/server/game/LookingForGroup/LFGMgr.h
similarity index 100%
rename from src/server/game/LFGMgr.h
rename to src/server/game/LookingForGroup/LFGMgr.h
diff --git a/src/server/game/LootHandler.cpp b/src/server/game/Loot/LootHandler.cpp
similarity index 100%
rename from src/server/game/LootHandler.cpp
rename to src/server/game/Loot/LootHandler.cpp
diff --git a/src/server/game/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
similarity index 100%
rename from src/server/game/LootMgr.cpp
rename to src/server/game/Loot/LootMgr.cpp
diff --git a/src/server/game/LootMgr.h b/src/server/game/Loot/LootMgr.h
similarity index 100%
rename from src/server/game/LootMgr.h
rename to src/server/game/Loot/LootMgr.h
diff --git a/src/server/game/Mail.cpp b/src/server/game/Mails/Mail.cpp
similarity index 100%
rename from src/server/game/Mail.cpp
rename to src/server/game/Mails/Mail.cpp
diff --git a/src/server/game/Mail.h b/src/server/game/Mails/Mail.h
similarity index 100%
rename from src/server/game/Mail.h
rename to src/server/game/Mails/Mail.h
diff --git a/src/server/game/Cell.h b/src/server/game/Map/Cell/Cell.h
similarity index 100%
rename from src/server/game/Cell.h
rename to src/server/game/Map/Cell/Cell.h
diff --git a/src/server/game/CellImpl.h b/src/server/game/Map/Cell/CellImpl.h
similarity index 100%
rename from src/server/game/CellImpl.h
rename to src/server/game/Map/Cell/CellImpl.h
diff --git a/src/server/game/GridDefines.h b/src/server/game/Map/Grid/GridDefines.h
similarity index 100%
rename from src/server/game/GridDefines.h
rename to src/server/game/Map/Grid/GridDefines.h
diff --git a/src/server/game/GridNotifiers.cpp b/src/server/game/Map/Grid/GridNotifiers.cpp
similarity index 100%
rename from src/server/game/GridNotifiers.cpp
rename to src/server/game/Map/Grid/GridNotifiers.cpp
diff --git a/src/server/game/GridNotifiers.h b/src/server/game/Map/Grid/GridNotifiers.h
similarity index 100%
rename from src/server/game/GridNotifiers.h
rename to src/server/game/Map/Grid/GridNotifiers.h
diff --git a/src/server/game/GridNotifiersImpl.h b/src/server/game/Map/Grid/GridNotifiersImpl.h
similarity index 100%
rename from src/server/game/GridNotifiersImpl.h
rename to src/server/game/Map/Grid/GridNotifiersImpl.h
diff --git a/src/server/game/GridStates.cpp b/src/server/game/Map/Grid/GridStates.cpp
similarity index 100%
rename from src/server/game/GridStates.cpp
rename to src/server/game/Map/Grid/GridStates.cpp
diff --git a/src/server/game/GridStates.h b/src/server/game/Map/Grid/GridStates.h
similarity index 100%
rename from src/server/game/GridStates.h
rename to src/server/game/Map/Grid/GridStates.h
diff --git a/src/server/game/ObjectGridLoader.cpp b/src/server/game/Map/Grid/ObjectGridLoader.cpp
similarity index 100%
rename from src/server/game/ObjectGridLoader.cpp
rename to src/server/game/Map/Grid/ObjectGridLoader.cpp
diff --git a/src/server/game/ObjectGridLoader.h b/src/server/game/Map/Grid/ObjectGridLoader.h
similarity index 100%
rename from src/server/game/ObjectGridLoader.h
rename to src/server/game/Map/Grid/ObjectGridLoader.h
diff --git a/src/server/game/Map.cpp b/src/server/game/Map/Map.cpp
similarity index 100%
rename from src/server/game/Map.cpp
rename to src/server/game/Map/Map.cpp
diff --git a/src/server/game/Map.h b/src/server/game/Map/Map.h
similarity index 100%
rename from src/server/game/Map.h
rename to src/server/game/Map/Map.h
diff --git a/src/server/game/MapInstanced.cpp b/src/server/game/Map/MapInstanced.cpp
similarity index 100%
rename from src/server/game/MapInstanced.cpp
rename to src/server/game/Map/MapInstanced.cpp
diff --git a/src/server/game/MapInstanced.h b/src/server/game/Map/MapInstanced.h
similarity index 100%
rename from src/server/game/MapInstanced.h
rename to src/server/game/Map/MapInstanced.h
diff --git a/src/server/game/MapManager.cpp b/src/server/game/Map/MapManager.cpp
similarity index 100%
rename from src/server/game/MapManager.cpp
rename to src/server/game/Map/MapManager.cpp
diff --git a/src/server/game/MapManager.h b/src/server/game/Map/MapManager.h
similarity index 100%
rename from src/server/game/MapManager.h
rename to src/server/game/Map/MapManager.h
diff --git a/src/server/game/MapRefManager.h b/src/server/game/Map/MapRefManager.h
similarity index 100%
rename from src/server/game/MapRefManager.h
rename to src/server/game/Map/MapRefManager.h
diff --git a/src/server/game/MapReference.h b/src/server/game/Map/MapReference.h
similarity index 100%
rename from src/server/game/MapReference.h
rename to src/server/game/Map/MapReference.h
diff --git a/src/server/game/MapUpdater.cpp b/src/server/game/Map/MapUpdater.cpp
similarity index 100%
rename from src/server/game/MapUpdater.cpp
rename to src/server/game/Map/MapUpdater.cpp
diff --git a/src/server/game/MapUpdater.h b/src/server/game/Map/MapUpdater.h
similarity index 100%
rename from src/server/game/MapUpdater.h
rename to src/server/game/Map/MapUpdater.h
diff --git a/src/server/game/ObjectPosSelector.cpp b/src/server/game/Map/ObjectPosSelector.cpp
similarity index 100%
rename from src/server/game/ObjectPosSelector.cpp
rename to src/server/game/Map/ObjectPosSelector.cpp
diff --git a/src/server/game/ObjectPosSelector.h b/src/server/game/Map/ObjectPosSelector.h
similarity index 100%
rename from src/server/game/ObjectPosSelector.h
rename to src/server/game/Map/ObjectPosSelector.h
diff --git a/src/server/game/ZoneScript.h b/src/server/game/Map/ZoneScript.h
similarity index 100%
rename from src/server/game/ZoneScript.h
rename to src/server/game/Map/ZoneScript.h
diff --git a/src/server/game/DestinationHolder.cpp b/src/server/game/Movement/DestinationHolder.cpp
similarity index 100%
rename from src/server/game/DestinationHolder.cpp
rename to src/server/game/Movement/DestinationHolder.cpp
diff --git a/src/server/game/DestinationHolder.h b/src/server/game/Movement/DestinationHolder.h
similarity index 100%
rename from src/server/game/DestinationHolder.h
rename to src/server/game/Movement/DestinationHolder.h
diff --git a/src/server/game/DestinationHolderImp.h b/src/server/game/Movement/DestinationHolderImp.h
similarity index 100%
rename from src/server/game/DestinationHolderImp.h
rename to src/server/game/Movement/DestinationHolderImp.h
diff --git a/src/server/game/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
similarity index 100%
rename from src/server/game/FollowerRefManager.h
rename to src/server/game/Movement/FollowerRefManager.h
diff --git a/src/server/game/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp
similarity index 100%
rename from src/server/game/FollowerReference.cpp
rename to src/server/game/Movement/FollowerReference.cpp
diff --git a/src/server/game/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
similarity index 100%
rename from src/server/game/FollowerReference.h
rename to src/server/game/Movement/FollowerReference.h
diff --git a/src/server/game/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
similarity index 100%
rename from src/server/game/MotionMaster.cpp
rename to src/server/game/Movement/MotionMaster.cpp
diff --git a/src/server/game/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
similarity index 100%
rename from src/server/game/MotionMaster.h
rename to src/server/game/Movement/MotionMaster.h
diff --git a/src/server/game/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
similarity index 100%
rename from src/server/game/ConfusedMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
diff --git a/src/server/game/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
similarity index 100%
rename from src/server/game/ConfusedMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
diff --git a/src/server/game/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
similarity index 100%
rename from src/server/game/FleeingMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
diff --git a/src/server/game/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
similarity index 100%
rename from src/server/game/FleeingMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
diff --git a/src/server/game/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
similarity index 100%
rename from src/server/game/HomeMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
diff --git a/src/server/game/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
similarity index 100%
rename from src/server/game/HomeMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
diff --git a/src/server/game/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
similarity index 100%
rename from src/server/game/IdleMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
diff --git a/src/server/game/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
similarity index 100%
rename from src/server/game/IdleMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
diff --git a/src/server/game/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/MovementGenerator.cpp
similarity index 100%
rename from src/server/game/MovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/MovementGenerator.cpp
diff --git a/src/server/game/MovementGenerator.h b/src/server/game/Movement/MovementGenerators/MovementGenerator.h
similarity index 100%
rename from src/server/game/MovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/MovementGenerator.h
diff --git a/src/server/game/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGenerators/MovementGeneratorImpl.h
similarity index 100%
rename from src/server/game/MovementGeneratorImpl.h
rename to src/server/game/Movement/MovementGenerators/MovementGeneratorImpl.h
diff --git a/src/server/game/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
similarity index 100%
rename from src/server/game/PointMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
diff --git a/src/server/game/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
similarity index 100%
rename from src/server/game/PointMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
diff --git a/src/server/game/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
similarity index 100%
rename from src/server/game/RandomMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
diff --git a/src/server/game/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
similarity index 100%
rename from src/server/game/RandomMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
diff --git a/src/server/game/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
similarity index 100%
rename from src/server/game/TargetedMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
diff --git a/src/server/game/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
similarity index 100%
rename from src/server/game/TargetedMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
diff --git a/src/server/game/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
similarity index 100%
rename from src/server/game/WaypointMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
diff --git a/src/server/game/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
similarity index 100%
rename from src/server/game/WaypointMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
diff --git a/src/server/game/MovementHandler.cpp b/src/server/game/Movement/MovementHandler.cpp
similarity index 100%
rename from src/server/game/MovementHandler.cpp
rename to src/server/game/Movement/MovementHandler.cpp
diff --git a/src/server/game/Path.h b/src/server/game/Movement/Path.h
similarity index 100%
rename from src/server/game/Path.h
rename to src/server/game/Movement/Path.h
diff --git a/src/server/game/TaxiHandler.cpp b/src/server/game/Movement/TaxiHandler.cpp
similarity index 100%
rename from src/server/game/TaxiHandler.cpp
rename to src/server/game/Movement/TaxiHandler.cpp
diff --git a/src/server/game/Transports.cpp b/src/server/game/Movement/Transports.cpp
similarity index 100%
rename from src/server/game/Transports.cpp
rename to src/server/game/Movement/Transports.cpp
diff --git a/src/server/game/Transports.h b/src/server/game/Movement/Transports.h
similarity index 100%
rename from src/server/game/Transports.h
rename to src/server/game/Movement/Transports.h
diff --git a/src/server/game/Traveller.h b/src/server/game/Movement/Traveller.h
similarity index 100%
rename from src/server/game/Traveller.h
rename to src/server/game/Movement/Traveller.h
diff --git a/src/server/game/WaypointManager.cpp b/src/server/game/Movement/WaypointManager.cpp
similarity index 100%
rename from src/server/game/WaypointManager.cpp
rename to src/server/game/Movement/WaypointManager.cpp
diff --git a/src/server/game/WaypointManager.h b/src/server/game/Movement/WaypointManager.h
similarity index 100%
rename from src/server/game/WaypointManager.h
rename to src/server/game/Movement/WaypointManager.h
diff --git a/src/server/game/Opcodes.cpp b/src/server/game/Opcodes/Opcodes.cpp
similarity index 100%
rename from src/server/game/Opcodes.cpp
rename to src/server/game/Opcodes/Opcodes.cpp
diff --git a/src/server/game/Opcodes.h b/src/server/game/Opcodes/Opcodes.h
similarity index 100%
rename from src/server/game/Opcodes.h
rename to src/server/game/Opcodes/Opcodes.h
diff --git a/src/server/game/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
similarity index 100%
rename from src/server/game/OutdoorPvP.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvP.cpp
diff --git a/src/server/game/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
similarity index 100%
rename from src/server/game/OutdoorPvP.h
rename to src/server/game/OutdoorPvP/OutdoorPvP.h
diff --git a/src/server/game/OutdoorPvPEP.cpp b/src/server/game/OutdoorPvP/OutdoorPvPEP.cpp
similarity index 100%
rename from src/server/game/OutdoorPvPEP.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvPEP.cpp
diff --git a/src/server/game/OutdoorPvPEP.h b/src/server/game/OutdoorPvP/OutdoorPvPEP.h
similarity index 100%
rename from src/server/game/OutdoorPvPEP.h
rename to src/server/game/OutdoorPvP/OutdoorPvPEP.h
diff --git a/src/server/game/OutdoorPvPHP.cpp b/src/server/game/OutdoorPvP/OutdoorPvPHP.cpp
similarity index 100%
rename from src/server/game/OutdoorPvPHP.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvPHP.cpp
diff --git a/src/server/game/OutdoorPvPHP.h b/src/server/game/OutdoorPvP/OutdoorPvPHP.h
similarity index 100%
rename from src/server/game/OutdoorPvPHP.h
rename to src/server/game/OutdoorPvP/OutdoorPvPHP.h
diff --git a/src/server/game/OutdoorPvPImpl.h b/src/server/game/OutdoorPvP/OutdoorPvPImpl.h
similarity index 100%
rename from src/server/game/OutdoorPvPImpl.h
rename to src/server/game/OutdoorPvP/OutdoorPvPImpl.h
diff --git a/src/server/game/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
similarity index 100%
rename from src/server/game/OutdoorPvPMgr.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
diff --git a/src/server/game/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
similarity index 100%
rename from src/server/game/OutdoorPvPMgr.h
rename to src/server/game/OutdoorPvP/OutdoorPvPMgr.h
diff --git a/src/server/game/OutdoorPvPNA.cpp b/src/server/game/OutdoorPvP/OutdoorPvPNA.cpp
similarity index 100%
rename from src/server/game/OutdoorPvPNA.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvPNA.cpp
diff --git a/src/server/game/OutdoorPvPNA.h b/src/server/game/OutdoorPvP/OutdoorPvPNA.h
similarity index 100%
rename from src/server/game/OutdoorPvPNA.h
rename to src/server/game/OutdoorPvP/OutdoorPvPNA.h
diff --git a/src/server/game/OutdoorPvPSI.cpp b/src/server/game/OutdoorPvP/OutdoorPvPSI.cpp
similarity index 100%
rename from src/server/game/OutdoorPvPSI.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvPSI.cpp
diff --git a/src/server/game/OutdoorPvPSI.h b/src/server/game/OutdoorPvP/OutdoorPvPSI.h
similarity index 100%
rename from src/server/game/OutdoorPvPSI.h
rename to src/server/game/OutdoorPvP/OutdoorPvPSI.h
diff --git a/src/server/game/OutdoorPvPTF.cpp b/src/server/game/OutdoorPvP/OutdoorPvPTF.cpp
similarity index 100%
rename from src/server/game/OutdoorPvPTF.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvPTF.cpp
diff --git a/src/server/game/OutdoorPvPTF.h b/src/server/game/OutdoorPvP/OutdoorPvPTF.h
similarity index 100%
rename from src/server/game/OutdoorPvPTF.h
rename to src/server/game/OutdoorPvP/OutdoorPvPTF.h
diff --git a/src/server/game/OutdoorPvPZM.cpp b/src/server/game/OutdoorPvP/OutdoorPvPZM.cpp
similarity index 100%
rename from src/server/game/OutdoorPvPZM.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvPZM.cpp
diff --git a/src/server/game/OutdoorPvPZM.h b/src/server/game/OutdoorPvP/OutdoorPvPZM.h
similarity index 100%
rename from src/server/game/OutdoorPvPZM.h
rename to src/server/game/OutdoorPvP/OutdoorPvPZM.h
diff --git a/src/server/game/PoolHandler.cpp b/src/server/game/Pools/PoolHandler.cpp
similarity index 100%
rename from src/server/game/PoolHandler.cpp
rename to src/server/game/Pools/PoolHandler.cpp
diff --git a/src/server/game/PoolHandler.h b/src/server/game/Pools/PoolHandler.h
similarity index 100%
rename from src/server/game/PoolHandler.h
rename to src/server/game/Pools/PoolHandler.h
diff --git a/src/server/game/pchdef.cpp b/src/server/game/PrecompiledHeaders/pchdef.cpp
similarity index 100%
rename from src/server/game/pchdef.cpp
rename to src/server/game/PrecompiledHeaders/pchdef.cpp
diff --git a/src/server/game/pchdef.h b/src/server/game/PrecompiledHeaders/pchdef.h
similarity index 100%
rename from src/server/game/pchdef.h
rename to src/server/game/PrecompiledHeaders/pchdef.h
diff --git a/src/server/game/pchlinux.cpp b/src/server/game/PrecompiledHeaders/pchlinux.cpp
similarity index 100%
rename from src/server/game/pchlinux.cpp
rename to src/server/game/PrecompiledHeaders/pchlinux.cpp
diff --git a/src/server/game/pchlinux.h b/src/server/game/PrecompiledHeaders/pchlinux.h
similarity index 100%
rename from src/server/game/pchlinux.h
rename to src/server/game/PrecompiledHeaders/pchlinux.h
diff --git a/src/server/game/QueryHandler.cpp b/src/server/game/Quests/QueryHandler.cpp
similarity index 100%
rename from src/server/game/QueryHandler.cpp
rename to src/server/game/Quests/QueryHandler.cpp
diff --git a/src/server/game/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
similarity index 100%
rename from src/server/game/QuestDef.cpp
rename to src/server/game/Quests/QuestDef.cpp
diff --git a/src/server/game/QuestDef.h b/src/server/game/Quests/QuestDef.h
similarity index 100%
rename from src/server/game/QuestDef.h
rename to src/server/game/Quests/QuestDef.h
diff --git a/src/server/game/QuestHandler.cpp b/src/server/game/Quests/QuestHandler.cpp
similarity index 100%
rename from src/server/game/QuestHandler.cpp
rename to src/server/game/Quests/QuestHandler.cpp
diff --git a/src/server/game/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp
similarity index 100%
rename from src/server/game/ReputationMgr.cpp
rename to src/server/game/Reputation/ReputationMgr.cpp
diff --git a/src/server/game/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
similarity index 100%
rename from src/server/game/ReputationMgr.h
rename to src/server/game/Reputation/ReputationMgr.h
diff --git a/src/server/game/ScriptLoader.cpp b/src/server/game/ScriptMgr/ScriptLoader.cpp
similarity index 100%
rename from src/server/game/ScriptLoader.cpp
rename to src/server/game/ScriptMgr/ScriptLoader.cpp
diff --git a/src/server/game/ScriptLoader.h b/src/server/game/ScriptMgr/ScriptLoader.h
similarity index 100%
rename from src/server/game/ScriptLoader.h
rename to src/server/game/ScriptMgr/ScriptLoader.h
diff --git a/src/server/game/ScriptMgr.cpp b/src/server/game/ScriptMgr/ScriptMgr.cpp
similarity index 100%
rename from src/server/game/ScriptMgr.cpp
rename to src/server/game/ScriptMgr/ScriptMgr.cpp
diff --git a/src/server/game/ScriptMgr.h b/src/server/game/ScriptMgr/ScriptMgr.h
similarity index 100%
rename from src/server/game/ScriptMgr.h
rename to src/server/game/ScriptMgr/ScriptMgr.h
diff --git a/src/server/game/ScriptSystem.cpp b/src/server/game/ScriptMgr/ScriptSystem.cpp
similarity index 100%
rename from src/server/game/ScriptSystem.cpp
rename to src/server/game/ScriptMgr/ScriptSystem.cpp
diff --git a/src/server/game/ScriptSystem.h b/src/server/game/ScriptMgr/ScriptSystem.h
similarity index 100%
rename from src/server/game/ScriptSystem.h
rename to src/server/game/ScriptMgr/ScriptSystem.h
diff --git a/src/server/game/ScriptedPch.cpp b/src/server/game/ScriptMgr/ScriptedPch.cpp
similarity index 100%
rename from src/server/game/ScriptedPch.cpp
rename to src/server/game/ScriptMgr/ScriptedPch.cpp
diff --git a/src/server/game/ScriptedPch.h b/src/server/game/ScriptMgr/ScriptedPch.h
similarity index 100%
rename from src/server/game/ScriptedPch.h
rename to src/server/game/ScriptMgr/ScriptedPch.h
diff --git a/src/server/game/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp
similarity index 100%
rename from src/server/game/SkillDiscovery.cpp
rename to src/server/game/Skills/SkillDiscovery.cpp
diff --git a/src/server/game/SkillDiscovery.h b/src/server/game/Skills/SkillDiscovery.h
similarity index 100%
rename from src/server/game/SkillDiscovery.h
rename to src/server/game/Skills/SkillDiscovery.h
diff --git a/src/server/game/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp
similarity index 100%
rename from src/server/game/SkillExtraItems.cpp
rename to src/server/game/Skills/SkillExtraItems.cpp
diff --git a/src/server/game/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h
similarity index 100%
rename from src/server/game/SkillExtraItems.h
rename to src/server/game/Skills/SkillExtraItems.h
diff --git a/src/server/game/SkillHandler.cpp b/src/server/game/Skills/SkillHandler.cpp
similarity index 100%
rename from src/server/game/SkillHandler.cpp
rename to src/server/game/Skills/SkillHandler.cpp
diff --git a/src/server/game/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
similarity index 100%
rename from src/server/game/SpellAuraDefines.h
rename to src/server/game/Spells/Auras/SpellAuraDefines.h
diff --git a/src/server/game/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
similarity index 100%
rename from src/server/game/SpellAuraEffects.cpp
rename to src/server/game/Spells/Auras/SpellAuraEffects.cpp
diff --git a/src/server/game/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h
similarity index 100%
rename from src/server/game/SpellAuraEffects.h
rename to src/server/game/Spells/Auras/SpellAuraEffects.h
diff --git a/src/server/game/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
similarity index 100%
rename from src/server/game/SpellAuras.cpp
rename to src/server/game/Spells/Auras/SpellAuras.cpp
diff --git a/src/server/game/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h
similarity index 100%
rename from src/server/game/SpellAuras.h
rename to src/server/game/Spells/Auras/SpellAuras.h
diff --git a/src/server/game/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
similarity index 100%
rename from src/server/game/SpellEffects.cpp
rename to src/server/game/Spells/Auras/SpellEffects.cpp
diff --git a/src/server/game/Spell.cpp b/src/server/game/Spells/Spell.cpp
similarity index 100%
rename from src/server/game/Spell.cpp
rename to src/server/game/Spells/Spell.cpp
diff --git a/src/server/game/Spell.h b/src/server/game/Spells/Spell.h
similarity index 100%
rename from src/server/game/Spell.h
rename to src/server/game/Spells/Spell.h
diff --git a/src/server/game/SpellHandler.cpp b/src/server/game/Spells/SpellHandler.cpp
similarity index 100%
rename from src/server/game/SpellHandler.cpp
rename to src/server/game/Spells/SpellHandler.cpp
diff --git a/src/server/game/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
similarity index 100%
rename from src/server/game/SpellMgr.cpp
rename to src/server/game/Spells/SpellMgr.cpp
diff --git a/src/server/game/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
similarity index 100%
rename from src/server/game/SpellMgr.h
rename to src/server/game/Spells/SpellMgr.h
diff --git a/src/server/game/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
similarity index 100%
rename from src/server/game/PlayerDump.cpp
rename to src/server/game/Tools/PlayerDump.cpp
diff --git a/src/server/game/PlayerDump.h b/src/server/game/Tools/PlayerDump.h
similarity index 100%
rename from src/server/game/PlayerDump.h
rename to src/server/game/Tools/PlayerDump.h
diff --git a/src/server/game/Tools.cpp b/src/server/game/Tools/Tools.cpp
similarity index 100%
rename from src/server/game/Tools.cpp
rename to src/server/game/Tools/Tools.cpp
diff --git a/src/server/game/Tools.h b/src/server/game/Tools/Tools.h
similarity index 100%
rename from src/server/game/Tools.h
rename to src/server/game/Tools/Tools.h
diff --git a/src/server/game/Weather.cpp b/src/server/game/Weather/Weather.cpp
similarity index 100%
rename from src/server/game/Weather.cpp
rename to src/server/game/Weather/Weather.cpp
diff --git a/src/server/game/Weather.h b/src/server/game/Weather/Weather.h
similarity index 100%
rename from src/server/game/Weather.h
rename to src/server/game/Weather/Weather.h
diff --git a/src/server/game/TimeMgr.cpp b/src/server/game/World/TimeMgr.cpp
similarity index 100%
rename from src/server/game/TimeMgr.cpp
rename to src/server/game/World/TimeMgr.cpp
diff --git a/src/server/game/TimeMgr.h b/src/server/game/World/TimeMgr.h
similarity index 100%
rename from src/server/game/TimeMgr.h
rename to src/server/game/World/TimeMgr.h
diff --git a/src/server/game/World.cpp b/src/server/game/World/World.cpp
similarity index 100%
rename from src/server/game/World.cpp
rename to src/server/game/World/World.cpp
diff --git a/src/server/game/World.h b/src/server/game/World/World.h
similarity index 100%
rename from src/server/game/World.h
rename to src/server/game/World/World.h
diff --git a/src/server/game/WorldLog.cpp b/src/server/game/World/WorldLog.cpp
similarity index 100%
rename from src/server/game/WorldLog.cpp
rename to src/server/game/World/WorldLog.cpp
diff --git a/src/server/game/WorldLog.h b/src/server/game/World/WorldLog.h
similarity index 100%
rename from src/server/game/WorldLog.h
rename to src/server/game/World/WorldLog.h
diff --git a/src/server/game/WorldSession.cpp b/src/server/game/World/WorldSession.cpp
similarity index 100%
rename from src/server/game/WorldSession.cpp
rename to src/server/game/World/WorldSession.cpp
diff --git a/src/server/game/WorldSession.h b/src/server/game/World/WorldSession.h
similarity index 100%
rename from src/server/game/WorldSession.h
rename to src/server/game/World/WorldSession.h
diff --git a/src/server/game/WorldSocket.cpp b/src/server/game/World/WorldSocket.cpp
similarity index 100%
rename from src/server/game/WorldSocket.cpp
rename to src/server/game/World/WorldSocket.cpp
diff --git a/src/server/game/WorldSocket.h b/src/server/game/World/WorldSocket.h
similarity index 100%
rename from src/server/game/WorldSocket.h
rename to src/server/game/World/WorldSocket.h
diff --git a/src/server/game/WorldSocketMgr.cpp b/src/server/game/World/WorldSocketMgr.cpp
similarity index 100%
rename from src/server/game/WorldSocketMgr.cpp
rename to src/server/game/World/WorldSocketMgr.cpp
diff --git a/src/server/game/WorldSocketMgr.h b/src/server/game/World/WorldSocketMgr.h
similarity index 100%
rename from src/server/game/WorldSocketMgr.h
rename to src/server/game/World/WorldSocketMgr.h