diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj
index 9714441ade..ac31e440c7 100644
--- a/stepmania/src/StepMania-net2003.vcproj
+++ b/stepmania/src/StepMania-net2003.vcproj
@@ -1248,499 +1248,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath=".\XmlFileUtil.h">
 			</File>
-			<Filter
-				Name="StepMania"
-				Filter="">
-				<File
-					RelativePath=".\ExportStrings.cpp">
-				</File>
-				<File
-					RelativePath=".\ExportStrings.h">
-				</File>
-				<File
-					RelativePath=".\GameLoop.cpp">
-				</File>
-				<File
-					RelativePath=".\GameLoop.h">
-				</File>
-				<File
-					RelativePath=".\global.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="FastDebug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\global.h">
-				</File>
-				<File
-					RelativePath="ProductInfo.h">
-				</File>
-				<File
-					RelativePath=".\SpecialFiles.cpp">
-				</File>
-				<File
-					RelativePath=".\SpecialFiles.h">
-				</File>
-				<File
-					RelativePath="StdString.h">
-				</File>
-				<File
-					RelativePath=".\StepMania.cpp">
-				</File>
-				<File
-					RelativePath=".\StepMania.h">
-				</File>
-				<Filter
-					Name="arch"
-					Filter="">
-					<File
-						RelativePath="arch\arch.h">
-					</File>
-					<File
-						RelativePath="arch\arch_default.h">
-					</File>
-					<File
-						RelativePath="arch\arch_platform.h">
-					</File>
-					<File
-						RelativePath=".\arch\RageDriver.cpp">
-					</File>
-					<File
-						RelativePath=".\arch\RageDriver.h">
-					</File>
-					<Filter
-						Name="LoadingWindow"
-						Filter="">
-						<File
-							RelativePath=".\arch\LoadingWindow\LoadingWindow.cpp">
-						</File>
-						<File
-							RelativePath="arch\LoadingWindow\LoadingWindow.h">
-						</File>
-						<File
-							RelativePath="arch\LoadingWindow\LoadingWindow_Win32.cpp">
-						</File>
-						<File
-							RelativePath="arch\LoadingWindow\LoadingWindow_Win32.h">
-						</File>
-					</Filter>
-					<Filter
-						Name="Sound"
-						Filter="">
-						<File
-							RelativePath="arch\Sound\DSoundHelpers.cpp">
-						</File>
-						<File
-							RelativePath="arch\Sound\DSoundHelpers.h">
-						</File>
-						<File
-							RelativePath=".\arch\Sound\RageSoundDriver.cpp">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver.h">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_DSound_Software.cpp">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_DSound_Software.h">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_Generic_Software.cpp">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_Generic_Software.h">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_Null.cpp">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_Null.h">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_WaveOut.cpp">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_WaveOut.h">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_WDMKS.cpp">
-						</File>
-						<File
-							RelativePath="arch\Sound\RageSoundDriver_WDMKS.h">
-						</File>
-					</Filter>
-					<Filter
-						Name="ArchHooks"
-						Filter="">
-						<File
-							RelativePath="arch\ArchHooks\ArchHooks.cpp">
-						</File>
-						<File
-							RelativePath="arch\ArchHooks\ArchHooks.h">
-						</File>
-						<File
-							RelativePath="arch\ArchHooks\ArchHooks_Win32.cpp">
-						</File>
-						<File
-							RelativePath="arch\ArchHooks\ArchHooks_Win32.h">
-						</File>
-						<File
-							RelativePath=".\arch\ArchHooks\ArchHooks_Win32Static.cpp">
-						</File>
-						<File
-							RelativePath=".\arch\ArchHooks\ArchHooksUtil.cpp">
-						</File>
-					</Filter>
-					<Filter
-						Name="InputHandler"
-						Filter="">
-						<File
-							RelativePath="arch\InputHandler\InputHandler.cpp">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler.h">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_DirectInput.cpp">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_DirectInput.h">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_DirectInputHelper.cpp">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_DirectInputHelper.h">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_MonkeyKeyboard.cpp">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_MonkeyKeyboard.h">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_Win32_MIDI.cpp">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_Win32_MIDI.h">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_Win32_Para.cpp">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_Win32_Para.h">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_Win32_Pump.cpp">
-						</File>
-						<File
-							RelativePath="arch\InputHandler\InputHandler_Win32_Pump.h">
-						</File>
-					</Filter>
-					<Filter
-						Name="MovieTexture"
-						Filter="">
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture.cpp">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture.h">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture_DShow.cpp">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture_DShow.h">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture_DShowHelper.cpp">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture_DShowHelper.h">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture_FFMpeg.cpp">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture_FFMpeg.h">
-						</File>
-						<File
-							RelativePath=".\arch\MovieTexture\MovieTexture_Generic.cpp">
-						</File>
-						<File
-							RelativePath=".\arch\MovieTexture\MovieTexture_Generic.h">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture_Null.cpp">
-						</File>
-						<File
-							RelativePath="arch\MovieTexture\MovieTexture_Null.h">
-						</File>
-						<File
-							RelativePath=".\arch\MovieTexture\MovieTexture_Theora.cpp">
-						</File>
-						<File
-							RelativePath=".\arch\MovieTexture\MovieTexture_Theora.h">
-						</File>
-					</Filter>
-					<Filter
-						Name="LowLevelWindow"
-						Filter="">
-						<File
-							RelativePath=".\arch\LowLevelWindow\LowLevelWindow.cpp">
-						</File>
-						<File
-							RelativePath="arch\LowLevelWindow\LowLevelWindow.h">
-						</File>
-						<File
-							RelativePath="arch\LowLevelWindow\LowLevelWindow_Win32.cpp">
-						</File>
-						<File
-							RelativePath="arch\LowLevelWindow\LowLevelWindow_Win32.h">
-						</File>
-					</Filter>
-					<Filter
-						Name="Lights"
-						Filter="">
-						<File
-							RelativePath=".\arch\Lights\LightsDriver.cpp">
-						</File>
-						<File
-							RelativePath="arch\Lights\LightsDriver.h">
-						</File>
-						<File
-							RelativePath=".\arch\Lights\LightsDriver_Export.cpp">
-						</File>
-						<File
-							RelativePath=".\arch\Lights\LightsDriver_Export.h">
-						</File>
-						<File
-							RelativePath="arch\Lights\LightsDriver_SystemMessage.cpp">
-						</File>
-						<File
-							RelativePath="arch\Lights\LightsDriver_SystemMessage.h">
-						</File>
-						<File
-							RelativePath="arch\Lights\LightsDriver_Win32Parallel.cpp">
-						</File>
-						<File
-							RelativePath="arch\Lights\LightsDriver_Win32Parallel.h">
-						</File>
-					</Filter>
-					<Filter
-						Name="MemoryCard"
-						Filter="">
-						<File
-							RelativePath="arch\MemoryCard\MemoryCardDriver.cpp">
-						</File>
-						<File
-							RelativePath="arch\MemoryCard\MemoryCardDriver.h">
-						</File>
-						<File
-							RelativePath="arch\MemoryCard\MemoryCardDriver_Null.h">
-						</File>
-						<File
-							RelativePath="arch\MemoryCard\MemoryCardDriverThreaded_Windows.cpp">
-						</File>
-						<File
-							RelativePath="arch\MemoryCard\MemoryCardDriverThreaded_Windows.h">
-						</File>
-					</Filter>
-					<Filter
-						Name="Dialog"
-						Filter="">
-						<File
-							RelativePath="arch\Dialog\Dialog.cpp">
-						</File>
-						<File
-							RelativePath="arch\Dialog\Dialog.h">
-						</File>
-						<File
-							RelativePath=".\arch\Dialog\DialogDriver.cpp">
-						</File>
-						<File
-							RelativePath="arch\Dialog\DialogDriver.h">
-						</File>
-						<File
-							RelativePath="arch\Dialog\DialogDriver_Win32.cpp">
-						</File>
-						<File
-							RelativePath="arch\Dialog\DialogDriver_Win32.h">
-						</File>
-					</Filter>
-					<Filter
-						Name="Threads"
-						Filter="">
-						<File
-							RelativePath="arch\Threads\Threads.h">
-						</File>
-						<File
-							RelativePath="arch\Threads\Threads_Win32.cpp">
-						</File>
-						<File
-							RelativePath="arch\Threads\Threads_Win32.h">
-						</File>
-					</Filter>
-				</Filter>
-				<Filter
-					Name="system"
-					Filter="">
-					<File
-						RelativePath="archutils\Win32\AppInstance.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\AppInstance.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\arch_setup.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\arch_setup.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\arch_time.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\CommandLine.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\CommandLine.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\Crash.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\Crash.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\CrashHandlerChild.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\CrashHandlerInternal.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\CrashHandlerNetworking.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\CrashHandlerNetworking.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\DebugInfoHunt.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\DebugInfoHunt.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\DialogUtil.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\DialogUtil.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\DirectXHelpers.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\DirectXHelpers.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\ErrorStrings.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\ErrorStrings.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\GetFileInformation.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\GetFileInformation.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\GotoURL.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\GotoURL.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\GraphicsWindow.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\GraphicsWindow.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\MessageWindow.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\MessageWindow.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\RegistryAccess.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\RegistryAccess.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\RestartProgram.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\RestartProgram.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\SpecialDirs.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\SpecialDirs.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\StepMania.ico">
-					</File>
-					<File
-						RelativePath="archutils\Win32\USB.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\USB.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\VideoDriverInfo.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\VideoDriverInfo.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\WindowIcon.cpp">
-					</File>
-					<File
-						RelativePath="archutils\Win32\WindowIcon.h">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\WindowsDialogBox.cpp">
-					</File>
-					<File
-						RelativePath=".\archutils\Win32\WindowsDialogBox.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\WindowsResources.h">
-					</File>
-					<File
-						RelativePath="archutils\Win32\WindowsResources.rc">
-					</File>
-				</Filter>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Actors used in Gameplay and Menus"
@@ -2402,6 +1909,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="RageSoundReader_Chain.h">
 			</File>
+			<File
+				RelativePath=".\RageSoundReader_Extend.cpp">
+			</File>
+			<File
+				RelativePath=".\RageSoundReader_Extend.h">
+			</File>
 			<File
 				RelativePath="RageSoundReader_FileReader.cpp">
 			</File>
@@ -2447,6 +1960,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath=".\RageSoundReader_SpeedChange.h">
 			</File>
+			<File
+				RelativePath=".\RageSoundReader_ThreadedBuffer.cpp">
+			</File>
+			<File
+				RelativePath=".\RageSoundReader_ThreadedBuffer.h">
+			</File>
 			<File
 				RelativePath="RageSoundReader_Vorbisfile.cpp">
 			</File>
@@ -3886,6 +3405,499 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="StepMania"
+			Filter="">
+			<File
+				RelativePath=".\ExportStrings.cpp">
+			</File>
+			<File
+				RelativePath=".\ExportStrings.h">
+			</File>
+			<File
+				RelativePath=".\GameLoop.cpp">
+			</File>
+			<File
+				RelativePath=".\GameLoop.h">
+			</File>
+			<File
+				RelativePath=".\global.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="FastDebug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\global.h">
+			</File>
+			<File
+				RelativePath="ProductInfo.h">
+			</File>
+			<File
+				RelativePath=".\SpecialFiles.cpp">
+			</File>
+			<File
+				RelativePath=".\SpecialFiles.h">
+			</File>
+			<File
+				RelativePath="StdString.h">
+			</File>
+			<File
+				RelativePath=".\StepMania.cpp">
+			</File>
+			<File
+				RelativePath=".\StepMania.h">
+			</File>
+			<Filter
+				Name="arch"
+				Filter="">
+				<File
+					RelativePath="arch\arch.h">
+				</File>
+				<File
+					RelativePath="arch\arch_default.h">
+				</File>
+				<File
+					RelativePath="arch\arch_platform.h">
+				</File>
+				<File
+					RelativePath=".\arch\RageDriver.cpp">
+				</File>
+				<File
+					RelativePath=".\arch\RageDriver.h">
+				</File>
+				<Filter
+					Name="LoadingWindow"
+					Filter="">
+					<File
+						RelativePath=".\arch\LoadingWindow\LoadingWindow.cpp">
+					</File>
+					<File
+						RelativePath="arch\LoadingWindow\LoadingWindow.h">
+					</File>
+					<File
+						RelativePath="arch\LoadingWindow\LoadingWindow_Win32.cpp">
+					</File>
+					<File
+						RelativePath="arch\LoadingWindow\LoadingWindow_Win32.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="Sound"
+					Filter="">
+					<File
+						RelativePath="arch\Sound\DSoundHelpers.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\DSoundHelpers.h">
+					</File>
+					<File
+						RelativePath=".\arch\Sound\RageSoundDriver.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver.h">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_DSound_Software.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_DSound_Software.h">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_Generic_Software.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_Generic_Software.h">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_Null.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_Null.h">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_WaveOut.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_WaveOut.h">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_WDMKS.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_WDMKS.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="ArchHooks"
+					Filter="">
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks.cpp">
+					</File>
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks.h">
+					</File>
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks_Win32.cpp">
+					</File>
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks_Win32.h">
+					</File>
+					<File
+						RelativePath=".\arch\ArchHooks\ArchHooks_Win32Static.cpp">
+					</File>
+					<File
+						RelativePath=".\arch\ArchHooks\ArchHooksUtil.cpp">
+					</File>
+				</Filter>
+				<Filter
+					Name="InputHandler"
+					Filter="">
+					<File
+						RelativePath="arch\InputHandler\InputHandler.cpp">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler.h">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_DirectInput.cpp">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_DirectInput.h">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_DirectInputHelper.cpp">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_DirectInputHelper.h">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_MonkeyKeyboard.cpp">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_MonkeyKeyboard.h">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_Win32_MIDI.cpp">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_Win32_MIDI.h">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_Win32_Para.cpp">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_Win32_Para.h">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_Win32_Pump.cpp">
+					</File>
+					<File
+						RelativePath="arch\InputHandler\InputHandler_Win32_Pump.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="MovieTexture"
+					Filter="">
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture.cpp">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture.h">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture_DShow.cpp">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture_DShow.h">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture_DShowHelper.cpp">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture_DShowHelper.h">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture_FFMpeg.cpp">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture_FFMpeg.h">
+					</File>
+					<File
+						RelativePath=".\arch\MovieTexture\MovieTexture_Generic.cpp">
+					</File>
+					<File
+						RelativePath=".\arch\MovieTexture\MovieTexture_Generic.h">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture_Null.cpp">
+					</File>
+					<File
+						RelativePath="arch\MovieTexture\MovieTexture_Null.h">
+					</File>
+					<File
+						RelativePath=".\arch\MovieTexture\MovieTexture_Theora.cpp">
+					</File>
+					<File
+						RelativePath=".\arch\MovieTexture\MovieTexture_Theora.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="LowLevelWindow"
+					Filter="">
+					<File
+						RelativePath=".\arch\LowLevelWindow\LowLevelWindow.cpp">
+					</File>
+					<File
+						RelativePath="arch\LowLevelWindow\LowLevelWindow.h">
+					</File>
+					<File
+						RelativePath="arch\LowLevelWindow\LowLevelWindow_Win32.cpp">
+					</File>
+					<File
+						RelativePath="arch\LowLevelWindow\LowLevelWindow_Win32.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="Lights"
+					Filter="">
+					<File
+						RelativePath=".\arch\Lights\LightsDriver.cpp">
+					</File>
+					<File
+						RelativePath="arch\Lights\LightsDriver.h">
+					</File>
+					<File
+						RelativePath=".\arch\Lights\LightsDriver_Export.cpp">
+					</File>
+					<File
+						RelativePath=".\arch\Lights\LightsDriver_Export.h">
+					</File>
+					<File
+						RelativePath="arch\Lights\LightsDriver_SystemMessage.cpp">
+					</File>
+					<File
+						RelativePath="arch\Lights\LightsDriver_SystemMessage.h">
+					</File>
+					<File
+						RelativePath="arch\Lights\LightsDriver_Win32Parallel.cpp">
+					</File>
+					<File
+						RelativePath="arch\Lights\LightsDriver_Win32Parallel.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="MemoryCard"
+					Filter="">
+					<File
+						RelativePath="arch\MemoryCard\MemoryCardDriver.cpp">
+					</File>
+					<File
+						RelativePath="arch\MemoryCard\MemoryCardDriver.h">
+					</File>
+					<File
+						RelativePath="arch\MemoryCard\MemoryCardDriver_Null.h">
+					</File>
+					<File
+						RelativePath="arch\MemoryCard\MemoryCardDriverThreaded_Windows.cpp">
+					</File>
+					<File
+						RelativePath="arch\MemoryCard\MemoryCardDriverThreaded_Windows.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="Dialog"
+					Filter="">
+					<File
+						RelativePath="arch\Dialog\Dialog.cpp">
+					</File>
+					<File
+						RelativePath="arch\Dialog\Dialog.h">
+					</File>
+					<File
+						RelativePath=".\arch\Dialog\DialogDriver.cpp">
+					</File>
+					<File
+						RelativePath="arch\Dialog\DialogDriver.h">
+					</File>
+					<File
+						RelativePath="arch\Dialog\DialogDriver_Win32.cpp">
+					</File>
+					<File
+						RelativePath="arch\Dialog\DialogDriver_Win32.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="Threads"
+					Filter="">
+					<File
+						RelativePath="arch\Threads\Threads.h">
+					</File>
+					<File
+						RelativePath="arch\Threads\Threads_Win32.cpp">
+					</File>
+					<File
+						RelativePath="arch\Threads\Threads_Win32.h">
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="system"
+				Filter="">
+				<File
+					RelativePath="archutils\Win32\AppInstance.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\AppInstance.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\arch_setup.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\arch_setup.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\arch_time.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\CommandLine.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\CommandLine.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\Crash.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\Crash.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\CrashHandlerChild.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\CrashHandlerInternal.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\CrashHandlerNetworking.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\CrashHandlerNetworking.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\DebugInfoHunt.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\DebugInfoHunt.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\DialogUtil.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\DialogUtil.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\DirectXHelpers.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\DirectXHelpers.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\ErrorStrings.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\ErrorStrings.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\GetFileInformation.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\GetFileInformation.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\GotoURL.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\GotoURL.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\GraphicsWindow.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\GraphicsWindow.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\MessageWindow.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\MessageWindow.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\RegistryAccess.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\RegistryAccess.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\RestartProgram.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\RestartProgram.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\SpecialDirs.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\SpecialDirs.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\StepMania.ico">
+				</File>
+				<File
+					RelativePath="archutils\Win32\USB.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\USB.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\VideoDriverInfo.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\VideoDriverInfo.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\WindowIcon.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Win32\WindowIcon.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\WindowsDialogBox.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\WindowsDialogBox.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\WindowsResources.h">
+				</File>
+				<File
+					RelativePath="archutils\Win32\WindowsResources.rc">
+				</File>
+			</Filter>
+		</Filter>
 		<File
 			RelativePath="archutils\Win32\DialogCrashHeader.bmp">
 		</File>