diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 465db1779..cd5da09a9 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9182"
+ #define REVISION_NR "9183"
 #endif // __REVISION_NR_H__
diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index 590a5dc25..31f979dbd 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -1010,6 +1010,110 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Motion generators"
+			>
+			<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\Traveller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Object"
 			>
@@ -1021,10 +1125,6 @@
 				RelativePath="..\..\src\game\AggressorAI.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\ArenaTeam.cpp"
 				>
@@ -1057,14 +1157,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"
 				>
@@ -1125,18 +1217,6 @@
 				RelativePath="..\..\src\game\CreatureEventAIMgr.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"
 				>
@@ -1145,14 +1225,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"
 				>
@@ -1189,22 +1261,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"
 				>
@@ -1233,22 +1289,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\NullCreatureAI.cpp"
 				>
@@ -1317,22 +1357,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\ReactorAI.cpp"
 				>
@@ -1369,14 +1393,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"
 				>
@@ -1401,10 +1417,6 @@
 				RelativePath="..\..\src\game\TotemAI.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\Traveller.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Unit.cpp"
 				>
@@ -1433,14 +1445,6 @@
 				RelativePath="..\..\src\game\Vehicle.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Server"
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index d860b9f9f..4aa9c1a3b 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -1011,6 +1011,110 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Motion generators"
+			>
+			<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\Traveller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Object"
 			>
@@ -1022,10 +1126,6 @@
 				RelativePath="..\..\src\game\AggressorAI.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\ArenaTeam.cpp"
 				>
@@ -1058,14 +1158,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"
 				>
@@ -1126,18 +1218,6 @@
 				RelativePath="..\..\src\game\CreatureEventAIMgr.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"
 				>
@@ -1146,14 +1226,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"
 				>
@@ -1190,22 +1262,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"
 				>
@@ -1234,22 +1290,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\NullCreatureAI.cpp"
 				>
@@ -1318,22 +1358,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\ReactorAI.cpp"
 				>
@@ -1370,14 +1394,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"
 				>
@@ -1402,10 +1418,6 @@
 				RelativePath="..\..\src\game\TotemAI.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\Traveller.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\game\Unit.cpp"
 				>
@@ -1434,14 +1446,6 @@
 				RelativePath="..\..\src\game\Vehicle.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\WaypointMovementGenerator.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Server"