diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 9f230297f0..1b8cbc63ee 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -60,7 +60,7 @@ IntDir=.\../Release6
 TargetDir=\temp\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                     	cl                                      /Zl                                      /nologo                                      /c                                      verstub.cpp                                      /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                       	cl                                        /Zl                                        /nologo                                        /c                                        verstub.cpp                                        /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -95,7 +95,7 @@ IntDir=.\../Debug6
 TargetDir=\temp\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                     	cl                                      /Zl                                      /nologo                                      /c                                      verstub.cpp                                      /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                       	cl                                        /Zl                                        /nologo                                        /c                                        verstub.cpp                                        /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -542,29 +542,12 @@ SOURCE=.\MsdFile.cpp
 SOURCE=.\MsdFile.h
 # End Source File
 # End Group
-# Begin Group "System"
+# Begin Group "StepMania"
 
 # PROP Default_Filter ""
 # Begin Group "arch"
 
 # PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\arch\arch.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\arch\arch.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\arch\arch_default.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\arch\arch_Win32.h
-# End Source File
-# End Group
 # Begin Group "LoadingWindow"
 
 # PROP Default_Filter ""
@@ -621,12 +604,73 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound_Software.cpp
 SOURCE=.\arch\Sound\RageSoundDriver_DSound_Software.h
 # End Source File
 # End Group
+# Begin Group "ErrorDialog"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\arch\ErrorDialog\ErrorDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\ErrorDialog\ErrorDialog_stdout.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\ErrorDialog\ErrorDialog_stdout.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\ErrorDialog\ErrorDialog_Win32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\ErrorDialog\ErrorDialog_Win32.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\arch\arch.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\arch.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\arch_default.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\arch_Win32.h
+# End Source File
+# End Group
+# Begin Group "system"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\archutils\Win32\AppInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\archutils\Win32\AppInstance.h
+# End Source File
 # Begin Source File
 
 SOURCE=.\resource.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\StepMania.ICO
+# End Source File
+# Begin Source File
+
+SOURCE=.\StepMania.RC
+# End Source File
+# End Group
+# Begin Source File
+
 SOURCE=.\ScreenDimensions.h
 # End Source File
 # Begin Source File
@@ -658,18 +702,6 @@ SOURCE=.\StepMania.cpp
 
 SOURCE=.\StepMania.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\StepMania.ICO
-# End Source File
-# Begin Source File
-
-SOURCE=.\StepMania.RC
-# End Source File
-# Begin Source File
-
-SOURCE=.\StepMania.xpm
-# End Source File
 # End Group
 # Begin Group "Transitions"
 
@@ -1636,5 +1668,9 @@ SOURCE=.\error.bmp
 
 SOURCE=.\error2.bmp
 # End Source File
+# Begin Source File
+
+SOURCE=.\StepMania.xpm
+# End Source File
 # End Target
 # End Project
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index e8f5446e36..fe05dbbde1 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -569,7 +569,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			</File>
 		</Filter>
 		<Filter
-			Name="System"
+			Name="StepMania"
 			Filter="">
 			<File
 				RelativePath=".\StdAfx.cpp">
@@ -580,21 +580,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="StdString.h">
 			</File>
-			<File
-				RelativePath=".\StepMania.ICO">
-			</File>
-			<File
-				RelativePath=".\StepMania.RC">
-			</File>
 			<File
 				RelativePath=".\StepMania.cpp">
 			</File>
 			<File
 				RelativePath=".\StepMania.h">
 			</File>
-			<File
-				RelativePath=".\resource.h">
-			</File>
 			<Filter
 				Name="arch"
 				Filter="">
@@ -610,49 +601,87 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				<File
 					RelativePath="arch\arch_default.h">
 				</File>
+				<Filter
+					Name="LoadingWindow"
+					Filter="">
+					<File
+						RelativePath="arch\LoadingWindow\LoadingWindow.h">
+					</File>
+					<File
+						RelativePath="arch\LoadingWindow\LoadingWindow_SDL.cpp">
+					</File>
+					<File
+						RelativePath="arch\LoadingWindow\LoadingWindow_SDL.h">
+					</File>
+					<File
+						RelativePath="arch\LoadingWindow\LoadingWindow_Win32.cpp">
+					</File>
+					<File
+						RelativePath="arch\LoadingWindow\LoadingWindow_Win32.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="ErrorDialog"
+					Filter="">
+					<File
+						RelativePath="arch\ErrorDialog\ErrorDialog.h">
+					</File>
+					<File
+						RelativePath="arch\ErrorDialog\ErrorDialog_Win32.cpp">
+					</File>
+					<File
+						RelativePath="arch\ErrorDialog\ErrorDialog_Win32.h">
+					</File>
+					<File
+						RelativePath="arch\ErrorDialog\ErrorDialog_stdout.cpp">
+					</File>
+					<File
+						RelativePath="arch\ErrorDialog\ErrorDialog_stdout.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.h">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_DSound.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_DSound.h">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_DSound_Software.cpp">
+					</File>
+					<File
+						RelativePath="arch\Sound\RageSoundDriver_DSound_Software.h">
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
-				Name="LoadingWindow"
+				Name="system"
 				Filter="">
 				<File
-					RelativePath="arch\LoadingWindow\LoadingWindow.h">
+					RelativePath="archutils\Win32\AppInstance.cpp">
 				</File>
 				<File
-					RelativePath="arch\LoadingWindow\LoadingWindow_SDL.cpp">
+					RelativePath="archutils\Win32\AppInstance.h">
 				</File>
 				<File
-					RelativePath="arch\LoadingWindow\LoadingWindow_SDL.h">
+					RelativePath=".\StepMania.ICO">
 				</File>
 				<File
-					RelativePath="arch\LoadingWindow\LoadingWindow_Win32.cpp">
+					RelativePath=".\StepMania.RC">
 				</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.h">
-				</File>
-				<File
-					RelativePath="arch\Sound\RageSoundDriver_DSound.cpp">
-				</File>
-				<File
-					RelativePath="arch\Sound\RageSoundDriver_DSound.h">
-				</File>
-				<File
-					RelativePath="arch\Sound\RageSoundDriver_DSound_Software.cpp">
-				</File>
-				<File
-					RelativePath="arch\Sound\RageSoundDriver_DSound_Software.h">
+					RelativePath=".\resource.h">
 				</File>
 			</Filter>
 		</Filter>