diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index 1532000bd5f..013f26f2732 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -307,6 +307,86 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="he"
+			>
+			<File
+				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\floodfill_he.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\intern_he.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\logic_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\logic_he.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\palette_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\resource_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\resource_he.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\script_v100he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\script_v60he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\script_v70he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\script_v72he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\script_v80he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\script_v90he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\sound_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\sprite_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\sprite_he.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\wiz_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\wiz_he.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\engines\scumm\actor.cpp"
 			>
@@ -387,14 +467,6 @@
 			RelativePath="..\..\engines\scumm\dialogs.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\floodfill_he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\floodfill_he.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\scumm\gfx.cpp"
 			>
@@ -443,18 +515,6 @@
 			RelativePath="..\..\engines\scumm\intern.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\intern_he.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\logic_he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\logic_he.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\scumm\midiparser_eup.cpp"
 			>
@@ -487,10 +547,6 @@
 			RelativePath="..\..\engines\scumm\palette.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\palette_he.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\scumm\player_mod.cpp"
 			>
@@ -559,14 +615,6 @@
 			RelativePath="..\..\engines\scumm\resource_v4.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v7he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v7he.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\scumm\room.cpp"
 			>
@@ -591,10 +639,6 @@
 			RelativePath="..\..\engines\scumm\script_c64.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v100he.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\scumm\script_v2.cpp"
 			>
@@ -607,30 +651,10 @@
 			RelativePath="..\..\engines\scumm\script_v6.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v6he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v72he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v7he.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\scumm\script_v8.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v80he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v90he.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\scumm\scumm-md5.h"
 			>
@@ -651,18 +675,6 @@
 			RelativePath="..\..\engines\scumm\sound.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound_he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sprite_he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sprite_he.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\scumm\string.cpp"
 			>
@@ -699,14 +711,6 @@
 			RelativePath="..\..\engines\scumm\verbs.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\scumm\wiz_he.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\wiz_he.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/simon.vcproj b/dists/msvc8/simon.vcproj
index 9b6d937e857..f5b8b162f7d 100644
--- a/dists/msvc8/simon.vcproj
+++ b/dists/msvc8/simon.vcproj
@@ -211,6 +211,10 @@
 			RelativePath="..\..\engines\simon\midiparser_s1d.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\simon\oracle.cpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\engines\simon\res.cpp"
 			>
diff --git a/dists/msvc8/sword2.vcproj b/dists/msvc8/sword2.vcproj
index 2d24f1eb2c6..96ca7c7dc1c 100644
--- a/dists/msvc8/sword2.vcproj
+++ b/dists/msvc8/sword2.vcproj
@@ -158,10 +158,6 @@
 	<References>
 	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\sword2\_mouse.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\sword2\animation.cpp"
 			>
@@ -174,14 +170,6 @@
 			RelativePath="..\..\engines\sword2\anims.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\sword2\build_display.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\build_display.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\sword2\console.cpp"
 			>
@@ -246,10 +234,6 @@
 			RelativePath="..\..\engines\sword2\layers.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\sword2\layers.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\sword2\logic.cpp"
 			>
@@ -327,11 +311,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\save_rest.cpp"
+			RelativePath="..\..\engines\sword2\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\save_rest.h"
+			RelativePath="..\..\engines\sword2\saveload.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\sword2\screen.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\sword2\screen.h"
 			>
 		</File>
 		<File