diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index 157cc620145..2877fb6bd20 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -849,6 +849,10 @@
 				RelativePath="..\..\src\game\Path.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\game\pchdef.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\game\PetHandler.cpp"
 				>
@@ -994,25 +998,9 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="AuctionHouseBot"
-			>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseBot.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseBot.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Object"
 			>
-			<File
-				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\ArenaTeam.cpp"
 				>
@@ -1045,14 +1033,6 @@
 				RelativePath="..\..\src\game\Calendar.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Corpse.cpp"
 				>
@@ -1077,18 +1057,6 @@
 				RelativePath="..\..\src\game\CreatureGroups.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\DestinationHolder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DestinationHolder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DestinationHolderImp.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\DynamicObject.cpp"
 				>
@@ -1097,14 +1065,6 @@
 				RelativePath="..\..\src\game\DynamicObject.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Formulas.h"
 				>
@@ -1125,22 +1085,6 @@
 				RelativePath="..\..\src\game\Guild.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\HomeMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\HomeMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\IdleMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\IdleMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Item.cpp"
 				>
@@ -1169,22 +1113,6 @@
 				RelativePath="..\..\src\game\LootMgr.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\MotionMaster.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MotionMaster.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Object.cpp"
 				>
@@ -1229,22 +1157,6 @@
 				RelativePath="..\..\src\game\Player.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\ReputationMgr.cpp"
 				>
@@ -1273,14 +1185,6 @@
 				RelativePath="..\..\src\game\StatSystem.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\TemporarySummon.cpp"
 				>
@@ -1329,18 +1233,110 @@
 				RelativePath="..\..\src\game\Vehicle.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\ZoneScript.h"
 				>
 			</File>
+			<Filter
+				Name="Movement"
+				>
+				<File
+					RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\DestinationHolder.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\DestinationHolder.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\DestinationHolderImp.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\FleeingMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\HomeMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\HomeMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\IdleMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\IdleMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\MotionMaster.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\MotionMaster.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\MovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\MovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\PointMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\PointMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\RandomMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\TargetedMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\WaypointMovementGenerator.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Server"
@@ -1617,6 +1613,18 @@
 				RelativePath="..\..\src\game\UnitAI.h"
 				>
 			</File>
+			<Filter
+				Name="AuctionHouseBot"
+				>
+				<File
+					RelativePath="..\..\src\game\AuctionHouseBot.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\AuctionHouseBot.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="OutdoorPvP"
@@ -1738,10 +1746,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\..\src\game\pchdef.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 28f05c696fb..1dcd5606fb3 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -1002,10 +1002,6 @@
 		<Filter
 			Name="Object"
 			>
-			<File
-				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\ArenaTeam.cpp"
 				>
@@ -1038,14 +1034,6 @@
 				RelativePath="..\..\src\game\Calendar.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Corpse.cpp"
 				>
@@ -1070,18 +1058,6 @@
 				RelativePath="..\..\src\game\CreatureGroups.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\DestinationHolder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DestinationHolder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\DestinationHolderImp.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\DynamicObject.cpp"
 				>
@@ -1090,14 +1066,6 @@
 				RelativePath="..\..\src\game\DynamicObject.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\FleeingMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Formulas.h"
 				>
@@ -1118,22 +1086,6 @@
 				RelativePath="..\..\src\game\Guild.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\HomeMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\HomeMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\IdleMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\IdleMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Item.cpp"
 				>
@@ -1162,22 +1114,6 @@
 				RelativePath="..\..\src\game\LootMgr.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\MotionMaster.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MotionMaster.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\MovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Object.cpp"
 				>
@@ -1222,22 +1158,6 @@
 				RelativePath="..\..\src\game\Player.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\PointMovementGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\RandomMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\ReputationMgr.cpp"
 				>
@@ -1266,14 +1186,6 @@
 				RelativePath="..\..\src\game\StatSystem.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\TargetedMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\TemporarySummon.cpp"
 				>
@@ -1322,18 +1234,110 @@
 				RelativePath="..\..\src\game\Vehicle.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\ZoneScript.h"
 				>
 			</File>
+			<Filter
+				Name="Movement"
+				>
+				<File
+					RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\ConfusedMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\DestinationHolder.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\DestinationHolder.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\DestinationHolderImp.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\FleeingMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\FleeingMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\HomeMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\HomeMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\IdleMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\IdleMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\MotionMaster.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\MotionMaster.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\MovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\MovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\PointMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\PointMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\RandomMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\RandomMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\TargetedMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\TargetedMovementGenerator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\WaypointMovementGenerator.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Server"