diff --git a/src/game/Level0.cpp b/src/game/ChatCommands/Level0.cpp
similarity index 100%
rename from src/game/Level0.cpp
rename to src/game/ChatCommands/Level0.cpp
diff --git a/src/game/Level1.cpp b/src/game/ChatCommands/Level1.cpp
similarity index 100%
rename from src/game/Level1.cpp
rename to src/game/ChatCommands/Level1.cpp
diff --git a/src/game/Level2.cpp b/src/game/ChatCommands/Level2.cpp
similarity index 100%
rename from src/game/Level2.cpp
rename to src/game/ChatCommands/Level2.cpp
diff --git a/src/game/Level3.cpp b/src/game/ChatCommands/Level3.cpp
similarity index 100%
rename from src/game/Level3.cpp
rename to src/game/ChatCommands/Level3.cpp
diff --git a/src/game/debugcmds.cpp b/src/game/ChatCommands/debugcmds.cpp
similarity index 100%
rename from src/game/debugcmds.cpp
rename to src/game/ChatCommands/debugcmds.cpp
diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
similarity index 100%
rename from src/game/ConfusedMovementGenerator.cpp
rename to src/game/MotionGenerators/ConfusedMovementGenerator.cpp
diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/MotionGenerators/ConfusedMovementGenerator.h
similarity index 100%
rename from src/game/ConfusedMovementGenerator.h
rename to src/game/MotionGenerators/ConfusedMovementGenerator.h
diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/MotionGenerators/FleeingMovementGenerator.cpp
similarity index 100%
rename from src/game/FleeingMovementGenerator.cpp
rename to src/game/MotionGenerators/FleeingMovementGenerator.cpp
diff --git a/src/game/FleeingMovementGenerator.h b/src/game/MotionGenerators/FleeingMovementGenerator.h
similarity index 100%
rename from src/game/FleeingMovementGenerator.h
rename to src/game/MotionGenerators/FleeingMovementGenerator.h
diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/MotionGenerators/HomeMovementGenerator.cpp
similarity index 100%
rename from src/game/HomeMovementGenerator.cpp
rename to src/game/MotionGenerators/HomeMovementGenerator.cpp
diff --git a/src/game/HomeMovementGenerator.h b/src/game/MotionGenerators/HomeMovementGenerator.h
similarity index 100%
rename from src/game/HomeMovementGenerator.h
rename to src/game/MotionGenerators/HomeMovementGenerator.h
diff --git a/src/game/IdleMovementGenerator.cpp b/src/game/MotionGenerators/IdleMovementGenerator.cpp
similarity index 100%
rename from src/game/IdleMovementGenerator.cpp
rename to src/game/MotionGenerators/IdleMovementGenerator.cpp
diff --git a/src/game/IdleMovementGenerator.h b/src/game/MotionGenerators/IdleMovementGenerator.h
similarity index 100%
rename from src/game/IdleMovementGenerator.h
rename to src/game/MotionGenerators/IdleMovementGenerator.h
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionGenerators/MotionMaster.cpp
similarity index 100%
rename from src/game/MotionMaster.cpp
rename to src/game/MotionGenerators/MotionMaster.cpp
diff --git a/src/game/MotionMaster.h b/src/game/MotionGenerators/MotionMaster.h
similarity index 100%
rename from src/game/MotionMaster.h
rename to src/game/MotionGenerators/MotionMaster.h
diff --git a/src/game/MovementGenerator.cpp b/src/game/MotionGenerators/MovementGenerator.cpp
similarity index 100%
rename from src/game/MovementGenerator.cpp
rename to src/game/MotionGenerators/MovementGenerator.cpp
diff --git a/src/game/MovementGenerator.h b/src/game/MotionGenerators/MovementGenerator.h
similarity index 100%
rename from src/game/MovementGenerator.h
rename to src/game/MotionGenerators/MovementGenerator.h
diff --git a/src/game/PathFinder.cpp b/src/game/MotionGenerators/PathFinder.cpp
similarity index 100%
rename from src/game/PathFinder.cpp
rename to src/game/MotionGenerators/PathFinder.cpp
diff --git a/src/game/PathFinder.h b/src/game/MotionGenerators/PathFinder.h
similarity index 100%
rename from src/game/PathFinder.h
rename to src/game/MotionGenerators/PathFinder.h
diff --git a/src/game/PointMovementGenerator.cpp b/src/game/MotionGenerators/PointMovementGenerator.cpp
similarity index 100%
rename from src/game/PointMovementGenerator.cpp
rename to src/game/MotionGenerators/PointMovementGenerator.cpp
diff --git a/src/game/PointMovementGenerator.h b/src/game/MotionGenerators/PointMovementGenerator.h
similarity index 100%
rename from src/game/PointMovementGenerator.h
rename to src/game/MotionGenerators/PointMovementGenerator.h
diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/MotionGenerators/RandomMovementGenerator.cpp
similarity index 100%
rename from src/game/RandomMovementGenerator.cpp
rename to src/game/MotionGenerators/RandomMovementGenerator.cpp
diff --git a/src/game/RandomMovementGenerator.h b/src/game/MotionGenerators/RandomMovementGenerator.h
similarity index 100%
rename from src/game/RandomMovementGenerator.h
rename to src/game/MotionGenerators/RandomMovementGenerator.h
diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/MotionGenerators/TargetedMovementGenerator.cpp
similarity index 100%
rename from src/game/TargetedMovementGenerator.cpp
rename to src/game/MotionGenerators/TargetedMovementGenerator.cpp
diff --git a/src/game/TargetedMovementGenerator.h b/src/game/MotionGenerators/TargetedMovementGenerator.h
similarity index 100%
rename from src/game/TargetedMovementGenerator.h
rename to src/game/MotionGenerators/TargetedMovementGenerator.h
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/MotionGenerators/WaypointMovementGenerator.cpp
similarity index 100%
rename from src/game/WaypointMovementGenerator.cpp
rename to src/game/MotionGenerators/WaypointMovementGenerator.cpp
diff --git a/src/game/WaypointMovementGenerator.h b/src/game/MotionGenerators/WaypointMovementGenerator.h
similarity index 100%
rename from src/game/WaypointMovementGenerator.h
rename to src/game/MotionGenerators/WaypointMovementGenerator.h
diff --git a/src/game/AggressorAI.cpp b/src/game/Object/AggressorAI.cpp
similarity index 100%
rename from src/game/AggressorAI.cpp
rename to src/game/Object/AggressorAI.cpp
diff --git a/src/game/AggressorAI.h b/src/game/Object/AggressorAI.h
similarity index 100%
rename from src/game/AggressorAI.h
rename to src/game/Object/AggressorAI.h
diff --git a/src/game/ArenaTeam.cpp b/src/game/Object/ArenaTeam.cpp
similarity index 100%
rename from src/game/ArenaTeam.cpp
rename to src/game/Object/ArenaTeam.cpp
diff --git a/src/game/ArenaTeam.h b/src/game/Object/ArenaTeam.h
similarity index 100%
rename from src/game/ArenaTeam.h
rename to src/game/Object/ArenaTeam.h
diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/Object/AuctionHouseMgr.cpp
similarity index 100%
rename from src/game/AuctionHouseMgr.cpp
rename to src/game/Object/AuctionHouseMgr.cpp
diff --git a/src/game/AuctionHouseMgr.h b/src/game/Object/AuctionHouseMgr.h
similarity index 100%
rename from src/game/AuctionHouseMgr.h
rename to src/game/Object/AuctionHouseMgr.h
diff --git a/src/game/Bag.cpp b/src/game/Object/Bag.cpp
similarity index 100%
rename from src/game/Bag.cpp
rename to src/game/Object/Bag.cpp
diff --git a/src/game/Bag.h b/src/game/Object/Bag.h
similarity index 100%
rename from src/game/Bag.h
rename to src/game/Object/Bag.h
diff --git a/src/game/Camera.cpp b/src/game/Object/Camera.cpp
similarity index 100%
rename from src/game/Camera.cpp
rename to src/game/Object/Camera.cpp
diff --git a/src/game/Camera.h b/src/game/Object/Camera.h
similarity index 100%
rename from src/game/Camera.h
rename to src/game/Object/Camera.h
diff --git a/src/game/Corpse.cpp b/src/game/Object/Corpse.cpp
similarity index 100%
rename from src/game/Corpse.cpp
rename to src/game/Object/Corpse.cpp
diff --git a/src/game/Corpse.h b/src/game/Object/Corpse.h
similarity index 100%
rename from src/game/Corpse.h
rename to src/game/Object/Corpse.h
diff --git a/src/game/Creature.cpp b/src/game/Object/Creature.cpp
similarity index 100%
rename from src/game/Creature.cpp
rename to src/game/Object/Creature.cpp
diff --git a/src/game/Creature.h b/src/game/Object/Creature.h
similarity index 100%
rename from src/game/Creature.h
rename to src/game/Object/Creature.h
diff --git a/src/game/CreatureAI.cpp b/src/game/Object/CreatureAI.cpp
similarity index 100%
rename from src/game/CreatureAI.cpp
rename to src/game/Object/CreatureAI.cpp
diff --git a/src/game/CreatureAI.h b/src/game/Object/CreatureAI.h
similarity index 100%
rename from src/game/CreatureAI.h
rename to src/game/Object/CreatureAI.h
diff --git a/src/game/CreatureAIImpl.h b/src/game/Object/CreatureAIImpl.h
similarity index 100%
rename from src/game/CreatureAIImpl.h
rename to src/game/Object/CreatureAIImpl.h
diff --git a/src/game/CreatureAIRegistry.cpp b/src/game/Object/CreatureAIRegistry.cpp
similarity index 100%
rename from src/game/CreatureAIRegistry.cpp
rename to src/game/Object/CreatureAIRegistry.cpp
diff --git a/src/game/CreatureAIRegistry.h b/src/game/Object/CreatureAIRegistry.h
similarity index 100%
rename from src/game/CreatureAIRegistry.h
rename to src/game/Object/CreatureAIRegistry.h
diff --git a/src/game/CreatureAISelector.cpp b/src/game/Object/CreatureAISelector.cpp
similarity index 100%
rename from src/game/CreatureAISelector.cpp
rename to src/game/Object/CreatureAISelector.cpp
diff --git a/src/game/CreatureAISelector.h b/src/game/Object/CreatureAISelector.h
similarity index 100%
rename from src/game/CreatureAISelector.h
rename to src/game/Object/CreatureAISelector.h
diff --git a/src/game/CreatureEventAI.cpp b/src/game/Object/CreatureEventAI.cpp
similarity index 100%
rename from src/game/CreatureEventAI.cpp
rename to src/game/Object/CreatureEventAI.cpp
diff --git a/src/game/CreatureEventAI.h b/src/game/Object/CreatureEventAI.h
similarity index 100%
rename from src/game/CreatureEventAI.h
rename to src/game/Object/CreatureEventAI.h
diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/Object/CreatureEventAIMgr.cpp
similarity index 100%
rename from src/game/CreatureEventAIMgr.cpp
rename to src/game/Object/CreatureEventAIMgr.cpp
diff --git a/src/game/CreatureEventAIMgr.h b/src/game/Object/CreatureEventAIMgr.h
similarity index 100%
rename from src/game/CreatureEventAIMgr.h
rename to src/game/Object/CreatureEventAIMgr.h
diff --git a/src/game/DynamicObject.cpp b/src/game/Object/DynamicObject.cpp
similarity index 100%
rename from src/game/DynamicObject.cpp
rename to src/game/Object/DynamicObject.cpp
diff --git a/src/game/DynamicObject.h b/src/game/Object/DynamicObject.h
similarity index 100%
rename from src/game/DynamicObject.h
rename to src/game/Object/DynamicObject.h
diff --git a/src/game/Formulas.h b/src/game/Object/Formulas.h
similarity index 100%
rename from src/game/Formulas.h
rename to src/game/Object/Formulas.h
diff --git a/src/game/GMTicketMgr.cpp b/src/game/Object/GMTicketMgr.cpp
similarity index 100%
rename from src/game/GMTicketMgr.cpp
rename to src/game/Object/GMTicketMgr.cpp
diff --git a/src/game/GMTicketMgr.h b/src/game/Object/GMTicketMgr.h
similarity index 100%
rename from src/game/GMTicketMgr.h
rename to src/game/Object/GMTicketMgr.h
diff --git a/src/game/GameObject.cpp b/src/game/Object/GameObject.cpp
similarity index 100%
rename from src/game/GameObject.cpp
rename to src/game/Object/GameObject.cpp
diff --git a/src/game/GameObject.h b/src/game/Object/GameObject.h
similarity index 100%
rename from src/game/GameObject.h
rename to src/game/Object/GameObject.h
diff --git a/src/game/GuardAI.cpp b/src/game/Object/GuardAI.cpp
similarity index 100%
rename from src/game/GuardAI.cpp
rename to src/game/Object/GuardAI.cpp
diff --git a/src/game/GuardAI.h b/src/game/Object/GuardAI.h
similarity index 100%
rename from src/game/GuardAI.h
rename to src/game/Object/GuardAI.h
diff --git a/src/game/Guild.cpp b/src/game/Object/Guild.cpp
similarity index 100%
rename from src/game/Guild.cpp
rename to src/game/Object/Guild.cpp
diff --git a/src/game/Guild.h b/src/game/Object/Guild.h
similarity index 100%
rename from src/game/Guild.h
rename to src/game/Object/Guild.h
diff --git a/src/game/Item.cpp b/src/game/Object/Item.cpp
similarity index 100%
rename from src/game/Item.cpp
rename to src/game/Object/Item.cpp
diff --git a/src/game/Item.h b/src/game/Object/Item.h
similarity index 100%
rename from src/game/Item.h
rename to src/game/Object/Item.h
diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/Object/ItemEnchantmentMgr.cpp
similarity index 100%
rename from src/game/ItemEnchantmentMgr.cpp
rename to src/game/Object/ItemEnchantmentMgr.cpp
diff --git a/src/game/ItemEnchantmentMgr.h b/src/game/Object/ItemEnchantmentMgr.h
similarity index 100%
rename from src/game/ItemEnchantmentMgr.h
rename to src/game/Object/ItemEnchantmentMgr.h
diff --git a/src/game/ItemPrototype.h b/src/game/Object/ItemPrototype.h
similarity index 100%
rename from src/game/ItemPrototype.h
rename to src/game/Object/ItemPrototype.h
diff --git a/src/game/LootMgr.cpp b/src/game/Object/LootMgr.cpp
similarity index 100%
rename from src/game/LootMgr.cpp
rename to src/game/Object/LootMgr.cpp
diff --git a/src/game/LootMgr.h b/src/game/Object/LootMgr.h
similarity index 100%
rename from src/game/LootMgr.h
rename to src/game/Object/LootMgr.h
diff --git a/src/game/NullCreatureAI.cpp b/src/game/Object/NullCreatureAI.cpp
similarity index 100%
rename from src/game/NullCreatureAI.cpp
rename to src/game/Object/NullCreatureAI.cpp
diff --git a/src/game/NullCreatureAI.h b/src/game/Object/NullCreatureAI.h
similarity index 100%
rename from src/game/NullCreatureAI.h
rename to src/game/Object/NullCreatureAI.h
diff --git a/src/game/Object.cpp b/src/game/Object/Object.cpp
similarity index 100%
rename from src/game/Object.cpp
rename to src/game/Object/Object.cpp
diff --git a/src/game/Object.h b/src/game/Object/Object.h
similarity index 100%
rename from src/game/Object.h
rename to src/game/Object/Object.h
diff --git a/src/game/ObjectAccessor.cpp b/src/game/Object/ObjectAccessor.cpp
similarity index 100%
rename from src/game/ObjectAccessor.cpp
rename to src/game/Object/ObjectAccessor.cpp
diff --git a/src/game/ObjectAccessor.h b/src/game/Object/ObjectAccessor.h
similarity index 100%
rename from src/game/ObjectAccessor.h
rename to src/game/Object/ObjectAccessor.h
diff --git a/src/game/ObjectGuid.cpp b/src/game/Object/ObjectGuid.cpp
similarity index 100%
rename from src/game/ObjectGuid.cpp
rename to src/game/Object/ObjectGuid.cpp
diff --git a/src/game/ObjectGuid.h b/src/game/Object/ObjectGuid.h
similarity index 100%
rename from src/game/ObjectGuid.h
rename to src/game/Object/ObjectGuid.h
diff --git a/src/game/ObjectMgr.cpp b/src/game/Object/ObjectMgr.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src/game/ObjectMgr.cpp
rename to src/game/Object/ObjectMgr.cpp
diff --git a/src/game/ObjectMgr.h b/src/game/Object/ObjectMgr.h
old mode 100755
new mode 100644
similarity index 100%
rename from src/game/ObjectMgr.h
rename to src/game/Object/ObjectMgr.h
diff --git a/src/game/ObjectPosSelector.cpp b/src/game/Object/ObjectPosSelector.cpp
similarity index 100%
rename from src/game/ObjectPosSelector.cpp
rename to src/game/Object/ObjectPosSelector.cpp
diff --git a/src/game/ObjectPosSelector.h b/src/game/Object/ObjectPosSelector.h
similarity index 100%
rename from src/game/ObjectPosSelector.h
rename to src/game/Object/ObjectPosSelector.h
diff --git a/src/game/Pet.cpp b/src/game/Object/Pet.cpp
similarity index 100%
rename from src/game/Pet.cpp
rename to src/game/Object/Pet.cpp
diff --git a/src/game/Pet.h b/src/game/Object/Pet.h
similarity index 100%
rename from src/game/Pet.h
rename to src/game/Object/Pet.h
diff --git a/src/game/PetAI.cpp b/src/game/Object/PetAI.cpp
similarity index 100%
rename from src/game/PetAI.cpp
rename to src/game/Object/PetAI.cpp
diff --git a/src/game/PetAI.h b/src/game/Object/PetAI.h
similarity index 100%
rename from src/game/PetAI.h
rename to src/game/Object/PetAI.h
diff --git a/src/game/Player.cpp b/src/game/Object/Player.cpp
similarity index 100%
rename from src/game/Player.cpp
rename to src/game/Object/Player.cpp
diff --git a/src/game/Player.h b/src/game/Object/Player.h
similarity index 100%
rename from src/game/Player.h
rename to src/game/Object/Player.h
diff --git a/src/game/ReactorAI.cpp b/src/game/Object/ReactorAI.cpp
similarity index 100%
rename from src/game/ReactorAI.cpp
rename to src/game/Object/ReactorAI.cpp
diff --git a/src/game/ReactorAI.h b/src/game/Object/ReactorAI.h
similarity index 100%
rename from src/game/ReactorAI.h
rename to src/game/Object/ReactorAI.h
diff --git a/src/game/ReputationMgr.cpp b/src/game/Object/ReputationMgr.cpp
similarity index 100%
rename from src/game/ReputationMgr.cpp
rename to src/game/Object/ReputationMgr.cpp
diff --git a/src/game/ReputationMgr.h b/src/game/Object/ReputationMgr.h
similarity index 100%
rename from src/game/ReputationMgr.h
rename to src/game/Object/ReputationMgr.h
diff --git a/src/game/SocialMgr.cpp b/src/game/Object/SocialMgr.cpp
similarity index 100%
rename from src/game/SocialMgr.cpp
rename to src/game/Object/SocialMgr.cpp
diff --git a/src/game/SocialMgr.h b/src/game/Object/SocialMgr.h
similarity index 100%
rename from src/game/SocialMgr.h
rename to src/game/Object/SocialMgr.h
diff --git a/src/game/SpellMgr.cpp b/src/game/Object/SpellMgr.cpp
similarity index 100%
rename from src/game/SpellMgr.cpp
rename to src/game/Object/SpellMgr.cpp
diff --git a/src/game/SpellMgr.h b/src/game/Object/SpellMgr.h
similarity index 100%
rename from src/game/SpellMgr.h
rename to src/game/Object/SpellMgr.h
diff --git a/src/game/StatSystem.cpp b/src/game/Object/StatSystem.cpp
similarity index 100%
rename from src/game/StatSystem.cpp
rename to src/game/Object/StatSystem.cpp
diff --git a/src/game/TemporarySummon.cpp b/src/game/Object/TemporarySummon.cpp
similarity index 100%
rename from src/game/TemporarySummon.cpp
rename to src/game/Object/TemporarySummon.cpp
diff --git a/src/game/TemporarySummon.h b/src/game/Object/TemporarySummon.h
similarity index 100%
rename from src/game/TemporarySummon.h
rename to src/game/Object/TemporarySummon.h
diff --git a/src/game/Totem.cpp b/src/game/Object/Totem.cpp
similarity index 100%
rename from src/game/Totem.cpp
rename to src/game/Object/Totem.cpp
diff --git a/src/game/Totem.h b/src/game/Object/Totem.h
similarity index 100%
rename from src/game/Totem.h
rename to src/game/Object/Totem.h
diff --git a/src/game/TotemAI.cpp b/src/game/Object/TotemAI.cpp
similarity index 100%
rename from src/game/TotemAI.cpp
rename to src/game/Object/TotemAI.cpp
diff --git a/src/game/TotemAI.h b/src/game/Object/TotemAI.h
similarity index 100%
rename from src/game/TotemAI.h
rename to src/game/Object/TotemAI.h
diff --git a/src/game/Unit.cpp b/src/game/Object/Unit.cpp
similarity index 100%
rename from src/game/Unit.cpp
rename to src/game/Object/Unit.cpp
diff --git a/src/game/Unit.h b/src/game/Object/Unit.h
similarity index 100%
rename from src/game/Unit.h
rename to src/game/Object/Unit.h
diff --git a/src/game/UnitEvents.h b/src/game/Object/UnitEvents.h
similarity index 100%
rename from src/game/UnitEvents.h
rename to src/game/Object/UnitEvents.h
diff --git a/src/game/UpdateFields.h b/src/game/Object/UpdateFields.h
similarity index 100%
rename from src/game/UpdateFields.h
rename to src/game/Object/UpdateFields.h
diff --git a/src/game/UpdateMask.h b/src/game/Object/UpdateMask.h
similarity index 100%
rename from src/game/UpdateMask.h
rename to src/game/Object/UpdateMask.h
diff --git a/src/game/FollowerRefManager.h b/src/game/References/FollowerRefManager.h
similarity index 100%
rename from src/game/FollowerRefManager.h
rename to src/game/References/FollowerRefManager.h
diff --git a/src/game/FollowerReference.cpp b/src/game/References/FollowerReference.cpp
similarity index 100%
rename from src/game/FollowerReference.cpp
rename to src/game/References/FollowerReference.cpp
diff --git a/src/game/FollowerReference.h b/src/game/References/FollowerReference.h
similarity index 100%
rename from src/game/FollowerReference.h
rename to src/game/References/FollowerReference.h
diff --git a/src/game/GroupRefManager.h b/src/game/References/GroupRefManager.h
similarity index 100%
rename from src/game/GroupRefManager.h
rename to src/game/References/GroupRefManager.h
diff --git a/src/game/GroupReference.cpp b/src/game/References/GroupReference.cpp
similarity index 100%
rename from src/game/GroupReference.cpp
rename to src/game/References/GroupReference.cpp
diff --git a/src/game/GroupReference.h b/src/game/References/GroupReference.h
similarity index 100%
rename from src/game/GroupReference.h
rename to src/game/References/GroupReference.h
diff --git a/src/game/HostileRefManager.cpp b/src/game/References/HostileRefManager.cpp
similarity index 100%
rename from src/game/HostileRefManager.cpp
rename to src/game/References/HostileRefManager.cpp
diff --git a/src/game/HostileRefManager.h b/src/game/References/HostileRefManager.h
similarity index 100%
rename from src/game/HostileRefManager.h
rename to src/game/References/HostileRefManager.h
diff --git a/src/game/MapRefManager.h b/src/game/References/MapRefManager.h
similarity index 100%
rename from src/game/MapRefManager.h
rename to src/game/References/MapRefManager.h
diff --git a/src/game/MapReference.h b/src/game/References/MapReference.h
similarity index 100%
rename from src/game/MapReference.h
rename to src/game/References/MapReference.h
diff --git a/src/game/ThreatManager.cpp b/src/game/References/ThreatManager.cpp
similarity index 100%
rename from src/game/ThreatManager.cpp
rename to src/game/References/ThreatManager.cpp
diff --git a/src/game/ThreatManager.h b/src/game/References/ThreatManager.h
similarity index 100%
rename from src/game/ThreatManager.h
rename to src/game/References/ThreatManager.h
diff --git a/src/game/DBCEnums.h b/src/game/Server/DBCEnums.h
similarity index 100%
rename from src/game/DBCEnums.h
rename to src/game/Server/DBCEnums.h
diff --git a/src/game/DBCStores.cpp b/src/game/Server/DBCStores.cpp
similarity index 100%
rename from src/game/DBCStores.cpp
rename to src/game/Server/DBCStores.cpp
diff --git a/src/game/DBCStores.h b/src/game/Server/DBCStores.h
similarity index 100%
rename from src/game/DBCStores.h
rename to src/game/Server/DBCStores.h
diff --git a/src/game/DBCStructure.h b/src/game/Server/DBCStructure.h
similarity index 100%
rename from src/game/DBCStructure.h
rename to src/game/Server/DBCStructure.h
diff --git a/src/game/DBCfmt.h b/src/game/Server/DBCfmt.h
similarity index 100%
rename from src/game/DBCfmt.h
rename to src/game/Server/DBCfmt.h
diff --git a/src/game/Opcodes.cpp b/src/game/Server/Opcodes.cpp
similarity index 100%
rename from src/game/Opcodes.cpp
rename to src/game/Server/Opcodes.cpp
diff --git a/src/game/Opcodes.h b/src/game/Server/Opcodes.h
similarity index 100%
rename from src/game/Opcodes.h
rename to src/game/Server/Opcodes.h
diff --git a/src/game/SQLStorages.cpp b/src/game/Server/SQLStorages.cpp
similarity index 100%
rename from src/game/SQLStorages.cpp
rename to src/game/Server/SQLStorages.cpp
diff --git a/src/game/SQLStorages.h b/src/game/Server/SQLStorages.h
similarity index 100%
rename from src/game/SQLStorages.h
rename to src/game/Server/SQLStorages.h
diff --git a/src/game/SharedDefines.h b/src/game/Server/SharedDefines.h
similarity index 100%
rename from src/game/SharedDefines.h
rename to src/game/Server/SharedDefines.h
diff --git a/src/game/WorldSession.cpp b/src/game/Server/WorldSession.cpp
similarity index 100%
rename from src/game/WorldSession.cpp
rename to src/game/Server/WorldSession.cpp
diff --git a/src/game/WorldSession.h b/src/game/Server/WorldSession.h
similarity index 100%
rename from src/game/WorldSession.h
rename to src/game/Server/WorldSession.h
diff --git a/src/game/WorldSocket.cpp b/src/game/Server/WorldSocket.cpp
similarity index 100%
rename from src/game/WorldSocket.cpp
rename to src/game/Server/WorldSocket.cpp
diff --git a/src/game/WorldSocket.h b/src/game/Server/WorldSocket.h
similarity index 100%
rename from src/game/WorldSocket.h
rename to src/game/Server/WorldSocket.h
diff --git a/src/game/WorldSocketMgr.cpp b/src/game/Server/WorldSocketMgr.cpp
similarity index 100%
rename from src/game/WorldSocketMgr.cpp
rename to src/game/Server/WorldSocketMgr.cpp
diff --git a/src/game/WorldSocketMgr.h b/src/game/Server/WorldSocketMgr.h
similarity index 100%
rename from src/game/WorldSocketMgr.h
rename to src/game/Server/WorldSocketMgr.h
diff --git a/src/game/CharacterDatabaseCleaner.cpp b/src/game/Tools/CharacterDatabaseCleaner.cpp
similarity index 100%
rename from src/game/CharacterDatabaseCleaner.cpp
rename to src/game/Tools/CharacterDatabaseCleaner.cpp
diff --git a/src/game/CharacterDatabaseCleaner.h b/src/game/Tools/CharacterDatabaseCleaner.h
similarity index 100%
rename from src/game/CharacterDatabaseCleaner.h
rename to src/game/Tools/CharacterDatabaseCleaner.h
diff --git a/src/game/Language.h b/src/game/Tools/Language.h
similarity index 100%
rename from src/game/Language.h
rename to src/game/Tools/Language.h
diff --git a/src/game/PlayerDump.cpp b/src/game/Tools/PlayerDump.cpp
similarity index 100%
rename from src/game/PlayerDump.cpp
rename to src/game/Tools/PlayerDump.cpp
diff --git a/src/game/PlayerDump.h b/src/game/Tools/PlayerDump.h
similarity index 100%
rename from src/game/PlayerDump.h
rename to src/game/Tools/PlayerDump.h
diff --git a/src/game/AccountMgr.cpp b/src/game/WorldHandlers/AccountMgr.cpp
similarity index 100%
rename from src/game/AccountMgr.cpp
rename to src/game/WorldHandlers/AccountMgr.cpp
diff --git a/src/game/AccountMgr.h b/src/game/WorldHandlers/AccountMgr.h
similarity index 100%
rename from src/game/AccountMgr.h
rename to src/game/WorldHandlers/AccountMgr.h
diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/WorldHandlers/ArenaTeamHandler.cpp
similarity index 100%
rename from src/game/ArenaTeamHandler.cpp
rename to src/game/WorldHandlers/ArenaTeamHandler.cpp
diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/WorldHandlers/AuctionHouseHandler.cpp
similarity index 100%
rename from src/game/AuctionHouseHandler.cpp
rename to src/game/WorldHandlers/AuctionHouseHandler.cpp
diff --git a/src/game/Cell.h b/src/game/WorldHandlers/Cell.h
similarity index 100%
rename from src/game/Cell.h
rename to src/game/WorldHandlers/Cell.h
diff --git a/src/game/CellImpl.h b/src/game/WorldHandlers/CellImpl.h
similarity index 100%
rename from src/game/CellImpl.h
rename to src/game/WorldHandlers/CellImpl.h
diff --git a/src/game/Channel.cpp b/src/game/WorldHandlers/Channel.cpp
similarity index 100%
rename from src/game/Channel.cpp
rename to src/game/WorldHandlers/Channel.cpp
diff --git a/src/game/Channel.h b/src/game/WorldHandlers/Channel.h
similarity index 100%
rename from src/game/Channel.h
rename to src/game/WorldHandlers/Channel.h
diff --git a/src/game/ChannelHandler.cpp b/src/game/WorldHandlers/ChannelHandler.cpp
similarity index 100%
rename from src/game/ChannelHandler.cpp
rename to src/game/WorldHandlers/ChannelHandler.cpp
diff --git a/src/game/ChannelMgr.cpp b/src/game/WorldHandlers/ChannelMgr.cpp
similarity index 100%
rename from src/game/ChannelMgr.cpp
rename to src/game/WorldHandlers/ChannelMgr.cpp
diff --git a/src/game/ChannelMgr.h b/src/game/WorldHandlers/ChannelMgr.h
similarity index 100%
rename from src/game/ChannelMgr.h
rename to src/game/WorldHandlers/ChannelMgr.h
diff --git a/src/game/CharacterHandler.cpp b/src/game/WorldHandlers/CharacterHandler.cpp
similarity index 100%
rename from src/game/CharacterHandler.cpp
rename to src/game/WorldHandlers/CharacterHandler.cpp
diff --git a/src/game/Chat.cpp b/src/game/WorldHandlers/Chat.cpp
similarity index 100%
rename from src/game/Chat.cpp
rename to src/game/WorldHandlers/Chat.cpp
diff --git a/src/game/Chat.h b/src/game/WorldHandlers/Chat.h
similarity index 100%
rename from src/game/Chat.h
rename to src/game/WorldHandlers/Chat.h
diff --git a/src/game/ChatHandler.cpp b/src/game/WorldHandlers/ChatHandler.cpp
similarity index 100%
rename from src/game/ChatHandler.cpp
rename to src/game/WorldHandlers/ChatHandler.cpp
diff --git a/src/game/CombatHandler.cpp b/src/game/WorldHandlers/CombatHandler.cpp
similarity index 100%
rename from src/game/CombatHandler.cpp
rename to src/game/WorldHandlers/CombatHandler.cpp
diff --git a/src/game/CreatureLinkingMgr.cpp b/src/game/WorldHandlers/CreatureLinkingMgr.cpp
similarity index 100%
rename from src/game/CreatureLinkingMgr.cpp
rename to src/game/WorldHandlers/CreatureLinkingMgr.cpp
diff --git a/src/game/CreatureLinkingMgr.h b/src/game/WorldHandlers/CreatureLinkingMgr.h
similarity index 100%
rename from src/game/CreatureLinkingMgr.h
rename to src/game/WorldHandlers/CreatureLinkingMgr.h
diff --git a/src/game/DuelHandler.cpp b/src/game/WorldHandlers/DuelHandler.cpp
similarity index 100%
rename from src/game/DuelHandler.cpp
rename to src/game/WorldHandlers/DuelHandler.cpp
diff --git a/src/game/GMTicketHandler.cpp b/src/game/WorldHandlers/GMTicketHandler.cpp
similarity index 100%
rename from src/game/GMTicketHandler.cpp
rename to src/game/WorldHandlers/GMTicketHandler.cpp
diff --git a/src/game/GameEventMgr.cpp b/src/game/WorldHandlers/GameEventMgr.cpp
similarity index 100%
rename from src/game/GameEventMgr.cpp
rename to src/game/WorldHandlers/GameEventMgr.cpp
diff --git a/src/game/GameEventMgr.h b/src/game/WorldHandlers/GameEventMgr.h
similarity index 100%
rename from src/game/GameEventMgr.h
rename to src/game/WorldHandlers/GameEventMgr.h
diff --git a/src/game/GossipDef.cpp b/src/game/WorldHandlers/GossipDef.cpp
similarity index 100%
rename from src/game/GossipDef.cpp
rename to src/game/WorldHandlers/GossipDef.cpp
diff --git a/src/game/GossipDef.h b/src/game/WorldHandlers/GossipDef.h
similarity index 100%
rename from src/game/GossipDef.h
rename to src/game/WorldHandlers/GossipDef.h
diff --git a/src/game/GridDefines.h b/src/game/WorldHandlers/GridDefines.h
similarity index 100%
rename from src/game/GridDefines.h
rename to src/game/WorldHandlers/GridDefines.h
diff --git a/src/game/GridMap.cpp b/src/game/WorldHandlers/GridMap.cpp
similarity index 100%
rename from src/game/GridMap.cpp
rename to src/game/WorldHandlers/GridMap.cpp
diff --git a/src/game/GridMap.h b/src/game/WorldHandlers/GridMap.h
similarity index 100%
rename from src/game/GridMap.h
rename to src/game/WorldHandlers/GridMap.h
diff --git a/src/game/GridNotifiers.cpp b/src/game/WorldHandlers/GridNotifiers.cpp
similarity index 100%
rename from src/game/GridNotifiers.cpp
rename to src/game/WorldHandlers/GridNotifiers.cpp
diff --git a/src/game/GridNotifiers.h b/src/game/WorldHandlers/GridNotifiers.h
similarity index 100%
rename from src/game/GridNotifiers.h
rename to src/game/WorldHandlers/GridNotifiers.h
diff --git a/src/game/GridNotifiersImpl.h b/src/game/WorldHandlers/GridNotifiersImpl.h
similarity index 100%
rename from src/game/GridNotifiersImpl.h
rename to src/game/WorldHandlers/GridNotifiersImpl.h
diff --git a/src/game/GridStates.cpp b/src/game/WorldHandlers/GridStates.cpp
similarity index 100%
rename from src/game/GridStates.cpp
rename to src/game/WorldHandlers/GridStates.cpp
diff --git a/src/game/GridStates.h b/src/game/WorldHandlers/GridStates.h
similarity index 100%
rename from src/game/GridStates.h
rename to src/game/WorldHandlers/GridStates.h
diff --git a/src/game/Group.cpp b/src/game/WorldHandlers/Group.cpp
similarity index 100%
rename from src/game/Group.cpp
rename to src/game/WorldHandlers/Group.cpp
diff --git a/src/game/Group.h b/src/game/WorldHandlers/Group.h
similarity index 100%
rename from src/game/Group.h
rename to src/game/WorldHandlers/Group.h
diff --git a/src/game/GroupHandler.cpp b/src/game/WorldHandlers/GroupHandler.cpp
similarity index 100%
rename from src/game/GroupHandler.cpp
rename to src/game/WorldHandlers/GroupHandler.cpp
diff --git a/src/game/GuildHandler.cpp b/src/game/WorldHandlers/GuildHandler.cpp
similarity index 100%
rename from src/game/GuildHandler.cpp
rename to src/game/WorldHandlers/GuildHandler.cpp
diff --git a/src/game/GuildMgr.cpp b/src/game/WorldHandlers/GuildMgr.cpp
similarity index 100%
rename from src/game/GuildMgr.cpp
rename to src/game/WorldHandlers/GuildMgr.cpp
diff --git a/src/game/GuildMgr.h b/src/game/WorldHandlers/GuildMgr.h
similarity index 100%
rename from src/game/GuildMgr.h
rename to src/game/WorldHandlers/GuildMgr.h
diff --git a/src/game/InstanceData.cpp b/src/game/WorldHandlers/InstanceData.cpp
similarity index 100%
rename from src/game/InstanceData.cpp
rename to src/game/WorldHandlers/InstanceData.cpp
diff --git a/src/game/InstanceData.h b/src/game/WorldHandlers/InstanceData.h
similarity index 100%
rename from src/game/InstanceData.h
rename to src/game/WorldHandlers/InstanceData.h
diff --git a/src/game/ItemHandler.cpp b/src/game/WorldHandlers/ItemHandler.cpp
similarity index 100%
rename from src/game/ItemHandler.cpp
rename to src/game/WorldHandlers/ItemHandler.cpp
diff --git a/src/game/LFGHandler.cpp b/src/game/WorldHandlers/LFGHandler.cpp
similarity index 100%
rename from src/game/LFGHandler.cpp
rename to src/game/WorldHandlers/LFGHandler.cpp
diff --git a/src/game/LootHandler.cpp b/src/game/WorldHandlers/LootHandler.cpp
similarity index 100%
rename from src/game/LootHandler.cpp
rename to src/game/WorldHandlers/LootHandler.cpp
diff --git a/src/game/Mail.cpp b/src/game/WorldHandlers/Mail.cpp
similarity index 100%
rename from src/game/Mail.cpp
rename to src/game/WorldHandlers/Mail.cpp
diff --git a/src/game/Mail.h b/src/game/WorldHandlers/Mail.h
similarity index 100%
rename from src/game/Mail.h
rename to src/game/WorldHandlers/Mail.h
diff --git a/src/game/MailHandler.cpp b/src/game/WorldHandlers/MailHandler.cpp
similarity index 100%
rename from src/game/MailHandler.cpp
rename to src/game/WorldHandlers/MailHandler.cpp
diff --git a/src/game/Map.cpp b/src/game/WorldHandlers/Map.cpp
similarity index 100%
rename from src/game/Map.cpp
rename to src/game/WorldHandlers/Map.cpp
diff --git a/src/game/Map.h b/src/game/WorldHandlers/Map.h
similarity index 100%
rename from src/game/Map.h
rename to src/game/WorldHandlers/Map.h
diff --git a/src/game/MapManager.cpp b/src/game/WorldHandlers/MapManager.cpp
similarity index 100%
rename from src/game/MapManager.cpp
rename to src/game/WorldHandlers/MapManager.cpp
diff --git a/src/game/MapManager.h b/src/game/WorldHandlers/MapManager.h
similarity index 100%
rename from src/game/MapManager.h
rename to src/game/WorldHandlers/MapManager.h
diff --git a/src/game/MapPersistentStateMgr.cpp b/src/game/WorldHandlers/MapPersistentStateMgr.cpp
similarity index 100%
rename from src/game/MapPersistentStateMgr.cpp
rename to src/game/WorldHandlers/MapPersistentStateMgr.cpp
diff --git a/src/game/MapPersistentStateMgr.h b/src/game/WorldHandlers/MapPersistentStateMgr.h
similarity index 100%
rename from src/game/MapPersistentStateMgr.h
rename to src/game/WorldHandlers/MapPersistentStateMgr.h
diff --git a/src/game/MassMailMgr.cpp b/src/game/WorldHandlers/MassMailMgr.cpp
similarity index 100%
rename from src/game/MassMailMgr.cpp
rename to src/game/WorldHandlers/MassMailMgr.cpp
diff --git a/src/game/MassMailMgr.h b/src/game/WorldHandlers/MassMailMgr.h
similarity index 100%
rename from src/game/MassMailMgr.h
rename to src/game/WorldHandlers/MassMailMgr.h
diff --git a/src/game/MiscHandler.cpp b/src/game/WorldHandlers/MiscHandler.cpp
similarity index 100%
rename from src/game/MiscHandler.cpp
rename to src/game/WorldHandlers/MiscHandler.cpp
diff --git a/src/game/MoveMap.cpp b/src/game/WorldHandlers/MoveMap.cpp
similarity index 100%
rename from src/game/MoveMap.cpp
rename to src/game/WorldHandlers/MoveMap.cpp
diff --git a/src/game/MoveMap.h b/src/game/WorldHandlers/MoveMap.h
similarity index 100%
rename from src/game/MoveMap.h
rename to src/game/WorldHandlers/MoveMap.h
diff --git a/src/game/MoveMapSharedDefines.h b/src/game/WorldHandlers/MoveMapSharedDefines.h
similarity index 100%
rename from src/game/MoveMapSharedDefines.h
rename to src/game/WorldHandlers/MoveMapSharedDefines.h
diff --git a/src/game/MovementGeneratorImpl.h b/src/game/WorldHandlers/MovementGeneratorImpl.h
similarity index 100%
rename from src/game/MovementGeneratorImpl.h
rename to src/game/WorldHandlers/MovementGeneratorImpl.h
diff --git a/src/game/MovementHandler.cpp b/src/game/WorldHandlers/MovementHandler.cpp
similarity index 100%
rename from src/game/MovementHandler.cpp
rename to src/game/WorldHandlers/MovementHandler.cpp
diff --git a/src/game/NPCHandler.cpp b/src/game/WorldHandlers/NPCHandler.cpp
similarity index 100%
rename from src/game/NPCHandler.cpp
rename to src/game/WorldHandlers/NPCHandler.cpp
diff --git a/src/game/NPCHandler.h b/src/game/WorldHandlers/NPCHandler.h
similarity index 100%
rename from src/game/NPCHandler.h
rename to src/game/WorldHandlers/NPCHandler.h
diff --git a/src/game/ObjectGridLoader.cpp b/src/game/WorldHandlers/ObjectGridLoader.cpp
similarity index 100%
rename from src/game/ObjectGridLoader.cpp
rename to src/game/WorldHandlers/ObjectGridLoader.cpp
diff --git a/src/game/ObjectGridLoader.h b/src/game/WorldHandlers/ObjectGridLoader.h
similarity index 100%
rename from src/game/ObjectGridLoader.h
rename to src/game/WorldHandlers/ObjectGridLoader.h
diff --git a/src/game/Path.h b/src/game/WorldHandlers/Path.h
similarity index 100%
rename from src/game/Path.h
rename to src/game/WorldHandlers/Path.h
diff --git a/src/game/PetHandler.cpp b/src/game/WorldHandlers/PetHandler.cpp
similarity index 100%
rename from src/game/PetHandler.cpp
rename to src/game/WorldHandlers/PetHandler.cpp
diff --git a/src/game/PetitionsHandler.cpp b/src/game/WorldHandlers/PetitionsHandler.cpp
similarity index 100%
rename from src/game/PetitionsHandler.cpp
rename to src/game/WorldHandlers/PetitionsHandler.cpp
diff --git a/src/game/PoolManager.cpp b/src/game/WorldHandlers/PoolManager.cpp
similarity index 100%
rename from src/game/PoolManager.cpp
rename to src/game/WorldHandlers/PoolManager.cpp
diff --git a/src/game/PoolManager.h b/src/game/WorldHandlers/PoolManager.h
similarity index 100%
rename from src/game/PoolManager.h
rename to src/game/WorldHandlers/PoolManager.h
diff --git a/src/game/QueryHandler.cpp b/src/game/WorldHandlers/QueryHandler.cpp
similarity index 100%
rename from src/game/QueryHandler.cpp
rename to src/game/WorldHandlers/QueryHandler.cpp
diff --git a/src/game/QuestDef.cpp b/src/game/WorldHandlers/QuestDef.cpp
similarity index 100%
rename from src/game/QuestDef.cpp
rename to src/game/WorldHandlers/QuestDef.cpp
diff --git a/src/game/QuestDef.h b/src/game/WorldHandlers/QuestDef.h
similarity index 100%
rename from src/game/QuestDef.h
rename to src/game/WorldHandlers/QuestDef.h
diff --git a/src/game/QuestHandler.cpp b/src/game/WorldHandlers/QuestHandler.cpp
similarity index 100%
rename from src/game/QuestHandler.cpp
rename to src/game/WorldHandlers/QuestHandler.cpp
diff --git a/src/game/ScriptMgr.cpp b/src/game/WorldHandlers/ScriptMgr.cpp
similarity index 100%
rename from src/game/ScriptMgr.cpp
rename to src/game/WorldHandlers/ScriptMgr.cpp
diff --git a/src/game/ScriptMgr.h b/src/game/WorldHandlers/ScriptMgr.h
similarity index 100%
rename from src/game/ScriptMgr.h
rename to src/game/WorldHandlers/ScriptMgr.h
diff --git a/src/game/SkillDiscovery.cpp b/src/game/WorldHandlers/SkillDiscovery.cpp
similarity index 100%
rename from src/game/SkillDiscovery.cpp
rename to src/game/WorldHandlers/SkillDiscovery.cpp
diff --git a/src/game/SkillDiscovery.h b/src/game/WorldHandlers/SkillDiscovery.h
similarity index 100%
rename from src/game/SkillDiscovery.h
rename to src/game/WorldHandlers/SkillDiscovery.h
diff --git a/src/game/SkillExtraItems.cpp b/src/game/WorldHandlers/SkillExtraItems.cpp
similarity index 100%
rename from src/game/SkillExtraItems.cpp
rename to src/game/WorldHandlers/SkillExtraItems.cpp
diff --git a/src/game/SkillExtraItems.h b/src/game/WorldHandlers/SkillExtraItems.h
similarity index 100%
rename from src/game/SkillExtraItems.h
rename to src/game/WorldHandlers/SkillExtraItems.h
diff --git a/src/game/SkillHandler.cpp b/src/game/WorldHandlers/SkillHandler.cpp
similarity index 100%
rename from src/game/SkillHandler.cpp
rename to src/game/WorldHandlers/SkillHandler.cpp
diff --git a/src/game/Spell.cpp b/src/game/WorldHandlers/Spell.cpp
similarity index 100%
rename from src/game/Spell.cpp
rename to src/game/WorldHandlers/Spell.cpp
diff --git a/src/game/Spell.h b/src/game/WorldHandlers/Spell.h
similarity index 100%
rename from src/game/Spell.h
rename to src/game/WorldHandlers/Spell.h
diff --git a/src/game/SpellAuraDefines.h b/src/game/WorldHandlers/SpellAuraDefines.h
similarity index 100%
rename from src/game/SpellAuraDefines.h
rename to src/game/WorldHandlers/SpellAuraDefines.h
diff --git a/src/game/SpellAuras.cpp b/src/game/WorldHandlers/SpellAuras.cpp
similarity index 100%
rename from src/game/SpellAuras.cpp
rename to src/game/WorldHandlers/SpellAuras.cpp
diff --git a/src/game/SpellAuras.h b/src/game/WorldHandlers/SpellAuras.h
similarity index 100%
rename from src/game/SpellAuras.h
rename to src/game/WorldHandlers/SpellAuras.h
diff --git a/src/game/SpellEffects.cpp b/src/game/WorldHandlers/SpellEffects.cpp
similarity index 100%
rename from src/game/SpellEffects.cpp
rename to src/game/WorldHandlers/SpellEffects.cpp
diff --git a/src/game/SpellHandler.cpp b/src/game/WorldHandlers/SpellHandler.cpp
similarity index 100%
rename from src/game/SpellHandler.cpp
rename to src/game/WorldHandlers/SpellHandler.cpp
diff --git a/src/game/TaxiHandler.cpp b/src/game/WorldHandlers/TaxiHandler.cpp
similarity index 100%
rename from src/game/TaxiHandler.cpp
rename to src/game/WorldHandlers/TaxiHandler.cpp
diff --git a/src/game/TradeHandler.cpp b/src/game/WorldHandlers/TradeHandler.cpp
similarity index 100%
rename from src/game/TradeHandler.cpp
rename to src/game/WorldHandlers/TradeHandler.cpp
diff --git a/src/game/TransportSystem.cpp b/src/game/WorldHandlers/TransportSystem.cpp
similarity index 100%
rename from src/game/TransportSystem.cpp
rename to src/game/WorldHandlers/TransportSystem.cpp
diff --git a/src/game/TransportSystem.h b/src/game/WorldHandlers/TransportSystem.h
similarity index 100%
rename from src/game/TransportSystem.h
rename to src/game/WorldHandlers/TransportSystem.h
diff --git a/src/game/Transports.cpp b/src/game/WorldHandlers/Transports.cpp
similarity index 100%
rename from src/game/Transports.cpp
rename to src/game/WorldHandlers/Transports.cpp
diff --git a/src/game/Transports.h b/src/game/WorldHandlers/Transports.h
similarity index 100%
rename from src/game/Transports.h
rename to src/game/WorldHandlers/Transports.h
diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/WorldHandlers/UnitAuraProcHandler.cpp
similarity index 100%
rename from src/game/UnitAuraProcHandler.cpp
rename to src/game/WorldHandlers/UnitAuraProcHandler.cpp
diff --git a/src/game/UpdateData.cpp b/src/game/WorldHandlers/UpdateData.cpp
similarity index 100%
rename from src/game/UpdateData.cpp
rename to src/game/WorldHandlers/UpdateData.cpp
diff --git a/src/game/UpdateData.h b/src/game/WorldHandlers/UpdateData.h
similarity index 100%
rename from src/game/UpdateData.h
rename to src/game/WorldHandlers/UpdateData.h
diff --git a/src/game/VoiceChatHandler.cpp b/src/game/WorldHandlers/VoiceChatHandler.cpp
similarity index 100%
rename from src/game/VoiceChatHandler.cpp
rename to src/game/WorldHandlers/VoiceChatHandler.cpp
diff --git a/src/game/WaypointManager.cpp b/src/game/WorldHandlers/WaypointManager.cpp
similarity index 100%
rename from src/game/WaypointManager.cpp
rename to src/game/WorldHandlers/WaypointManager.cpp
diff --git a/src/game/WaypointManager.h b/src/game/WorldHandlers/WaypointManager.h
similarity index 100%
rename from src/game/WaypointManager.h
rename to src/game/WorldHandlers/WaypointManager.h
diff --git a/src/game/Weather.cpp b/src/game/WorldHandlers/Weather.cpp
similarity index 100%
rename from src/game/Weather.cpp
rename to src/game/WorldHandlers/Weather.cpp
diff --git a/src/game/Weather.h b/src/game/WorldHandlers/Weather.h
similarity index 100%
rename from src/game/Weather.h
rename to src/game/WorldHandlers/Weather.h
diff --git a/src/game/World.cpp b/src/game/WorldHandlers/World.cpp
similarity index 100%
rename from src/game/World.cpp
rename to src/game/WorldHandlers/World.cpp
diff --git a/src/game/World.h b/src/game/WorldHandlers/World.h
similarity index 100%
rename from src/game/World.h
rename to src/game/WorldHandlers/World.h