diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index db5f8a4f4d..486423d975 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -467,10 +467,6 @@
 				RelativePath=".\..\src\articulated_vehicles.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\autoreplace_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\aystar.cpp"
 				>
@@ -499,10 +495,6 @@
 				RelativePath=".\..\src\cheat.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cheat_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\command.cpp"
 				>
@@ -731,10 +723,6 @@
 				RelativePath=".\..\src\station.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\statusbar_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\string.cpp"
 				>
@@ -1651,6 +1639,10 @@
 				RelativePath=".\..\src\build_vehicle_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\cheat_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\depot_gui.cpp"
 				>
@@ -1751,6 +1743,10 @@
 				RelativePath=".\..\src\station_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\statusbar_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\subsidy_gui.cpp"
 				>
@@ -1785,12 +1781,16 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Landscape"
+			Name="Command handlers"
 			>
 			<File
 				RelativePath=".\..\src\aircraft_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\clear_cmd.cpp"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 9e6b488e11..9a865effcd 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -464,10 +464,6 @@
 				RelativePath=".\..\src\articulated_vehicles.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\autoreplace_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\aystar.cpp"
 				>
@@ -496,10 +492,6 @@
 				RelativePath=".\..\src\cheat.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cheat_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\command.cpp"
 				>
@@ -728,10 +720,6 @@
 				RelativePath=".\..\src\station.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\statusbar_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\string.cpp"
 				>
@@ -1648,6 +1636,10 @@
 				RelativePath=".\..\src\build_vehicle_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\cheat_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\depot_gui.cpp"
 				>
@@ -1748,6 +1740,10 @@
 				RelativePath=".\..\src\station_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\statusbar_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\subsidy_gui.cpp"
 				>
@@ -1782,12 +1778,16 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Landscape"
+			Name="Command handlers"
 			>
 			<File
 				RelativePath=".\..\src\aircraft_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\clear_cmd.cpp"
 				>
diff --git a/source.list b/source.list
index d00e008315..027301e17b 100644
--- a/source.list
+++ b/source.list
@@ -3,7 +3,6 @@ airport.cpp
 core/alloc_func.cpp
 animated_tile.cpp
 articulated_vehicles.cpp
-autoreplace_cmd.cpp
 aystar.cpp
 core/bitmath_func.cpp
 bmp.cpp
@@ -11,7 +10,6 @@ callback_table.cpp
 cargopacket.cpp
 cargotype.cpp
 cheat.cpp
-cheat_gui.cpp
 command.cpp
 console.cpp
 console_cmds.cpp
@@ -76,7 +74,6 @@ signs.cpp
 sound.cpp
 spritecache.cpp
 station.cpp
-statusbar_gui.cpp
 string.cpp
 strings.cpp
 texteff.cpp
@@ -353,6 +350,7 @@ airport_gui.cpp
 autoreplace_gui.cpp
 bridge_gui.cpp
 build_vehicle_gui.cpp
+cheat_gui.cpp
 depot_gui.cpp
 dock_gui.cpp
 engine_gui.cpp
@@ -378,6 +376,7 @@ ship_gui.cpp
 signs_gui.cpp
 smallmap_gui.cpp
 station_gui.cpp
+statusbar_gui.cpp
 subsidy_gui.cpp
 terraform_gui.cpp
 timetable_gui.cpp
@@ -387,8 +386,9 @@ train_gui.cpp
 transparency_gui.cpp
 vehicle_gui.cpp
 
-# Landscape
+# Command handlers
 aircraft_cmd.cpp
+autoreplace_cmd.cpp
 clear_cmd.cpp
 disaster_cmd.cpp
 dummy_land.cpp