*Cleaned up game project with new filters for better review - by XTZGZoReX

--HG--
branch : trunk

3 files changed, 1163 insertions, 825 deletions

diff --git a/win/VC71/game.vcproj b/win/VC71/game.vcproj
index 7800a9c7b24..9cddb4d8c13 100644
--- a/win/VC71/game.vcproj
+++ b/win/VC71/game.vcproj
@@ -128,825 +128,1099 @@
 	</References>
 	<Files>
 		<Filter
-			Name="World/Handlers">
+			Name="World/Others"
+			>
 			<File
-				RelativePath="..\..\src\game\AccountMgr.cpp">
+				RelativePath="..\..\src\game\AuctionHouse.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AccountMgr.h">
+				RelativePath="..\..\src\game\Channel.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AddonHandler.cpp">
+				RelativePath="..\..\src\game\Channel.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AddonHandler.h">
+				RelativePath="..\..\src\game\Chat.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeamHandler.cpp">
+				RelativePath="..\..\src\game\Chat.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouse.cpp">
+				RelativePath="..\..\src\game\GameEvent.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGround.cpp">
+				RelativePath="..\..\src\game\GameEvent.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGround.h">
+				RelativePath="..\..\src\game\GossipDef.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAA.cpp">
+				RelativePath="..\..\src\game\GossipDef.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAA.h">
+				RelativePath="..\..\src\game\Mail.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAB.cpp">
+				RelativePath="..\..\src\game\Mail.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAB.h">
+				RelativePath="..\..\src\game\QuestDef.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAV.cpp">
+				RelativePath="..\..\src\game\QuestDef.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAV.h">
+				RelativePath="..\..\src\game\UpdateData.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundBE.cpp">
+				RelativePath="..\..\src\game\UpdateData.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundBE.h">
+				RelativePath="..\..\src\game\World.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundEY.cpp">
+				RelativePath="..\..\src\game\World.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Objects"
+			>
 			<File
-				RelativePath="..\..\src\game\BattleGroundEY.h">
+				RelativePath="..\..\src\game\ArenaTeam.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundHandler.cpp">
+				RelativePath="..\..\src\game\ArenaTeam.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundMgr.cpp">
+				RelativePath="..\..\src\game\AuctionHouseObject.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundMgr.h">
+				RelativePath="..\..\src\game\Bag.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundNA.cpp">
+				RelativePath="..\..\src\game\Bag.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundNA.h">
+				RelativePath="..\..\src\game\Corpse.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundRL.cpp">
+				RelativePath="..\..\src\game\Corpse.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundRL.h">
+				RelativePath="..\..\src\game\Creature.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundWS.cpp">
+				RelativePath="..\..\src\game\Creature.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundWS.h">
+				RelativePath="..\..\src\game\CreatureGroups.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Cell.h">
+				RelativePath="..\..\src\game\CreatureGroups.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CellImpl.h">
+				RelativePath="..\..\src\game\DestinationHolder.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Channel.cpp">
+				RelativePath="..\..\src\game\DestinationHolder.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Channel.h">
+				RelativePath="..\..\src\game\DestinationHolderImp.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChannelHandler.cpp">
+				RelativePath="..\..\src\game\DynamicObject.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChannelMgr.h">
+				RelativePath="..\..\src\game\DynamicObject.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CharacterHandler.cpp">
+				RelativePath="..\..\src\game\Formulas.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Chat.cpp">
+				RelativePath="..\..\src\game\GameObject.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Chat.h">
+				RelativePath="..\..\src\game\GameObject.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChatHandler.cpp">
+				RelativePath="..\..\src\game\Group.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CombatHandler.cpp">
+				RelativePath="..\..\src\game\Group.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DuelHandler.cpp">
+				RelativePath="..\..\src\game\Guild.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameEvent.cpp">
+				RelativePath="..\..\src\game\Guild.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameEvent.h">
+				RelativePath="..\..\src\game\Item.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GossipDef.cpp">
+				RelativePath="..\..\src\game\Item.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GossipDef.h">
+				RelativePath="..\..\src\game\ItemPrototype.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridDefines.h">
+				RelativePath="..\..\src\game\MotionMaster.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiers.cpp">
+				RelativePath="..\..\src\game\MotionMaster.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiers.h">
+				RelativePath="..\..\src\game\Object.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiersImpl.h">
+				RelativePath="..\..\src\game\Object.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridStates.cpp">
+				RelativePath="..\..\src\game\ObjectAccessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridStates.h">
+				RelativePath="..\..\src\game\ObjectAccessor.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Group.cpp">
+				RelativePath="..\..\src\game\ObjectDefines.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Group.h">
+				RelativePath="..\..\src\game\Pet.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupHandler.cpp">
+				RelativePath="..\..\src\game\Pet.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GuildHandler.cpp">
+				RelativePath="..\..\src\game\Player.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceData.cpp">
+				RelativePath="..\..\src\game\Player.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceData.h">
+				RelativePath="..\..\src\game\TemporarySummon.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceSaveMgr.cpp">
+				RelativePath="..\..\src\game\TemporarySummon.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceSaveMgr.h">
+				RelativePath="..\..\src\game\Totem.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemHandler.cpp">
+				RelativePath="..\..\src\game\Totem.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LFGHandler.cpp">
+				RelativePath="..\..\src\game\Traveller.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootHandler.cpp">
+				RelativePath="..\..\src\game\Unit.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Mail.cpp">
+				RelativePath="..\..\src\game\Unit.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Mail.h">
+				RelativePath="..\..\src\game\UnitEvents.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Map.cpp">
+				RelativePath="..\..\src\game\UpdateFields.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Map.h">
+				RelativePath="..\..\src\game\UpdateMask.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Server"
+			>
 			<File
-				RelativePath="..\..\src\game\MapInstanced.cpp">
+				RelativePath="..\..\src\game\GlobalEvents.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapInstanced.h">
+				RelativePath="..\..\src\game\GlobalEvents.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapManager.cpp">
+				RelativePath="..\..\src\game\Opcodes.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapManager.h">
+				RelativePath="..\..\src\game\Opcodes.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapReference.h">
+				RelativePath="..\..\src\game\SharedDefines.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapRefManager.h">
-			</File>				
+				RelativePath="..\..\src\game\WorldLog.cpp"
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\game\MiscHandler.cpp">
+				RelativePath="..\..\src\game\WorldLog.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MovementHandler.cpp">
+				RelativePath="..\..\src\game\WorldSession.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NPCHandler.cpp">
+				RelativePath="..\..\src\game\WorldSession.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NPCHandler.h">
+				RelativePath="..\..\src\game\WorldSocket.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectGridLoader.cpp">
+				RelativePath="..\..\src\game\WorldSocket.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectGridLoader.h">
+				RelativePath="..\..\src\game\WorldSocketMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvP.cpp"
+				RelativePath="..\..\src\game\WorldSocketMgr.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Chat Commands"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvP.h"
+				RelativePath="..\..\src\game\debugcmds.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
+				RelativePath="..\..\src\game\Level0.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.h"
+				RelativePath="..\..\src\game\Level1.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
+				RelativePath="..\..\src\game\Level2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.h"
+				RelativePath="..\..\src\game\Level3.cpp"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Tools"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
+				RelativePath="..\..\src\game\Language.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
+				RelativePath="..\..\src\game\PlayerDump.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
+				RelativePath="..\..\src\game\PlayerDump.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.h"
+				RelativePath="..\..\src\game\ScriptCalls.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
+				RelativePath="..\..\src\game\ScriptCalls.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.h"
+				RelativePath="..\..\src\game\tools.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
+				RelativePath="..\..\src\game\Tools.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="References"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.h"
+				RelativePath="..\..\src\game\FollowerReference.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
+				RelativePath="..\..\src\game\FollowerReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.h"
+				RelativePath="..\..\src\game\FollowerRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Path.h">
+				RelativePath="..\..\src\game\GroupReference.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetHandler.cpp">
+				RelativePath="..\..\src\game\GroupReference.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetitionsHandler.cpp">
+				RelativePath="..\..\src\game\GroupRefManager.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QueryHandler.cpp">
+				RelativePath="..\..\src\game\HostilRefManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestDef.cpp">
+				RelativePath="..\..\src\game\HostilRefManager.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestDef.h">
+				RelativePath="..\..\src\game\ThreatManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestHandler.cpp">
+				RelativePath="..\..\src\game\ThreatManager.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Battlegrounds"
+			>
 			<File
-				RelativePath="..\..\src\game\ScriptCalls.cpp">
+				RelativePath="..\..\src\game\BattleGround.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ScriptCalls.h">
+				RelativePath="..\..\src\game\BattleGround.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillDiscovery.cpp">
+				RelativePath="..\..\src\game\BattleGroundAA.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillDiscovery.h">
+				RelativePath="..\..\src\game\BattleGroundAA.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillExtraItems.cpp">
+				RelativePath="..\..\src\game\BattleGroundAB.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillExtraItems.h">
+				RelativePath="..\..\src\game\BattleGroundAB.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillHandler.cpp">
+				RelativePath="..\..\src\game\BattleGroundAV.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Spell.cpp">
+				RelativePath="..\..\src\game\BattleGroundAV.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Spell.h">
+				RelativePath="..\..\src\game\BattleGroundBE.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuraDefines.h">
+				RelativePath="..\..\src\game\BattleGroundBE.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuras.cpp">
+				RelativePath="..\..\src\game\BattleGroundEY.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuras.h">
+				RelativePath="..\..\src\game\BattleGroundEY.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellEffects.cpp">
+				RelativePath="..\..\src\game\BattleGroundHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellHandler.cpp">
+				RelativePath="..\..\src\game\BattleGroundMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TaxiHandler.cpp">
+				RelativePath="..\..\src\game\BattleGroundMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketHandler.cpp">
+				RelativePath="..\..\src\game\BattleGroundNA.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TradeHandler.cpp">
+				RelativePath="..\..\src\game\BattleGroundNA.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Transports.cpp">
+				RelativePath="..\..\src\game\BattleGroundRL.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Transports.h">
+				RelativePath="..\..\src\game\BattleGroundRL.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateData.cpp">
+				RelativePath="..\..\src\game\BattleGroundWS.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateData.h">
+				RelativePath="..\..\src\game\BattleGroundWS.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Outdoor PvP"
+			>
 			<File
-				RelativePath="..\..\src\game\VoiceChatHandler.cpp">
+				RelativePath="..\..\src\game\OutdoorPvP.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointManager.cpp">
+				RelativePath="..\..\src\game\OutdoorPvP.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointManager.h">
+				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Weather.cpp">
+				RelativePath="..\..\src\game\OutdoorPvPEP.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Weather.h">
+				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\World.cpp">
+				RelativePath="..\..\src\game\OutdoorPvPHP.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\World.h">
+				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
+				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Object">
 			<File
-				RelativePath="..\..\src\game\AggressorAI.cpp">
+				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AggressorAI.h">
+				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h">
+				RelativePath="..\..\src\game\OutdoorPvPNA.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeam.cpp">
+				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeam.h">
+				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouseObject.h">
+				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Bag.cpp">
+				RelativePath="..\..\src\game\OutdoorPvPSI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Bag.h">
+				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp">
+				RelativePath="..\..\src\game\OutdoorPvPTF.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.h">
+				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Corpse.cpp">
+				RelativePath="..\..\src\game\OutdoorPvPZM.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Artificial Intelligence"
+			>
 			<File
-				RelativePath="..\..\src\game\Corpse.h">
+				RelativePath="..\..\src\game\AggressorAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Creature.cpp">
+				RelativePath="..\..\src\game\AggressorAI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Creature.h">
+				RelativePath="..\..\src\game\CreatureAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureAI.cpp">
+				RelativePath="..\..\src\game\CreatureAI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureAI.h">
+				RelativePath="..\..\src\game\CreatureAIImpl.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureAIImpl.h">
+				RelativePath="..\..\src\game\CreatureAIRegistry.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureAIRegistry.cpp">
+				RelativePath="..\..\src\game\CreatureAIRegistry.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureAIRegistry.h">
+				RelativePath="..\..\src\game\CreatureAISelector.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureAISelector.cpp">
+				RelativePath="..\..\src\game\CreatureAISelector.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureAISelector.h">
+				RelativePath="..\..\src\game\GuardAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureGroups.cpp">
+				RelativePath="..\..\src\game\GuardAI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureGroups.h">
+				RelativePath="..\..\src\game\NullCreatureAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolder.cpp">
+				RelativePath="..\..\src\game\NullCreatureAI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolder.h">
+				RelativePath="..\..\src\game\PetAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolderImp.h">
+				RelativePath="..\..\src\game\PetAI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DynamicObject.cpp">
+				RelativePath="..\..\src\game\PossessedAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DynamicObject.h">
+				RelativePath="..\..\src\game\PossessedAI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp">
+				RelativePath="..\..\src\game\ReactorAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.h">
+				RelativePath="..\..\src\game\ReactorAI.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Formulas.h">
+				RelativePath="..\..\src\game\TotemAI.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameObject.cpp">
+				RelativePath="..\..\src\game\TotemAI.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Movement Generators"
+			>
 			<File
-				RelativePath="..\..\src\game\GameObject.h">
+				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
+				>
 			</File>
-
 			<File
-				RelativePath="..\..\src\game\GuardAI.cpp">
+				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GuardAI.h">
+				RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Guild.cpp">
+				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Guild.h">
+				RelativePath="..\..\src\game\FleeingMovementGenerator.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\HomeMovementGenerator.cpp">
+				RelativePath="..\..\src\game\HomeMovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\HomeMovementGenerator.h">
+				RelativePath="..\..\src\game\HomeMovementGenerator.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\IdleMovementGenerator.cpp">
+				RelativePath="..\..\src\game\IdleMovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\IdleMovementGenerator.h">
+				RelativePath="..\..\src\game\IdleMovementGenerator.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Item.cpp">
+				RelativePath="..\..\src\game\MovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Item.h">
+				RelativePath="..\..\src\game\MovementGenerator.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp">
+				RelativePath="..\..\src\game\PointMovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemEnchantmentMgr.h">
+				RelativePath="..\..\src\game\PointMovementGenerator.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemPrototype.h">
+				RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootMgr.cpp">
+				RelativePath="..\..\src\game\RandomMovementGenerator.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootMgr.h">
+				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MotionMaster.cpp">
+				RelativePath="..\..\src\game\TargetedMovementGenerator.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MotionMaster.h">
+				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MovementGenerator.cpp">
+				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Spells/Skills"
+			>
 			<File
-				RelativePath="..\..\src\game\MovementGenerator.h">
+				RelativePath="..\..\src\game\SkillDiscovery.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NullCreatureAI.cpp">
+				RelativePath="..\..\src\game\SkillDiscovery.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NullCreatureAI.h">
+				RelativePath="..\..\src\game\SkillExtraItems.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Object.cpp">
+				RelativePath="..\..\src\game\SkillExtraItems.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Object.h">
+				RelativePath="..\..\src\game\SkillHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectAccessor.cpp">
+				RelativePath="..\..\src\game\Spell.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectAccessor.h">
+				RelativePath="..\..\src\game\Spell.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectDefines.h">
+				RelativePath="..\..\src\game\SpellAuraDefines.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectMgr.cpp">
+				RelativePath="..\..\src\game\SpellAuras.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectMgr.h">
+				RelativePath="..\..\src\game\SpellAuras.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.cpp"
+				RelativePath="..\..\src\game\SpellEffects.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.h"
+				RelativePath="..\..\src\game\SpellHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Pet.cpp">
+				RelativePath="..\..\src\game\SpellMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Pet.h">
+				RelativePath="..\..\src\game\SpellMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetAI.cpp">
+				RelativePath="..\..\src\game\StatSystem.cpp"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Maps/Grids"
+			>
 			<File
-				RelativePath="..\..\src\game\PetAI.h">
+				RelativePath="..\..\src\game\Cell.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Player.cpp">
+				RelativePath="..\..\src\game\CellImpl.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Player.h">
+				RelativePath="..\..\src\game\GridDefines.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.cpp">
+				RelativePath="..\..\src\game\GridNotifiers.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.h">
+				RelativePath="..\..\src\game\GridNotifiers.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PossessedAI.cpp"
+				RelativePath="..\..\src\game\GridNotifiersImpl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PossessedAI.h"
+				RelativePath="..\..\src\game\GridStates.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.cpp">
+				RelativePath="..\..\src\game\GridStates.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.h">
+				RelativePath="..\..\src\game\InstanceData.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ReactorAI.cpp">
+				RelativePath="..\..\src\game\InstanceData.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ReactorAI.h">
+				RelativePath="..\..\src\game\InstanceSaveMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SocialMgr.cpp">
+				RelativePath="..\..\src\game\InstanceSaveMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SocialMgr.h">
+				RelativePath="..\..\src\game\Map.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellMgr.cpp">
+				RelativePath="..\..\src\game\Map.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellMgr.h">
+				RelativePath="..\..\src\game\MapInstanced.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\StatSystem.cpp">
+				RelativePath="..\..\src\game\MapInstanced.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp">
+				RelativePath="..\..\src\game\MapManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.h">
+				RelativePath="..\..\src\game\MapManager.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TemporarySummon.cpp">
+				RelativePath="..\..\src\game\MapReference.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TemporarySummon.h">
+				RelativePath="..\..\src\game\MapRefManager.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketMgr.cpp"
+				RelativePath="..\..\src\game\ObjectGridLoader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketMgr.h"
+				RelativePath="..\..\src\game\ObjectGridLoader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Totem.cpp">
+				RelativePath="..\..\src\game\Path.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Totem.h">
+				RelativePath="..\..\src\game\Transports.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TotemAI.cpp">
+				RelativePath="..\..\src\game\Transports.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TotemAI.h">
+				RelativePath="..\..\src\game\Weather.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Traveller.h">
+				RelativePath="..\..\src\game\Weather.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Handlers"
+			>
 			<File
-				RelativePath="..\..\src\game\Unit.cpp">
+				RelativePath="..\..\src\game\AddonHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Unit.h">
+				RelativePath="..\..\src\game\AddonHandler.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UnitEvents.h">
+				RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateFields.h">
+				RelativePath="..\..\src\game\ChannelHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateMask.h">
+				RelativePath="..\..\src\game\CharacterHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp">
+				RelativePath="..\..\src\game\ChatHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.h">
+				RelativePath="..\..\src\game\CombatHandler.cpp"
+				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Server">
 			<File
-				RelativePath="..\..\src\game\GlobalEvents.cpp">
+				RelativePath="..\..\src\game\DuelHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GlobalEvents.h">
+				RelativePath="..\..\src\game\GroupHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Opcodes.cpp">
+				RelativePath="..\..\src\game\GuildHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Opcodes.h">
+				RelativePath="..\..\src\game\ItemHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SharedDefines.h">
+				RelativePath="..\..\src\game\LFGHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldLog.cpp">
+				RelativePath="..\..\src\game\LootHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldLog.h">
+				RelativePath="..\..\src\game\MiscHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSession.cpp">
+				RelativePath="..\..\src\game\MovementHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSession.h">
+				RelativePath="..\..\src\game\NPCHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocket.cpp">
+				RelativePath="..\..\src\game\NPCHandler.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocket.h">
+				RelativePath="..\..\src\game\PetHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocketMgr.cpp">
+				RelativePath="..\..\src\game\PetitionsHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocketMgr.h">
+				RelativePath="..\..\src\game\QueryHandler.cpp"
+				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Chat Commands">
 			<File
-				RelativePath="..\..\src\game\debugcmds.cpp">
+				RelativePath="..\..\src\game\QuestHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level0.cpp">
+				RelativePath="..\..\src\game\TaxiHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level1.cpp">
+				RelativePath="..\..\src\game\TicketHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level2.cpp">
+				RelativePath="..\..\src\game\TradeHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level3.cpp">
+				RelativePath="..\..\src\game\VoiceChatHandler.cpp"
+				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Tool">
 			<File
-				RelativePath="..\..\src\game\Language.h">
+				RelativePath="..\..\src\game\WaypointManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PlayerDump.cpp">
+				RelativePath="..\..\src\game\WaypointManager.h"
+				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Managers"
+			>
 			<File
-				RelativePath="..\..\src\game\PlayerDump.h">
+				RelativePath="..\..\src\game\AccountMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\tools.cpp">
+				RelativePath="..\..\src\game\AccountMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Tools.h">
+				RelativePath="..\..\src\game\ChannelMgr.h"
+				>
 			</File>
-		</Filter>
-		<Filter
-			Name="References"
-			Filter="">
 			<File
-				RelativePath="..\..\src\game\FollowerReference.cpp">
+				RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FollowerReference.h">
+				RelativePath="..\..\src\game\ItemEnchantmentMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FollowerRefManager.h">
+				RelativePath="..\..\src\game\LootMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupReference.cpp">
+				RelativePath="..\..\src\game\LootMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupReference.h">
+				RelativePath="..\..\src\game\ObjectMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupRefManager.h">
+				RelativePath="..\..\src\game\ObjectMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\HostilRefManager.cpp">
+				RelativePath="..\..\src\game\SocialMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\HostilRefManager.h">
+				RelativePath="..\..\src\game\SocialMgr.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ThreatManager.cpp">
+				RelativePath="..\..\src\game\TicketMgr.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ThreatManager.h">
+				RelativePath="..\..\src\game\TicketMgr.h"
+				>
 			</File>
 		</Filter>
 	</Files>
diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index 0e50c786dd6..dd45fb37abf 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -348,574 +348,598 @@
 	</References>
 	<Files>
 		<Filter
-			Name="World/Handlers"
+			Name="World/Others"
 			>
 			<File
-				RelativePath="..\..\src\game\AccountMgr.cpp"
+				RelativePath="..\..\src\game\AuctionHouse.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AccountMgr.h"
+				RelativePath="..\..\src\game\Channel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AddonHandler.cpp"
+				RelativePath="..\..\src\game\Channel.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AddonHandler.h"
+				RelativePath="..\..\src\game\Chat.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
+				RelativePath="..\..\src\game\Chat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouse.cpp"
+				RelativePath="..\..\src\game\GameEvent.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGround.cpp"
+				RelativePath="..\..\src\game\GameEvent.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGround.h"
+				RelativePath="..\..\src\game\GossipDef.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAA.cpp"
+				RelativePath="..\..\src\game\GossipDef.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAA.h"
+				RelativePath="..\..\src\game\Mail.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAB.cpp"
+				RelativePath="..\..\src\game\Mail.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAB.h"
+				RelativePath="..\..\src\game\QuestDef.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAV.cpp"
+				RelativePath="..\..\src\game\QuestDef.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAV.h"
+				RelativePath="..\..\src\game\UpdateData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundBE.cpp"
+				RelativePath="..\..\src\game\UpdateData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundBE.h"
+				RelativePath="..\..\src\game\World.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundEY.cpp"
+				RelativePath="..\..\src\game\World.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Objects"
+			>
 			<File
-				RelativePath="..\..\src\game\BattleGroundEY.h"
+				RelativePath="..\..\src\game\ArenaTeam.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundHandler.cpp"
+				RelativePath="..\..\src\game\ArenaTeam.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundMgr.cpp"
+				RelativePath="..\..\src\game\AuctionHouseObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundMgr.h"
+				RelativePath="..\..\src\game\Bag.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundNA.cpp"
+				RelativePath="..\..\src\game\Bag.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundNA.h"
+				RelativePath="..\..\src\game\Corpse.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundRL.cpp"
+				RelativePath="..\..\src\game\Corpse.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundRL.h"
+				RelativePath="..\..\src\game\Creature.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundWS.cpp"
+				RelativePath="..\..\src\game\Creature.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundWS.h"
+				RelativePath="..\..\src\game\CreatureGroups.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Cell.h"
+				RelativePath="..\..\src\game\CreatureGroups.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CellImpl.h"
+				RelativePath="..\..\src\game\DestinationHolder.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Channel.cpp"
+				RelativePath="..\..\src\game\DestinationHolder.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Channel.h"
+				RelativePath="..\..\src\game\DestinationHolderImp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChannelHandler.cpp"
+				RelativePath="..\..\src\game\DynamicObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChannelMgr.h"
+				RelativePath="..\..\src\game\DynamicObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CharacterHandler.cpp"
+				RelativePath="..\..\src\game\Formulas.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Chat.cpp"
+				RelativePath="..\..\src\game\GameObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Chat.h"
+				RelativePath="..\..\src\game\GameObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChatHandler.cpp"
+				RelativePath="..\..\src\game\Group.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CombatHandler.cpp"
+				RelativePath="..\..\src\game\Group.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DuelHandler.cpp"
+				RelativePath="..\..\src\game\Guild.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameEvent.cpp"
+				RelativePath="..\..\src\game\Guild.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameEvent.h"
+				RelativePath="..\..\src\game\Item.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GossipDef.cpp"
+				RelativePath="..\..\src\game\Item.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GossipDef.h"
+				RelativePath="..\..\src\game\ItemPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridDefines.h"
+				RelativePath="..\..\src\game\MotionMaster.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiers.cpp"
+				RelativePath="..\..\src\game\MotionMaster.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiers.h"
+				RelativePath="..\..\src\game\Object.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiersImpl.h"
+				RelativePath="..\..\src\game\Object.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridStates.cpp"
+				RelativePath="..\..\src\game\ObjectAccessor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridStates.h"
+				RelativePath="..\..\src\game\ObjectAccessor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Group.cpp"
+				RelativePath="..\..\src\game\ObjectDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Group.h"
+				RelativePath="..\..\src\game\Pet.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupHandler.cpp"
+				RelativePath="..\..\src\game\Pet.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GuildHandler.cpp"
+				RelativePath="..\..\src\game\Player.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceData.cpp"
+				RelativePath="..\..\src\game\Player.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceData.h"
+				RelativePath="..\..\src\game\TemporarySummon.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceSaveMgr.cpp"
+				RelativePath="..\..\src\game\TemporarySummon.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceSaveMgr.h"
+				RelativePath="..\..\src\game\Totem.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemHandler.cpp"
+				RelativePath="..\..\src\game\Totem.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LFGHandler.cpp"
+				RelativePath="..\..\src\game\Traveller.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootHandler.cpp"
+				RelativePath="..\..\src\game\Unit.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Mail.cpp"
+				RelativePath="..\..\src\game\Unit.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Mail.h"
+				RelativePath="..\..\src\game\UnitEvents.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Map.cpp"
+				RelativePath="..\..\src\game\UpdateFields.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Map.h"
+				RelativePath="..\..\src\game\UpdateMask.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Server"
+			>
 			<File
-				RelativePath="..\..\src\game\MapInstanced.cpp"
+				RelativePath="..\..\src\game\GlobalEvents.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapInstanced.h"
+				RelativePath="..\..\src\game\GlobalEvents.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapManager.cpp"
+				RelativePath="..\..\src\game\Opcodes.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapManager.h"
+				RelativePath="..\..\src\game\Opcodes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapReference.h"
+				RelativePath="..\..\src\game\SharedDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapRefManager.h"
-				>
-			</File>				
-			<File
-				RelativePath="..\..\src\game\MiscHandler.cpp"
+				RelativePath="..\..\src\game\WorldLog.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MovementHandler.cpp"
+				RelativePath="..\..\src\game\WorldLog.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NPCHandler.cpp"
+				RelativePath="..\..\src\game\WorldSession.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NPCHandler.h"
+				RelativePath="..\..\src\game\WorldSession.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectGridLoader.cpp"
+				RelativePath="..\..\src\game\WorldSocket.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectGridLoader.h"
+				RelativePath="..\..\src\game\WorldSocket.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvP.cpp"
+				RelativePath="..\..\src\game\WorldSocketMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvP.h"
+				RelativePath="..\..\src\game\WorldSocketMgr.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Chat Commands"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
+				RelativePath="..\..\src\game\debugcmds.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.h"
+				RelativePath="..\..\src\game\Level0.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
+				RelativePath="..\..\src\game\Level1.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.h"
+				RelativePath="..\..\src\game\Level2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
+				RelativePath="..\..\src\game\Level3.cpp"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Tools"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
+				RelativePath="..\..\src\game\Language.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
+				RelativePath="..\..\src\game\PlayerDump.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.h"
+				RelativePath="..\..\src\game\PlayerDump.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
+				RelativePath="..\..\src\game\ScriptCalls.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.h"
+				RelativePath="..\..\src\game\ScriptCalls.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
+				RelativePath="..\..\src\game\tools.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.h"
+				RelativePath="..\..\src\game\Tools.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="References"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
+				RelativePath="..\..\src\game\FollowerReference.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.h"
+				RelativePath="..\..\src\game\FollowerReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Path.h"
+				RelativePath="..\..\src\game\FollowerRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetHandler.cpp"
+				RelativePath="..\..\src\game\GroupReference.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetitionsHandler.cpp"
+				RelativePath="..\..\src\game\GroupReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QueryHandler.cpp"
+				RelativePath="..\..\src\game\GroupRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestDef.cpp"
+				RelativePath="..\..\src\game\HostilRefManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestDef.h"
+				RelativePath="..\..\src\game\HostilRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestHandler.cpp"
+				RelativePath="..\..\src\game\ThreatManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ScriptCalls.cpp"
+				RelativePath="..\..\src\game\ThreatManager.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Battlegrounds"
+			>
 			<File
-				RelativePath="..\..\src\game\ScriptCalls.h"
+				RelativePath="..\..\src\game\BattleGround.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillDiscovery.cpp"
+				RelativePath="..\..\src\game\BattleGround.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillDiscovery.h"
+				RelativePath="..\..\src\game\BattleGroundAA.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillExtraItems.cpp"
+				RelativePath="..\..\src\game\BattleGroundAA.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillExtraItems.h"
+				RelativePath="..\..\src\game\BattleGroundAB.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundAB.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Spell.cpp"
+				RelativePath="..\..\src\game\BattleGroundAV.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Spell.h"
+				RelativePath="..\..\src\game\BattleGroundAV.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuraDefines.h"
+				RelativePath="..\..\src\game\BattleGroundBE.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuras.cpp"
+				RelativePath="..\..\src\game\BattleGroundBE.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuras.h"
+				RelativePath="..\..\src\game\BattleGroundEY.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellEffects.cpp"
+				RelativePath="..\..\src\game\BattleGroundEY.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TaxiHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TradeHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundNA.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Transports.cpp"
+				RelativePath="..\..\src\game\BattleGroundNA.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Transports.h"
+				RelativePath="..\..\src\game\BattleGroundRL.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateData.cpp"
+				RelativePath="..\..\src\game\BattleGroundRL.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateData.h"
+				RelativePath="..\..\src\game\BattleGroundWS.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\VoiceChatHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundWS.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Outdoor PvP"
+			>
 			<File
-				RelativePath="..\..\src\game\WaypointManager.cpp"
+				RelativePath="..\..\src\game\OutdoorPvP.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointManager.h"
+				RelativePath="..\..\src\game\OutdoorPvP.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Weather.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Weather.h"
+				RelativePath="..\..\src\game\OutdoorPvPEP.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\World.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\World.h"
+				RelativePath="..\..\src\game\OutdoorPvPHP.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Object"
-			>
 			<File
-				RelativePath="..\..\src\game\AggressorAI.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AggressorAI.h"
+				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
+				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeam.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPNA.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeam.h"
+				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouseObject.h"
+				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Bag.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Bag.h"
+				RelativePath="..\..\src\game\OutdoorPvPSI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
+				RelativePath="..\..\src\game\OutdoorPvPTF.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Corpse.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Corpse.h"
+				RelativePath="..\..\src\game\OutdoorPvPZM.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Artificial Intelligence"
+			>
 			<File
-				RelativePath="..\..\src\game\Creature.cpp"
+				RelativePath="..\..\src\game\AggressorAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Creature.h"
+				RelativePath="..\..\src\game\AggressorAI.h"
 				>
 			</File>
 			<File
@@ -947,67 +971,75 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureGroups.cpp"
+				RelativePath="..\..\src\game\GuardAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureGroups.h"
+				RelativePath="..\..\src\game\GuardAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolder.cpp"
+				RelativePath="..\..\src\game\NullCreatureAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolder.h"
+				RelativePath="..\..\src\game\NullCreatureAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolderImp.h"
+				RelativePath="..\..\src\game\PetAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DynamicObject.cpp"
+				RelativePath="..\..\src\game\PetAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DynamicObject.h"
+				RelativePath="..\..\src\game\PossessedAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
+				RelativePath="..\..\src\game\PossessedAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.h"
+				RelativePath="..\..\src\game\ReactorAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Formulas.h"
+				RelativePath="..\..\src\game\ReactorAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameObject.cpp"
+				RelativePath="..\..\src\game\TotemAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameObject.h"
+				RelativePath="..\..\src\game\TotemAI.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Movement Generators"
+			>
 			<File
-				RelativePath="..\..\src\game\GuardAI.cpp"
+				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GuardAI.h"
+				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Guild.cpp"
+				RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Guild.h"
+				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\FleeingMovementGenerator.h"
 				>
 			</File>
 			<File
@@ -1027,387 +1059,387 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Item.cpp"
+				RelativePath="..\..\src\game\MovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Item.h"
+				RelativePath="..\..\src\game\MovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp"
+				RelativePath="..\..\src\game\PointMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemEnchantmentMgr.h"
+				RelativePath="..\..\src\game\PointMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemPrototype.h"
+				RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootMgr.cpp"
+				RelativePath="..\..\src\game\RandomMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootMgr.h"
+				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MotionMaster.cpp"
+				RelativePath="..\..\src\game\TargetedMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MotionMaster.h"
+				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MovementGenerator.cpp"
+				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Spells/Skills"
+			>
 			<File
-				RelativePath="..\..\src\game\MovementGenerator.h"
+				RelativePath="..\..\src\game\SkillDiscovery.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NullCreatureAI.cpp"
+				RelativePath="..\..\src\game\SkillDiscovery.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NullCreatureAI.h"
+				RelativePath="..\..\src\game\SkillExtraItems.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Object.cpp"
+				RelativePath="..\..\src\game\SkillExtraItems.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Object.h"
+				RelativePath="..\..\src\game\SkillHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectAccessor.cpp"
+				RelativePath="..\..\src\game\Spell.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectAccessor.h"
+				RelativePath="..\..\src\game\Spell.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectDefines.h"
+				RelativePath="..\..\src\game\SpellAuraDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectMgr.cpp"
+				RelativePath="..\..\src\game\SpellAuras.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectMgr.h"
+				RelativePath="..\..\src\game\SpellAuras.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.cpp"
+				RelativePath="..\..\src\game\SpellEffects.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.h"
+				RelativePath="..\..\src\game\SpellHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Pet.cpp"
+				RelativePath="..\..\src\game\SpellMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Pet.h"
+				RelativePath="..\..\src\game\SpellMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetAI.cpp"
+				RelativePath="..\..\src\game\StatSystem.cpp"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Maps/Grids"
+			>
 			<File
-				RelativePath="..\..\src\game\PetAI.h"
+				RelativePath="..\..\src\game\Cell.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Player.cpp"
+				RelativePath="..\..\src\game\CellImpl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Player.h"
+				RelativePath="..\..\src\game\GridDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.cpp"
+				RelativePath="..\..\src\game\GridNotifiers.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PossessedAI.cpp"
+				RelativePath="..\..\src\game\GridNotifiers.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PossessedAI.h"
+				RelativePath="..\..\src\game\GridNotifiersImpl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.h"
+				RelativePath="..\..\src\game\GridStates.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
+				RelativePath="..\..\src\game\GridStates.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.h"
+				RelativePath="..\..\src\game\InstanceData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ReactorAI.cpp"
+				RelativePath="..\..\src\game\InstanceData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ReactorAI.h"
+				RelativePath="..\..\src\game\InstanceSaveMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SocialMgr.cpp"
+				RelativePath="..\..\src\game\InstanceSaveMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SocialMgr.h"
+				RelativePath="..\..\src\game\Map.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellMgr.cpp"
+				RelativePath="..\..\src\game\Map.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellMgr.h"
+				RelativePath="..\..\src\game\MapInstanced.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\StatSystem.cpp"
+				RelativePath="..\..\src\game\MapInstanced.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
+				RelativePath="..\..\src\game\MapManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.h"
+				RelativePath="..\..\src\game\MapManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TemporarySummon.cpp"
+				RelativePath="..\..\src\game\MapReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TemporarySummon.h"
+				RelativePath="..\..\src\game\MapRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketMgr.cpp"
+				RelativePath="..\..\src\game\ObjectGridLoader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketMgr.h"
+				RelativePath="..\..\src\game\ObjectGridLoader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Totem.cpp"
+				RelativePath="..\..\src\game\Path.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Totem.h"
+				RelativePath="..\..\src\game\Transports.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TotemAI.cpp"
+				RelativePath="..\..\src\game\Transports.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TotemAI.h"
+				RelativePath="..\..\src\game\Weather.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Traveller.h"
+				RelativePath="..\..\src\game\Weather.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Handlers"
+			>
 			<File
-				RelativePath="..\..\src\game\Unit.cpp"
+				RelativePath="..\..\src\game\AddonHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Unit.h"
+				RelativePath="..\..\src\game\AddonHandler.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UnitEvents.h"
+				RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateFields.h"
+				RelativePath="..\..\src\game\ChannelHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateMask.h"
+				RelativePath="..\..\src\game\CharacterHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
+				RelativePath="..\..\src\game\ChatHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
+				RelativePath="..\..\src\game\CombatHandler.cpp"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Server"
-			>
 			<File
-				RelativePath="..\..\src\game\GlobalEvents.cpp"
+				RelativePath="..\..\src\game\DuelHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GlobalEvents.h"
+				RelativePath="..\..\src\game\GroupHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Opcodes.cpp"
+				RelativePath="..\..\src\game\GuildHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Opcodes.h"
+				RelativePath="..\..\src\game\ItemHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SharedDefines.h"
+				RelativePath="..\..\src\game\LFGHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldLog.cpp"
+				RelativePath="..\..\src\game\LootHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldLog.h"
+				RelativePath="..\..\src\game\MiscHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSession.cpp"
+				RelativePath="..\..\src\game\MovementHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSession.h"
+				RelativePath="..\..\src\game\NPCHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocket.cpp"
+				RelativePath="..\..\src\game\NPCHandler.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocket.h"
+				RelativePath="..\..\src\game\PetHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocketMgr.cpp"
+				RelativePath="..\..\src\game\PetitionsHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocketMgr.h"
+				RelativePath="..\..\src\game\QueryHandler.cpp"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Chat Commands"
-			>
 			<File
-				RelativePath="..\..\src\game\debugcmds.cpp"
+				RelativePath="..\..\src\game\QuestHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level0.cpp"
+				RelativePath="..\..\src\game\TaxiHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level1.cpp"
+				RelativePath="..\..\src\game\TicketHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level2.cpp"
+				RelativePath="..\..\src\game\TradeHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level3.cpp"
+				RelativePath="..\..\src\game\VoiceChatHandler.cpp"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Tool"
-			>
 			<File
-				RelativePath="..\..\src\game\Language.h"
+				RelativePath="..\..\src\game\WaypointManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PlayerDump.cpp"
+				RelativePath="..\..\src\game\WaypointManager.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Managers"
+			>
 			<File
-				RelativePath="..\..\src\game\PlayerDump.h"
+				RelativePath="..\..\src\game\AccountMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\tools.cpp"
+				RelativePath="..\..\src\game\AccountMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Tools.h"
+				RelativePath="..\..\src\game\ChannelMgr.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="References"
-			>
 			<File
-				RelativePath="..\..\src\game\FollowerReference.cpp"
+				RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FollowerReference.h"
+				RelativePath="..\..\src\game\ItemEnchantmentMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FollowerRefManager.h"
+				RelativePath="..\..\src\game\LootMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupReference.cpp"
+				RelativePath="..\..\src\game\LootMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupReference.h"
+				RelativePath="..\..\src\game\ObjectMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupRefManager.h"
+				RelativePath="..\..\src\game\ObjectMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\HostilRefManager.cpp"
+				RelativePath="..\..\src\game\SocialMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\HostilRefManager.h"
+				RelativePath="..\..\src\game\SocialMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ThreatManager.cpp"
+				RelativePath="..\..\src\game\TicketMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ThreatManager.h"
+				RelativePath="..\..\src\game\TicketMgr.h"
 				>
 			</File>
 		</Filter>
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 3d0b45cbc0c..7b79a39993c 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -353,574 +353,598 @@
 	</References>
 	<Files>
 		<Filter
-			Name="World/Handlers"
+			Name="World/Others"
 			>
 			<File
-				RelativePath="..\..\src\game\AccountMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AccountMgr.h"
+				RelativePath="..\..\src\game\AuctionHouse.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AddonHandler.cpp"
+				RelativePath="..\..\src\game\Channel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AddonHandler.h"
+				RelativePath="..\..\src\game\Channel.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
+				RelativePath="..\..\src\game\Chat.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouse.cpp"
+				RelativePath="..\..\src\game\Chat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGround.cpp"
+				RelativePath="..\..\src\game\GameEvent.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGround.h"
+				RelativePath="..\..\src\game\GameEvent.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAA.cpp"
+				RelativePath="..\..\src\game\GossipDef.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAA.h"
+				RelativePath="..\..\src\game\GossipDef.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAB.cpp"
+				RelativePath="..\..\src\game\Mail.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAB.h"
+				RelativePath="..\..\src\game\Mail.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAV.cpp"
+				RelativePath="..\..\src\game\QuestDef.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundAV.h"
+				RelativePath="..\..\src\game\QuestDef.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundBE.cpp"
+				RelativePath="..\..\src\game\UpdateData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundBE.h"
+				RelativePath="..\..\src\game\UpdateData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundEY.cpp"
+				RelativePath="..\..\src\game\World.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundEY.h"
+				RelativePath="..\..\src\game\World.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Objects"
+			>
 			<File
-				RelativePath="..\..\src\game\BattleGroundHandler.cpp"
+				RelativePath="..\..\src\game\ArenaTeam.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundMgr.cpp"
+				RelativePath="..\..\src\game\ArenaTeam.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundMgr.h"
+				RelativePath="..\..\src\game\AuctionHouseObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundNA.cpp"
+				RelativePath="..\..\src\game\Bag.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundNA.h"
+				RelativePath="..\..\src\game\Bag.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundRL.cpp"
+				RelativePath="..\..\src\game\Corpse.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundRL.h"
+				RelativePath="..\..\src\game\Corpse.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundWS.cpp"
+				RelativePath="..\..\src\game\Creature.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\BattleGroundWS.h"
+				RelativePath="..\..\src\game\Creature.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Cell.h"
+				RelativePath="..\..\src\game\CreatureGroups.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CellImpl.h"
+				RelativePath="..\..\src\game\CreatureGroups.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Channel.cpp"
+				RelativePath="..\..\src\game\DestinationHolder.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Channel.h"
+				RelativePath="..\..\src\game\DestinationHolder.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChannelHandler.cpp"
+				RelativePath="..\..\src\game\DestinationHolderImp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChannelMgr.h"
+				RelativePath="..\..\src\game\DynamicObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CharacterHandler.cpp"
+				RelativePath="..\..\src\game\DynamicObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Chat.cpp"
+				RelativePath="..\..\src\game\Formulas.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Chat.h"
+				RelativePath="..\..\src\game\GameObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ChatHandler.cpp"
+				RelativePath="..\..\src\game\GameObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CombatHandler.cpp"
+				RelativePath="..\..\src\game\Group.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DuelHandler.cpp"
+				RelativePath="..\..\src\game\Group.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameEvent.cpp"
+				RelativePath="..\..\src\game\Guild.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameEvent.h"
+				RelativePath="..\..\src\game\Guild.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GossipDef.cpp"
+				RelativePath="..\..\src\game\Item.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GossipDef.h"
+				RelativePath="..\..\src\game\Item.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridDefines.h"
+				RelativePath="..\..\src\game\ItemPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiers.cpp"
+				RelativePath="..\..\src\game\MotionMaster.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiers.h"
+				RelativePath="..\..\src\game\MotionMaster.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridNotifiersImpl.h"
+				RelativePath="..\..\src\game\Object.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridStates.cpp"
+				RelativePath="..\..\src\game\Object.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GridStates.h"
+				RelativePath="..\..\src\game\ObjectAccessor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Group.cpp"
+				RelativePath="..\..\src\game\ObjectAccessor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Group.h"
+				RelativePath="..\..\src\game\ObjectDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupHandler.cpp"
+				RelativePath="..\..\src\game\Pet.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GuildHandler.cpp"
+				RelativePath="..\..\src\game\Pet.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceData.cpp"
+				RelativePath="..\..\src\game\Player.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceData.h"
+				RelativePath="..\..\src\game\Player.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceSaveMgr.cpp"
+				RelativePath="..\..\src\game\TemporarySummon.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\InstanceSaveMgr.h"
+				RelativePath="..\..\src\game\TemporarySummon.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemHandler.cpp"
+				RelativePath="..\..\src\game\Totem.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LFGHandler.cpp"
+				RelativePath="..\..\src\game\Totem.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootHandler.cpp"
+				RelativePath="..\..\src\game\Traveller.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Mail.cpp"
+				RelativePath="..\..\src\game\Unit.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Mail.h"
+				RelativePath="..\..\src\game\Unit.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Map.cpp"
+				RelativePath="..\..\src\game\UnitEvents.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Map.h"
+				RelativePath="..\..\src\game\UpdateFields.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapInstanced.cpp"
+				RelativePath="..\..\src\game\UpdateMask.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Server"
+			>
 			<File
-				RelativePath="..\..\src\game\MapInstanced.h"
+				RelativePath="..\..\src\game\GlobalEvents.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapManager.cpp"
+				RelativePath="..\..\src\game\GlobalEvents.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapManager.h"
+				RelativePath="..\..\src\game\Opcodes.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapReference.h"
+				RelativePath="..\..\src\game\Opcodes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapRefManager.h"
+				RelativePath="..\..\src\game\SharedDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MiscHandler.cpp"
+				RelativePath="..\..\src\game\WorldLog.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MovementHandler.cpp"
+				RelativePath="..\..\src\game\WorldLog.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NPCHandler.cpp"
+				RelativePath="..\..\src\game\WorldSession.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NPCHandler.h"
+				RelativePath="..\..\src\game\WorldSession.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectGridLoader.cpp"
+				RelativePath="..\..\src\game\WorldSocket.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectGridLoader.h"
+				RelativePath="..\..\src\game\WorldSocket.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvP.cpp"
+				RelativePath="..\..\src\game\WorldSocketMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvP.h"
+				RelativePath="..\..\src\game\WorldSocketMgr.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Chat Commands"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
+				RelativePath="..\..\src\game\debugcmds.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.h"
+				RelativePath="..\..\src\game\Level0.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
+				RelativePath="..\..\src\game\Level1.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.h"
+				RelativePath="..\..\src\game\Level2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
+				RelativePath="..\..\src\game\Level3.cpp"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Tools"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
+				RelativePath="..\..\src\game\Language.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
+				RelativePath="..\..\src\game\PlayerDump.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.h"
+				RelativePath="..\..\src\game\PlayerDump.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
+				RelativePath="..\..\src\game\ScriptCalls.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.h"
+				RelativePath="..\..\src\game\ScriptCalls.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
+				RelativePath="..\..\src\game\tools.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.h"
+				RelativePath="..\..\src\game\Tools.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="References"
+			>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
+				RelativePath="..\..\src\game\FollowerReference.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.h"
+				RelativePath="..\..\src\game\FollowerReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Path.h"
+				RelativePath="..\..\src\game\FollowerRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetHandler.cpp"
+				RelativePath="..\..\src\game\GroupReference.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetitionsHandler.cpp"
+				RelativePath="..\..\src\game\GroupReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QueryHandler.cpp"
+				RelativePath="..\..\src\game\GroupRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestDef.cpp"
+				RelativePath="..\..\src\game\HostilRefManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestDef.h"
+				RelativePath="..\..\src\game\HostilRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\QuestHandler.cpp"
+				RelativePath="..\..\src\game\ThreatManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ScriptCalls.cpp"
+				RelativePath="..\..\src\game\ThreatManager.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Battlegrounds"
+			>
 			<File
-				RelativePath="..\..\src\game\ScriptCalls.h"
+				RelativePath="..\..\src\game\BattleGround.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillDiscovery.cpp"
+				RelativePath="..\..\src\game\BattleGround.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillDiscovery.h"
+				RelativePath="..\..\src\game\BattleGroundAA.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillExtraItems.cpp"
+				RelativePath="..\..\src\game\BattleGroundAA.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillExtraItems.h"
+				RelativePath="..\..\src\game\BattleGroundAB.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SkillHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundAB.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Spell.cpp"
+				RelativePath="..\..\src\game\BattleGroundAV.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Spell.h"
+				RelativePath="..\..\src\game\BattleGroundAV.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuraDefines.h"
+				RelativePath="..\..\src\game\BattleGroundBE.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuras.cpp"
+				RelativePath="..\..\src\game\BattleGroundBE.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellAuras.h"
+				RelativePath="..\..\src\game\BattleGroundEY.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellEffects.cpp"
+				RelativePath="..\..\src\game\BattleGroundEY.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TaxiHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TradeHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundNA.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Transports.cpp"
+				RelativePath="..\..\src\game\BattleGroundNA.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Transports.h"
+				RelativePath="..\..\src\game\BattleGroundRL.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateData.cpp"
+				RelativePath="..\..\src\game\BattleGroundRL.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateData.h"
+				RelativePath="..\..\src\game\BattleGroundWS.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\VoiceChatHandler.cpp"
+				RelativePath="..\..\src\game\BattleGroundWS.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Outdoor PvP"
+			>
 			<File
-				RelativePath="..\..\src\game\WaypointManager.cpp"
+				RelativePath="..\..\src\game\OutdoorPvP.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointManager.h"
+				RelativePath="..\..\src\game\OutdoorPvP.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Weather.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Weather.h"
+				RelativePath="..\..\src\game\OutdoorPvPEP.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\World.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\World.h"
+				RelativePath="..\..\src\game\OutdoorPvPHP.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Object"
-			>
 			<File
-				RelativePath="..\..\src\game\AggressorAI.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AggressorAI.h"
+				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
+				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeam.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPNA.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ArenaTeam.h"
+				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouseObject.h"
+				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Bag.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Bag.h"
+				RelativePath="..\..\src\game\OutdoorPvPSI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
+				RelativePath="..\..\src\game\OutdoorPvPTF.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Corpse.cpp"
+				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Corpse.h"
+				RelativePath="..\..\src\game\OutdoorPvPZM.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Artificial Intelligence"
+			>
 			<File
-				RelativePath="..\..\src\game\Creature.cpp"
+				RelativePath="..\..\src\game\AggressorAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Creature.h"
+				RelativePath="..\..\src\game\AggressorAI.h"
 				>
 			</File>
 			<File
@@ -952,67 +976,75 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureGroups.cpp"
+				RelativePath="..\..\src\game\GuardAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\CreatureGroups.h"
+				RelativePath="..\..\src\game\GuardAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolder.cpp"
+				RelativePath="..\..\src\game\NullCreatureAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolder.h"
+				RelativePath="..\..\src\game\NullCreatureAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DestinationHolderImp.h"
+				RelativePath="..\..\src\game\PetAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DynamicObject.cpp"
+				RelativePath="..\..\src\game\PetAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\DynamicObject.h"
+				RelativePath="..\..\src\game\PossessedAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
+				RelativePath="..\..\src\game\PossessedAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.h"
+				RelativePath="..\..\src\game\ReactorAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Formulas.h"
+				RelativePath="..\..\src\game\ReactorAI.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameObject.cpp"
+				RelativePath="..\..\src\game\TotemAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GameObject.h"
+				RelativePath="..\..\src\game\TotemAI.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Movement Generators"
+			>
 			<File
-				RelativePath="..\..\src\game\GuardAI.cpp"
+				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GuardAI.h"
+				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Guild.cpp"
+				RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Guild.h"
+				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\FleeingMovementGenerator.h"
 				>
 			</File>
 			<File
@@ -1032,387 +1064,387 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Item.cpp"
+				RelativePath="..\..\src\game\MovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Item.h"
+				RelativePath="..\..\src\game\MovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp"
+				RelativePath="..\..\src\game\PointMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemEnchantmentMgr.h"
+				RelativePath="..\..\src\game\PointMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ItemPrototype.h"
+				RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootMgr.cpp"
+				RelativePath="..\..\src\game\RandomMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\LootMgr.h"
+				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MotionMaster.cpp"
+				RelativePath="..\..\src\game\TargetedMovementGenerator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MotionMaster.h"
+				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MovementGenerator.cpp"
+				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Spells/Skills"
+			>
 			<File
-				RelativePath="..\..\src\game\MovementGenerator.h"
+				RelativePath="..\..\src\game\SkillDiscovery.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NullCreatureAI.cpp"
+				RelativePath="..\..\src\game\SkillDiscovery.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\NullCreatureAI.h"
+				RelativePath="..\..\src\game\SkillExtraItems.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Object.cpp"
+				RelativePath="..\..\src\game\SkillExtraItems.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Object.h"
+				RelativePath="..\..\src\game\SkillHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectAccessor.cpp"
+				RelativePath="..\..\src\game\Spell.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectAccessor.h"
+				RelativePath="..\..\src\game\Spell.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectDefines.h"
+				RelativePath="..\..\src\game\SpellAuraDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectMgr.cpp"
+				RelativePath="..\..\src\game\SpellAuras.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ObjectMgr.h"
+				RelativePath="..\..\src\game\SpellAuras.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.cpp"
+				RelativePath="..\..\src\game\SpellEffects.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.h"
+				RelativePath="..\..\src\game\SpellHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Pet.cpp"
+				RelativePath="..\..\src\game\SpellMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Pet.h"
+				RelativePath="..\..\src\game\SpellMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PetAI.cpp"
+				RelativePath="..\..\src\game\StatSystem.cpp"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Maps/Grids"
+			>
 			<File
-				RelativePath="..\..\src\game\PetAI.h"
+				RelativePath="..\..\src\game\Cell.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Player.cpp"
+				RelativePath="..\..\src\game\CellImpl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Player.h"
+				RelativePath="..\..\src\game\GridDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.cpp"
+				RelativePath="..\..\src\game\GridNotifiers.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.h"
+				RelativePath="..\..\src\game\GridNotifiers.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PossessedAI.cpp"
+				RelativePath="..\..\src\game\GridNotifiersImpl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PossessedAI.h"
+				RelativePath="..\..\src\game\GridStates.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
+				RelativePath="..\..\src\game\GridStates.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.h"
+				RelativePath="..\..\src\game\InstanceData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ReactorAI.cpp"
+				RelativePath="..\..\src\game\InstanceData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ReactorAI.h"
+				RelativePath="..\..\src\game\InstanceSaveMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SocialMgr.cpp"
+				RelativePath="..\..\src\game\InstanceSaveMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SocialMgr.h"
+				RelativePath="..\..\src\game\Map.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellMgr.cpp"
+				RelativePath="..\..\src\game\Map.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SpellMgr.h"
+				RelativePath="..\..\src\game\MapInstanced.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\StatSystem.cpp"
+				RelativePath="..\..\src\game\MapInstanced.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
+				RelativePath="..\..\src\game\MapManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.h"
+				RelativePath="..\..\src\game\MapManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TemporarySummon.cpp"
+				RelativePath="..\..\src\game\MapReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TemporarySummon.h"
+				RelativePath="..\..\src\game\MapRefManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketMgr.cpp"
+				RelativePath="..\..\src\game\ObjectGridLoader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TicketMgr.h"
+				RelativePath="..\..\src\game\ObjectGridLoader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Totem.cpp"
+				RelativePath="..\..\src\game\Path.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Totem.h"
+				RelativePath="..\..\src\game\Transports.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TotemAI.cpp"
+				RelativePath="..\..\src\game\Transports.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\TotemAI.h"
+				RelativePath="..\..\src\game\Weather.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Traveller.h"
+				RelativePath="..\..\src\game\Weather.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Handlers"
+			>
 			<File
-				RelativePath="..\..\src\game\Unit.cpp"
+				RelativePath="..\..\src\game\AddonHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Unit.h"
+				RelativePath="..\..\src\game\AddonHandler.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UnitEvents.h"
+				RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateFields.h"
+				RelativePath="..\..\src\game\ChannelHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\UpdateMask.h"
+				RelativePath="..\..\src\game\CharacterHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
+				RelativePath="..\..\src\game\ChatHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
+				RelativePath="..\..\src\game\CombatHandler.cpp"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Server"
-			>
 			<File
-				RelativePath="..\..\src\game\GlobalEvents.cpp"
+				RelativePath="..\..\src\game\DuelHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GlobalEvents.h"
+				RelativePath="..\..\src\game\GroupHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Opcodes.cpp"
+				RelativePath="..\..\src\game\GuildHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Opcodes.h"
+				RelativePath="..\..\src\game\ItemHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\SharedDefines.h"
+				RelativePath="..\..\src\game\LFGHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldLog.cpp"
+				RelativePath="..\..\src\game\LootHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldLog.h"
+				RelativePath="..\..\src\game\MiscHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSession.cpp"
+				RelativePath="..\..\src\game\MovementHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSession.h"
+				RelativePath="..\..\src\game\NPCHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocket.cpp"
+				RelativePath="..\..\src\game\NPCHandler.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocket.h"
+				RelativePath="..\..\src\game\PetHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocketMgr.cpp"
+				RelativePath="..\..\src\game\PetitionsHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\WorldSocketMgr.h"
+				RelativePath="..\..\src\game\QueryHandler.cpp"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Chat Commands"
-			>
 			<File
-				RelativePath="..\..\src\game\debugcmds.cpp"
+				RelativePath="..\..\src\game\QuestHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level0.cpp"
+				RelativePath="..\..\src\game\TaxiHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level1.cpp"
+				RelativePath="..\..\src\game\TicketHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level2.cpp"
+				RelativePath="..\..\src\game\TradeHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Level3.cpp"
+				RelativePath="..\..\src\game\VoiceChatHandler.cpp"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Tool"
-			>
 			<File
-				RelativePath="..\..\src\game\Language.h"
+				RelativePath="..\..\src\game\WaypointManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\PlayerDump.cpp"
+				RelativePath="..\..\src\game\WaypointManager.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Managers"
+			>
 			<File
-				RelativePath="..\..\src\game\PlayerDump.h"
+				RelativePath="..\..\src\game\AccountMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\tools.cpp"
+				RelativePath="..\..\src\game\AccountMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\Tools.h"
+				RelativePath="..\..\src\game\ChannelMgr.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="References"
-			>
 			<File
-				RelativePath="..\..\src\game\FollowerReference.cpp"
+				RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FollowerReference.h"
+				RelativePath="..\..\src\game\ItemEnchantmentMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\FollowerRefManager.h"
+				RelativePath="..\..\src\game\LootMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupReference.cpp"
+				RelativePath="..\..\src\game\LootMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupReference.h"
+				RelativePath="..\..\src\game\ObjectMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\GroupRefManager.h"
+				RelativePath="..\..\src\game\ObjectMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\HostilRefManager.cpp"
+				RelativePath="..\..\src\game\SocialMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\HostilRefManager.h"
+				RelativePath="..\..\src\game\SocialMgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ThreatManager.cpp"
+				RelativePath="..\..\src\game\TicketMgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\ThreatManager.h"
+				RelativePath="..\..\src\game\TicketMgr.h"
 				>
 			</File>
 		</Filter>