--- np2/win9x/np2vs2008.vcproj	2011/03/09 00:22:18	1.1
+++ np2/win9x/np2vs2008.vcproj	2011/03/16 03:31:20	1.3
@@ -27,8 +27,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\bin\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"
-			IntermediateDirectory="..\obj\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"
+			OutputDirectory="..\bin\$(SolutionName)\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\obj\$(SolutionName)\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -37,6 +37,7 @@
 			/>
 			<Tool
 				Name="NASM"
+				IncludePaths=".\x86\;..\i286x\;..\io\x86\"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -105,8 +106,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\bin\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"
-			IntermediateDirectory="..\obj\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"
+			OutputDirectory="..\bin\$(SolutionName)\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\obj\$(SolutionName)\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -121,6 +122,7 @@
 			/>
 			<Tool
 				Name="YASM"
+				IncludePaths=".\x64;..\i286c\x64;..\io\x64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -149,6 +151,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WIN64;_UNICODE;UNICODE"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -185,8 +188,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\bin\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"
-			IntermediateDirectory="..\obj\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"
+			OutputDirectory="..\bin\$(SolutionName)\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\obj\$(SolutionName)\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
@@ -196,6 +199,7 @@
 			/>
 			<Tool
 				Name="NASM"
+				IncludePaths=".\x86\;..\i286x\;..\io\x86\"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -266,8 +270,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\bin\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"
-			IntermediateDirectory="..\obj\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"
+			OutputDirectory="..\bin\$(SolutionName)\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\obj\$(SolutionName)\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
@@ -283,6 +287,7 @@
 			/>
 			<Tool
 				Name="YASM"
+				IncludePaths=".\x64;..\i286c\x64;..\io\x64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -311,6 +316,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WIN64;_UNICODE;UNICODE"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -385,6 +391,150 @@
 				>
 			</File>
 			<Filter
+				Name="bios"
+				>
+				<File
+					RelativePath="..\bios\bios.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios09.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios0c.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios12.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios13.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios18.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios19.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios1a.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios1b.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios1c.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\bios1f.c"
+					>
+				</File>
+				<File
+					RelativePath="..\bios\sxsibios.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="cbus"
+				>
+				<File
+					RelativePath="..\cbus\amd98.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\atapicmd.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\board118.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\board14.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\board26k.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\board86.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\boardpx.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\boardspb.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\boardx2.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\cbuscore.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\cs4231io.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\ideio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\mpu98ii.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\pc9861k.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\pcm86io.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\sasiio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\scsicmd.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\scsiio.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="codecnv"
+				>
+				<File
+					RelativePath="..\codecnv\tcswap16.c"
+					>
+				</File>
+				<File
+					RelativePath="..\codecnv\ucs2utf8.c"
+					>
+				</File>
+				<File
+					RelativePath="..\codecnv\utf8ucs2.c"
+					>
+				</File>
+			</Filter>
+			<Filter
 				Name="common"
 				>
 				<File
@@ -477,179 +627,123 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="codecnv"
+				Name="fdd"
 				>
 				<File
-					RelativePath="..\codecnv\tcswap16.c"
+					RelativePath="..\fdd\diskdrv.c"
 					>
 				</File>
 				<File
-					RelativePath="..\codecnv\ucs2utf8.c"
+					RelativePath="..\fdd\fdd_d88.c"
 					>
 				</File>
 				<File
-					RelativePath="..\codecnv\utf8ucs2.c"
+					RelativePath="..\fdd\fdd_mtr.c"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="i286x"
-				>
 				<File
-					RelativePath="..\i286x\i286x.cpp"
+					RelativePath="..\fdd\fdd_xdf.c"
 					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\i286x\i286xadr.cpp"
+					RelativePath="..\fdd\fddfile.c"
 					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\i286x\i286xcts.cpp"
+					RelativePath="..\fdd\newdisk.c"
 					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\i286x\i286xrep.cpp"
+					RelativePath="..\fdd\sxsi.c"
 					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\i286x\i286xs.cpp"
+					RelativePath="..\fdd\sxsicd.c"
 					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\i286x\memory.x86"
+					RelativePath="..\fdd\sxsihdd.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="NASM"
-							IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="NASM"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="NASM"
-							IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="NASM"
-						/>
-					</FileConfiguration>
 				</File>
+			</Filter>
+			<Filter
+				Name="font"
+				>
 				<File
-					RelativePath="..\i286x\v30patch.cpp"
+					RelativePath="..\font\font.c"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontdata.c"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontfm7.c"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontmake.c"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontpc88.c"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontpc98.c"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontv98.c"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontx1.c"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontx68k.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="generic"
+				>
+				<File
+					RelativePath="..\generic\cmjasts.c"
+					>
+				</File>
+				<File
+					RelativePath="..\generic\cmndraw.c"
+					>
+				</File>
+				<File
+					RelativePath="..\generic\dipswbmp.c"
+					>
+				</File>
+				<File
+					RelativePath="..\generic\hostdrv.c"
+					>
+				</File>
+				<File
+					RelativePath="..\generic\hostdrvs.c"
+					>
+				</File>
+				<File
+					RelativePath="..\generic\keydisp.c"
+					>
+				</File>
+				<File
+					RelativePath="..\generic\np2info.c"
+					>
+				</File>
+				<File
+					RelativePath="..\generic\softkbd.c"
+					>
+				</File>
+				<File
+					RelativePath="..\generic\unasm.c"
 					>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
@@ -877,33 +971,13 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="mem"
+				Name="i286x"
 				>
 				<File
-					RelativePath="..\mem\dmav30.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\mem\dmax86.c"
+					RelativePath="..\i286x\i286x.cpp"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -911,7 +985,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -920,10 +994,10 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\mem\memegc.c"
+					RelativePath="..\i286x\i286xadr.cpp"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -931,7 +1005,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -940,10 +1014,10 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\mem\memems.c"
+					RelativePath="..\i286x\i286xcts.cpp"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -951,7 +1025,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -960,10 +1034,10 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\mem\memepp.c"
+					RelativePath="..\i286x\i286xrep.cpp"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -971,7 +1045,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -980,10 +1054,10 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\mem\memtram.c"
+					RelativePath="..\i286x\i286xs.cpp"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -991,7 +1065,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -1000,30 +1074,30 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\mem\memvga.c"
+					RelativePath="..\i286x\memory.x86"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
-							Name="VCCLCompilerTool"
+							Name="NASM"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
-							Name="VCCLCompilerTool"
+							Name="NASM"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\mem\memvram.c"
+					RelativePath="..\i286x\v30patch.cpp"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -1031,7 +1105,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -1149,186 +1223,514 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="cbus"
+				Name="lio"
 				>
 				<File
-					RelativePath="..\cbus\amd98.c"
+					RelativePath="..\lio\gcircle.c"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\atapicmd.c"
+					RelativePath="..\lio\gline.c"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\board118.c"
+					RelativePath="..\lio\gpset.c"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\board14.c"
+					RelativePath="..\lio\gput1.c"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\board26k.c"
+					RelativePath="..\lio\gscreen.c"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\board86.c"
+					RelativePath="..\lio\lio.c"
 					>
 				</File>
+			</Filter>
+			<Filter
+				Name="mem"
+				>
 				<File
-					RelativePath="..\cbus\boardpx.c"
+					RelativePath="..\mem\dmav30.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\cbus\boardspb.c"
+					RelativePath="..\mem\dmax86.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\cbus\boardx2.c"
+					RelativePath="..\mem\memegc.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\cbus\cbuscore.c"
+					RelativePath="..\mem\memems.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\cbus\cs4231io.c"
+					RelativePath="..\mem\memepp.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\cbus\ideio.c"
+					RelativePath="..\mem\memtram.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\cbus\mpu98ii.c"
+					RelativePath="..\mem\memvga.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\cbus\pc9861k.c"
+					RelativePath="..\mem\memvram.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
+			</Filter>
+			<Filter
+				Name="sound"
+				>
 				<File
-					RelativePath="..\cbus\pcm86io.c"
+					RelativePath="..\sound\adpcmc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\sasiio.c"
+					RelativePath="..\sound\adpcmg.c"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\scsicmd.c"
+					RelativePath="..\sound\beepc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\scsiio.c"
+					RelativePath="..\sound\beepg.c"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="zlib"
-				>
 				<File
-					RelativePath="..\zlib\adler32.c"
+					RelativePath="..\sound\cs4231c.c"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\crc32.c"
+					RelativePath="..\sound\cs4231g.c"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\inffast.c"
+					RelativePath="..\sound\fmboard.c"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\inflate.c"
+					RelativePath="..\sound\fmtimer.c"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\inftrees.c"
+					RelativePath="..\sound\opngenc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\zutil.c"
+					RelativePath="..\sound\opngeng.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
-			</Filter>
-			<Filter
-				Name="win9x"
-				>
 				<File
-					RelativePath=".\cmmidi.cpp"
+					RelativePath="..\sound\pcm86c.c"
 					>
 				</File>
 				<File
-					RelativePath=".\cmpara.cpp"
+					RelativePath="..\sound\pcm86g.c"
 					>
 				</File>
 				<File
-					RelativePath=".\cmserial.cpp"
+					RelativePath="..\sound\psggenc.c"
 					>
 				</File>
 				<File
-					RelativePath=".\commng.cpp"
+					RelativePath="..\sound\psggeng.c"
 					>
 				</File>
 				<File
-					RelativePath=".\compiler.cpp"
+					RelativePath="..\sound\rhythmc.c"
 					>
 				</File>
 				<File
-					RelativePath=".\dclock.cpp"
+					RelativePath="..\sound\s98.c"
 					>
 				</File>
 				<File
-					RelativePath=".\dd2.cpp"
+					RelativePath="..\sound\sndcsec.c"
 					>
 				</File>
 				<File
-					RelativePath=".\dosio.cpp"
+					RelativePath="..\sound\sound.c"
 					>
 				</File>
 				<File
-					RelativePath=".\extromio.cpp"
+					RelativePath="..\sound\soundrom.c"
 					>
 				</File>
 				<File
-					RelativePath=".\fontmng.cpp"
+					RelativePath="..\sound\tms3631c.c"
 					>
 				</File>
 				<File
-					RelativePath=".\ini.cpp"
+					RelativePath="..\sound\tms3631g.c"
 					>
 				</File>
+				<Filter
+					Name="getsnd"
+					>
+					<File
+						RelativePath="..\sound\getsnd\getsmix.c"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\getsnd\getsnd.c"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\getsnd\getwave.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="vermouth"
+					>
+					<File
+						RelativePath="..\sound\vermouth\midimod.c"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\midinst.c"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\midiout.c"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\midtable.c"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\midvoice.c"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="trap"
+				>
 				<File
-					RelativePath=".\joymng.cpp"
+					RelativePath="..\trap\inttrap.c"
 					>
 				</File>
 				<File
-					RelativePath=".\juliet.cpp"
+					RelativePath="..\trap\steptrap.c"
 					>
 				</File>
+			</Filter>
+			<Filter
+				Name="vram"
+				>
 				<File
-					RelativePath=".\menu.cpp"
+					RelativePath="..\vram\dispsync.c"
 					>
 				</File>
 				<File
-					RelativePath=".\mousemng.cpp"
+					RelativePath="..\vram\makegrex.c"
 					>
 				</File>
 				<File
-					RelativePath=".\mt32snd.cpp"
+					RelativePath="..\vram\makegrph.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\np2.cpp"
+					RelativePath="..\vram\maketext.c"
 					>
 				</File>
 				<File
-					RelativePath=".\np2arg.cpp"
+					RelativePath="..\vram\maketgrp.c"
 					>
 				</File>
 				<File
-					RelativePath=".\oemtext.cpp"
+					RelativePath="..\vram\palettes.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vram\scrnbmp.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vram\scrndraw.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vram\scrnsave.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vram\sdraw.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vram\sdrawq16.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vram\vram.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="win9x"
+				>
+				<File
+					RelativePath=".\cmmidi.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\cmpara.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\cmserial.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\commng.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\compiler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\dclock.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\dd2.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\dosio.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\extromio.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\fontmng.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ini.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\joymng.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\juliet.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\menu.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\mousemng.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\mt32snd.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\np2.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\np2arg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\oemtext.cpp"
 					>
 				</File>
 				<File
@@ -1384,148 +1786,144 @@
 					>
 				</File>
 				<Filter
-					Name="dialog"
+					Name="debuguty"
 					>
 					<File
-						RelativePath=".\dialog\d_about.cpp"
+						RelativePath=".\debuguty\view1mb.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\d_bmp.cpp"
+						RelativePath=".\debuguty\viewasm.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\d_clnd.cpp"
+						RelativePath=".\debuguty\viewcmn.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\d_config.cpp"
+						RelativePath=".\debuguty\viewer.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\d_disk.cpp"
+						RelativePath=".\debuguty\viewmem.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\d_mpu98.cpp"
+						RelativePath=".\debuguty\viewmenu.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\d_screen.cpp"
+						RelativePath=".\debuguty\viewreg.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\d_serial.cpp"
+						RelativePath=".\debuguty\viewseg.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\d_sound.cpp"
+						RelativePath=".\debuguty\viewsnd.cpp"
 						>
 					</File>
+				</Filter>
+				<Filter
+					Name="dialog"
+					>
 					<File
-						RelativePath=".\dialog\dialogs.cpp"
+						RelativePath=".\dialog\d_about.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\dialog\np2class.cpp"
+						RelativePath=".\dialog\d_bmp.cpp"
 						>
 					</File>
-				</Filter>
-				<Filter
-					Name="debuguty"
-					>
 					<File
-						RelativePath=".\debuguty\view1mb.cpp"
+						RelativePath=".\dialog\d_clnd.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\debuguty\viewasm.cpp"
+						RelativePath=".\dialog\d_config.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\debuguty\viewcmn.cpp"
+						RelativePath=".\dialog\d_disk.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\debuguty\viewer.cpp"
+						RelativePath=".\dialog\d_mpu98.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\debuguty\viewmem.cpp"
+						RelativePath=".\dialog\d_screen.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\debuguty\viewmenu.cpp"
+						RelativePath=".\dialog\d_serial.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\debuguty\viewreg.cpp"
+						RelativePath=".\dialog\d_sound.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\debuguty\viewseg.cpp"
+						RelativePath=".\dialog\dialogs.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\debuguty\viewsnd.cpp"
+						RelativePath=".\dialog\np2class.cpp"
 						>
 					</File>
 				</Filter>
 				<Filter
-					Name="x86"
+					Name="x64"
 					>
 					<File
-						RelativePath=".\x86\cputype.x86"
+						RelativePath=".\x64\makegrph.x64"
 						>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Debug|Win32"
 							ExcludedFromBuild="true"
 							>
 							<Tool
-								Name="NASM"
+								Name="YASM"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Release|Win32"
 							ExcludedFromBuild="true"
 							>
 							<Tool
-								Name="NASM"
+								Name="YASM"
 							/>
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\dclockd.x86"
+						RelativePath=".\x64\parts.x64"
 						>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Debug|Win32"
 							ExcludedFromBuild="true"
 							>
 							<Tool
-								Name="NASM"
+								Name="YASM"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Release|Win32"
 							ExcludedFromBuild="true"
 							>
 							<Tool
-								Name="NASM"
+								Name="YASM"
 							/>
 						</FileConfiguration>
 					</File>
+				</Filter>
+				<Filter
+					Name="x86"
+					>
 					<File
-						RelativePath="..\mem\x86\dmax86.x86"
+						RelativePath=".\x86\cputype.x86"
 						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Debug|x64"
 							ExcludedFromBuild="true"
 							>
@@ -1534,14 +1932,6 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|x64"
 							ExcludedFromBuild="true"
 							>
@@ -1551,17 +1941,9 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\x86\makegrph.x86"
+						RelativePath=".\dclockd.x86"
 						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Debug|x64"
 							ExcludedFromBuild="true"
 							>
@@ -1570,14 +1952,6 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|x64"
 							ExcludedFromBuild="true"
 							>
@@ -1587,17 +1961,9 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\mem\x86\memegc.x86"
+						RelativePath="..\mem\x86\dmax86.x86"
 						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Debug|x64"
 							ExcludedFromBuild="true"
 							>
@@ -1606,14 +1972,6 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|x64"
 							ExcludedFromBuild="true"
 							>
@@ -1623,7 +1981,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\x86\opngeng.x86"
+						RelativePath=".\x86\makegrph.x86"
 						>
 						<FileConfiguration
 							Name="Debug|x64"
@@ -1643,7 +2001,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\x86\parts.x86"
+						RelativePath="..\mem\x86\memegc.x86"
 						>
 						<FileConfiguration
 							Name="Debug|x64"
@@ -1656,511 +2014,79 @@
 						<FileConfiguration
 							Name="Release|x64"
 							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="NASM"
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-				<Filter
-					Name="x64"
-					>
-					<File
-						RelativePath=".\x64\makegrph.x64"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="YASM"
-								IncludePaths=".\x64;..\i286c\x64;..\io\x64"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="YASM"
-								IncludePaths=".\x64;..\i286c\x64;..\io\x64"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\x64\parts.x64"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="trap"
-				>
-				<File
-					RelativePath="..\trap\inttrap.c"
-					>
-				</File>
-				<File
-					RelativePath="..\trap\steptrap.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="generic"
-				>
-				<File
-					RelativePath="..\generic\cmjasts.c"
-					>
-				</File>
-				<File
-					RelativePath="..\generic\cmndraw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\generic\dipswbmp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\generic\hostdrv.c"
-					>
-				</File>
-				<File
-					RelativePath="..\generic\hostdrvs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\generic\keydisp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\generic\np2info.c"
-					>
-				</File>
-				<File
-					RelativePath="..\generic\softkbd.c"
-					>
-				</File>
-				<File
-					RelativePath="..\generic\unasm.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="font"
-				>
-				<File
-					RelativePath="..\font\font.c"
-					>
-				</File>
-				<File
-					RelativePath="..\font\fontdata.c"
-					>
-				</File>
-				<File
-					RelativePath="..\font\fontfm7.c"
-					>
-				</File>
-				<File
-					RelativePath="..\font\fontmake.c"
-					>
-				</File>
-				<File
-					RelativePath="..\font\fontpc88.c"
-					>
-				</File>
-				<File
-					RelativePath="..\font\fontpc98.c"
-					>
-				</File>
-				<File
-					RelativePath="..\font\fontv98.c"
-					>
-				</File>
-				<File
-					RelativePath="..\font\fontx1.c"
-					>
-				</File>
-				<File
-					RelativePath="..\font\fontx68k.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="fdd"
-				>
-				<File
-					RelativePath="..\fdd\diskdrv.c"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\fdd_d88.c"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\fdd_mtr.c"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\fdd_xdf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\fddfile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\newdisk.c"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\sxsi.c"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\sxsicd.c"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\sxsihdd.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="sound"
-				>
-				<File
-					RelativePath="..\sound\adpcmc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\adpcmg.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\beepc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\beepg.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\cs4231c.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\cs4231g.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\fmboard.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\fmtimer.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\opngenc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\opngeng.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sound\pcm86c.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\pcm86g.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\psggenc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\psggeng.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\rhythmc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\s98.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\sndcsec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\sound.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\soundrom.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\tms3631c.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sound\tms3631g.c"
-					>
-				</File>
-				<Filter
-					Name="getsnd"
-					>
-					<File
-						RelativePath="..\sound\getsnd\getsmix.c"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\getsnd\getsnd.c"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\getsnd\getwave.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="vermouth"
-					>
-					<File
-						RelativePath="..\sound\vermouth\midimod.c"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\vermouth\midinst.c"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\vermouth\midiout.c"
-						>
+							>
+							<Tool
+								Name="NASM"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\sound\vermouth\midtable.c"
+						RelativePath=".\x86\opngeng.x86"
 						>
+						<FileConfiguration
+							Name="Debug|x64"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="NASM"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|x64"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="NASM"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\sound\vermouth\midvoice.c"
+						RelativePath=".\x86\parts.x86"
 						>
+						<FileConfiguration
+							Name="Debug|x64"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="NASM"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|x64"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="NASM"
+							/>
+						</FileConfiguration>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
-				Name="vram"
-				>
-				<File
-					RelativePath="..\vram\dispsync.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\makegrex.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\makegrph.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\vram\maketext.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\maketgrp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\palettes.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\scrnbmp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\scrndraw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\scrnsave.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\sdraw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\sdrawq16.c"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\vram.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="lio"
-				>
-				<File
-					RelativePath="..\lio\gcircle.c"
-					>
-				</File>
-				<File
-					RelativePath="..\lio\gline.c"
-					>
-				</File>
-				<File
-					RelativePath="..\lio\gpset.c"
-					>
-				</File>
-				<File
-					RelativePath="..\lio\gput1.c"
-					>
-				</File>
-				<File
-					RelativePath="..\lio\gscreen.c"
-					>
-				</File>
-				<File
-					RelativePath="..\lio\lio.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="bios"
+				Name="zlib"
 				>
 				<File
-					RelativePath="..\bios\bios.c"
-					>
-				</File>
-				<File
-					RelativePath="..\bios\bios09.c"
-					>
-				</File>
-				<File
-					RelativePath="..\bios\bios0c.c"
-					>
-				</File>
-				<File
-					RelativePath="..\bios\bios12.c"
-					>
-				</File>
-				<File
-					RelativePath="..\bios\bios13.c"
-					>
-				</File>
-				<File
-					RelativePath="..\bios\bios18.c"
-					>
-				</File>
-				<File
-					RelativePath="..\bios\bios19.c"
+					RelativePath="..\zlib\adler32.c"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\bios1a.c"
+					RelativePath="..\zlib\crc32.c"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\bios1b.c"
+					RelativePath="..\zlib\inffast.c"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\bios1c.c"
+					RelativePath="..\zlib\inflate.c"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\bios1f.c"
+					RelativePath="..\zlib\inftrees.c"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\sxsibios.c"
+					RelativePath="..\zlib\zutil.c"
 					>
 				</File>
 			</Filter>
@@ -2207,62 +2133,102 @@
 				>
 			</File>
 			<Filter
-				Name="common"
+				Name="bios"
 				>
 				<File
-					RelativePath="..\common\_memory.h"
+					RelativePath="..\bios\bios.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\arc.h"
+					RelativePath="..\bios\biosmem.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\arcunzip.h"
+					RelativePath="..\bios\fdfmt.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\bmpdata.h"
+					RelativePath="..\bios\rsbios.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\lstarray.h"
+					RelativePath="..\bios\sxsibios.h"
 					>
 				</File>
+			</Filter>
+			<Filter
+				Name="cbus"
+				>
 				<File
-					RelativePath="..\common\milstr.h"
+					RelativePath="..\cbus\amd98.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\mimpidef.h"
+					RelativePath="..\cbus\atapicmd.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\parts.h"
+					RelativePath="..\cbus\board118.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\profile.h"
+					RelativePath="..\cbus\board14.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\rect.h"
+					RelativePath="..\cbus\board26k.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\resize.h"
+					RelativePath="..\cbus\board86.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\strres.h"
+					RelativePath="..\cbus\boardpx.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\boardspb.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\boardx2.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\cbuscore.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\cs4231io.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\ideio.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\mpu98ii.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\pc9861k.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\pcm86io.h"
+					>
+				</File>
+				<File
+					RelativePath="..\cbus\sasiio.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\textfile.h"
+					RelativePath="..\cbus\scsicmd.h"
 					>
 				</File>
 				<File
-					RelativePath="..\common\wavefile.h"
+					RelativePath="..\cbus\scsiio.h"
 					>
 				</File>
 			</Filter>
@@ -2275,126 +2241,122 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="zlib"
+				Name="common"
 				>
 				<File
-					RelativePath="..\zlib\crc32.h"
-					>
-				</File>
-				<File
-					RelativePath="..\zlib\inffast.h"
-					>
-				</File>
-				<File
-					RelativePath="..\zlib\inffixed.h"
+					RelativePath="..\common\_memory.h"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\inflate.h"
+					RelativePath="..\common\arc.h"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\inftrees.h"
+					RelativePath="..\common\arcunzip.h"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\zconf.h"
+					RelativePath="..\common\bmpdata.h"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\zlib.h"
+					RelativePath="..\common\lstarray.h"
 					>
 				</File>
 				<File
-					RelativePath="..\zlib\zutil.h"
+					RelativePath="..\common\milstr.h"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="cbus"
-				>
 				<File
-					RelativePath="..\cbus\amd98.h"
+					RelativePath="..\common\mimpidef.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\atapicmd.h"
+					RelativePath="..\common\parts.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\board118.h"
+					RelativePath="..\common\profile.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\board14.h"
+					RelativePath="..\common\rect.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\board26k.h"
+					RelativePath="..\common\resize.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\board86.h"
+					RelativePath="..\common\strres.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\boardpx.h"
+					RelativePath="..\common\textfile.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\boardspb.h"
+					RelativePath="..\common\wavefile.h"
 					>
 				</File>
+			</Filter>
+			<Filter
+				Name="fdd"
+				>
 				<File
-					RelativePath="..\cbus\boardx2.h"
+					RelativePath="..\fdd\d88head.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\cbuscore.h"
+					RelativePath="..\fdd\diskdrv.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\cs4231io.h"
+					RelativePath="..\fdd\fdd_d88.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\ideio.h"
+					RelativePath="..\fdd\fdd_mtr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\mpu98ii.h"
+					RelativePath="..\fdd\fdd_xdf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\pc9861k.h"
+					RelativePath="..\fdd\fddfile.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\pcm86io.h"
+					RelativePath="..\fdd\newdisk.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\sasiio.h"
+					RelativePath="..\fdd\sxsi.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\scsicmd.h"
+					RelativePath="..\fdd\sxsicd.h"
 					>
 				</File>
 				<File
-					RelativePath="..\cbus\scsiio.h"
+					RelativePath="..\fdd\sxsihdd.h"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="trap"
+				Name="font"
 				>
 				<File
-					RelativePath="..\trap\inttrap.h"
+					RelativePath="..\font\font.h"
 					>
 				</File>
 				<File
-					RelativePath="..\trap\steptrap.h"
+					RelativePath="..\font\fontdata.h"
+					>
+				</File>
+				<File
+					RelativePath="..\font\fontmake.h"
 					>
 				</File>
 			</Filter>
@@ -2439,42 +2401,58 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="font"
+				Name="i286c"
 				>
 				<File
-					RelativePath="..\font\font.h"
+					RelativePath="..\i286c\cpucore.h"
 					>
 				</File>
 				<File
-					RelativePath="..\font\fontdata.h"
+					RelativePath="..\i286c\i286c.h"
 					>
 				</File>
 				<File
-					RelativePath="..\font\fontmake.h"
+					RelativePath="..\i286c\memory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\i286c\v30patch.h"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="bios"
+				Name="i286x"
 				>
 				<File
-					RelativePath="..\bios\bios.h"
+					RelativePath="..\i286x\cpucore.h"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\biosmem.h"
+					RelativePath="..\i286x\i286x.h"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\fdfmt.h"
+					RelativePath="..\i286x\i286xadr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\rsbios.h"
+					RelativePath="..\i286x\i286xcts.h"
 					>
 				</File>
 				<File
-					RelativePath="..\bios\sxsibios.h"
+					RelativePath="..\i286x\i286xrep.h"
+					>
+				</File>
+				<File
+					RelativePath="..\i286x\i286xs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\i286x\memory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\i286x\v30patch.h"
 					>
 				</File>
 			</Filter>
@@ -2595,6 +2573,50 @@
 				</File>
 			</Filter>
 			<Filter
+				Name="lio"
+				>
+				<File
+					RelativePath="..\lio\lio.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="mem"
+				>
+				<File
+					RelativePath="..\mem\dmav30.h"
+					>
+				</File>
+				<File
+					RelativePath="..\mem\dmax86.h"
+					>
+				</File>
+				<File
+					RelativePath="..\mem\memegc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\mem\memems.h"
+					>
+				</File>
+				<File
+					RelativePath="..\mem\memepp.h"
+					>
+				</File>
+				<File
+					RelativePath="..\mem\memtram.h"
+					>
+				</File>
+				<File
+					RelativePath="..\mem\memvga.h"
+					>
+				</File>
+				<File
+					RelativePath="..\mem\memvram.h"
+					>
+				</File>
+			</Filter>
+			<Filter
 				Name="sound"
 				>
 				<File
@@ -2618,77 +2640,137 @@
 					>
 				</File>
 				<File
-					RelativePath="..\sound\opngen.h"
+					RelativePath="..\sound\opngen.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sound\pcm86.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sound\psggen.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sound\rhythm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sound\s98.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sound\sndcsec.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sound\sound.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sound\soundrom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sound\tms3631.h"
+					>
+				</File>
+				<Filter
+					Name="getsnd"
+					>
+					<File
+						RelativePath="..\sound\getsnd\getsnd.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="vermouth"
+					>
+					<File
+						RelativePath="..\sound\vermouth\midimod.h"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\midinst.h"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\midiout.h"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\midtable.h"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\midvoice.h"
+						>
+					</File>
+					<File
+						RelativePath="..\sound\vermouth\vermouth.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="trap"
+				>
+				<File
+					RelativePath="..\trap\inttrap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\trap\steptrap.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="vram"
+				>
+				<File
+					RelativePath="..\vram\dispsync.h"
+					>
+				</File>
+				<File
+					RelativePath="..\vram\makegrex.h"
+					>
+				</File>
+				<File
+					RelativePath="..\vram\makegrph.h"
 					>
 				</File>
 				<File
-					RelativePath="..\sound\pcm86.h"
+					RelativePath="..\vram\maketext.h"
 					>
 				</File>
 				<File
-					RelativePath="..\sound\psggen.h"
+					RelativePath="..\vram\maketgrp.h"
 					>
 				</File>
 				<File
-					RelativePath="..\sound\rhythm.h"
+					RelativePath="..\vram\palettes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\sound\s98.h"
+					RelativePath="..\vram\scrnbmp.h"
 					>
 				</File>
 				<File
-					RelativePath="..\sound\sndcsec.h"
+					RelativePath="..\vram\scrndraw.h"
 					>
 				</File>
 				<File
-					RelativePath="..\sound\sound.h"
+					RelativePath="..\vram\scrnsave.h"
 					>
 				</File>
 				<File
-					RelativePath="..\sound\soundrom.h"
+					RelativePath="..\vram\sdraw.h"
 					>
 				</File>
 				<File
-					RelativePath="..\sound\tms3631.h"
+					RelativePath="..\vram\vram.h"
 					>
 				</File>
-				<Filter
-					Name="vermouth"
-					>
-					<File
-						RelativePath="..\sound\vermouth\midimod.h"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\vermouth\midinst.h"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\vermouth\midiout.h"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\vermouth\midtable.h"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\vermouth\midvoice.h"
-						>
-					</File>
-					<File
-						RelativePath="..\sound\vermouth\vermouth.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="getsnd"
-					>
-					<File
-						RelativePath="..\sound\getsnd\getsnd.h"
-						>
-					</File>
-				</Filter>
 			</Filter>
 			<Filter
 				Name="win9x"
@@ -2838,6 +2920,22 @@
 					>
 				</File>
 				<Filter
+					Name="dialog"
+					>
+					<File
+						RelativePath=".\dialog\dialog.h"
+						>
+					</File>
+					<File
+						RelativePath=".\dialog\dialogs.h"
+						>
+					</File>
+					<File
+						RelativePath=".\dialog\np2class.h"
+						>
+					</File>
+				</Filter>
+				<Filter
 					Name="debuguty"
 					>
 					<File
@@ -2878,211 +2976,47 @@
 					</File>
 				</Filter>
 				<Filter
-					Name="dialog"
+					Name="x86"
 					>
 					<File
-						RelativePath=".\dialog\dialog.h"
-						>
-					</File>
-					<File
-						RelativePath=".\dialog\dialogs.h"
-						>
-					</File>
-					<File
-						RelativePath=".\dialog\np2class.h"
+						RelativePath=".\x86\cputype.h"
 						>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
-				Name="lio"
-				>
-				<File
-					RelativePath="..\lio\lio.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="fdd"
-				>
-				<File
-					RelativePath="..\fdd\d88head.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\diskdrv.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\fdd_d88.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\fdd_mtr.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\fdd_xdf.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\fddfile.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\newdisk.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\sxsi.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\sxsicd.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fdd\sxsihdd.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="i286x"
-				>
-				<File
-					RelativePath="..\i286x\cpucore.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286x\i286x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286x\i286xadr.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286x\i286xcts.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286x\i286xrep.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286x\i286xs.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286x\memory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286x\v30patch.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="vram"
-				>
-				<File
-					RelativePath="..\vram\dispsync.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\makegrex.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\makegrph.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\maketext.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\maketgrp.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\palettes.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\scrnbmp.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\scrndraw.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\scrnsave.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\sdraw.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vram\vram.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="i286c"
-				>
-				<File
-					RelativePath="..\i286c\cpucore.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286c\i286c.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286c\memory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\i286c\v30patch.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="mem"
+				Name="zlib"
 				>
 				<File
-					RelativePath="..\mem\dmav30.h"
+					RelativePath="..\zlib\crc32.h"
 					>
 				</File>
 				<File
-					RelativePath="..\mem\dmax86.h"
+					RelativePath="..\zlib\inffast.h"
 					>
 				</File>
 				<File
-					RelativePath="..\mem\memegc.h"
+					RelativePath="..\zlib\inffixed.h"
 					>
 				</File>
 				<File
-					RelativePath="..\mem\memems.h"
+					RelativePath="..\zlib\inflate.h"
 					>
 				</File>
 				<File
-					RelativePath="..\mem\memepp.h"
+					RelativePath="..\zlib\inftrees.h"
 					>
 				</File>
 				<File
-					RelativePath="..\mem\memtram.h"
+					RelativePath="..\zlib\zconf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\mem\memvga.h"
+					RelativePath="..\zlib\zlib.h"
 					>
 				</File>
 				<File
-					RelativePath="..\mem\memvram.h"
+					RelativePath="..\zlib\zutil.h"
 					>
 				</File>
 			</Filter>