diff --git a/AppleWin/ApplewinExpress9.00.vcproj b/AppleWin/ApplewinExpress9.00.vcproj
index 00e25dc0..d40d300f 100644
--- a/AppleWin/ApplewinExpress9.00.vcproj
+++ b/AppleWin/ApplewinExpress9.00.vcproj
@@ -217,14 +217,6 @@
 			Name="Source"
 			Filter=".cpp"
 			>
-			<File
-				RelativePath=".\source\6821.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\6821.h"
-				>
-			</File>
 			<File
 				RelativePath=".\source\Applewin.cpp"
 				>
@@ -241,198 +233,6 @@
 				RelativePath=".\source\Applewin.h"
 				>
 			</File>
-			<File
-				RelativePath=".\source\AY8910.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\AY8910.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\CPU.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\CPU.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Disk.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Disk.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\DiskImage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\DiskImage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Frame.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Frame.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Harddisk.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Harddisk.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Joystick.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Joystick.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Keyboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Keyboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Log.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Log.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Memory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Memory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Mockingboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Mockingboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\MouseInterface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\MouseInterface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\ParallelPrinter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\ParallelPrinter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\PropertySheetPage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\PropertySheetPage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Registry.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Registry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Riff.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Riff.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\SaveState.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\SaveState.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\SerialComms.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\SerialComms.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\SoundCore.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\SoundCore.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Speaker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Speaker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Tape.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Tape.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Util_MemoryTextFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Util_MemoryTextFile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Video.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\Video.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\z80emu.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\source\z80emu.h"
-				>
-			</File>
 			<Filter
 				Name="Debugger"
 				>
@@ -657,6 +457,234 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Emulator"
+				>
+				<File
+					RelativePath=".\source\6821.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\6821.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\AY8910.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\AY8910.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\CPU.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\CPU.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Disk.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Disk.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\DiskImage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\DiskImage.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Frame.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Frame.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Harddisk.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Harddisk.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Joystick.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Joystick.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Keyboard.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Keyboard.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Log.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Log.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Memory.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Memory.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Mockingboard.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Mockingboard.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\MouseInterface.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\MouseInterface.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\ParallelPrinter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\ParallelPrinter.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\PropertySheetPage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\PropertySheetPage.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Registry.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Registry.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Riff.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Riff.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\SaveState.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\SaveState.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\SerialComms.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\SerialComms.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\SoundCore.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\SoundCore.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Speaker.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Speaker.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Tape.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Tape.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Util_MemoryTextFile.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Util_MemoryTextFile.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Video.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Video.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\z80emu.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\z80emu.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="_Headers"
+				>
+				<File
+					RelativePath=".\source\Common.h"
+					>
+				</File>
+				<File
+					RelativePath=".\resource\resource.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\SSI263Phonemes.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\StdAfx.h"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Structs.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Docs"
@@ -877,26 +905,6 @@
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath=".\source\Common.h"
-			>
-		</File>
-		<File
-			RelativePath=".\resource\resource.h"
-			>
-		</File>
-		<File
-			RelativePath=".\source\SSI263Phonemes.h"
-			>
-		</File>
-		<File
-			RelativePath=".\source\StdAfx.h"
-			>
-		</File>
-		<File
-			RelativePath=".\source\Structs.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>