diff --git a/vc8/archive.bat b/vc/archive.bat
similarity index 100%
rename from vc8/archive.bat
rename to vc/archive.bat
diff --git a/vc8/deploy.bat b/vc/deploy.bat
similarity index 100%
rename from vc8/deploy.bat
rename to vc/deploy.bat
diff --git a/vc8/lua/lua5.1.lib b/vc/lua/lua5.1.lib
similarity index 100%
rename from vc8/lua/lua5.1.lib
rename to vc/lua/lua5.1.lib
diff --git a/vc8/pscp.exe b/vc/pscp.exe
similarity index 100%
rename from vc8/pscp.exe
rename to vc/pscp.exe
diff --git a/vc8/upload.bat b/vc/upload.bat
similarity index 100%
rename from vc8/upload.bat
rename to vc/upload.bat
diff --git a/vc8/upx.exe b/vc/upx.exe
similarity index 100%
rename from vc8/upx.exe
rename to vc/upx.exe
diff --git a/vc8/fceux.sln b/vc/vc8_fceux.sln
similarity index 86%
rename from vc8/fceux.sln
rename to vc/vc8_fceux.sln
index 2578d460..9802e9d6 100644
--- a/vc8/fceux.sln
+++ b/vc/vc8_fceux.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fceux", "fceux.vcproj", "{6893EF44-FEA3-46DF-B236-C4C200F54294}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fceux", "vc8_fceux.vcproj", "{6893EF44-FEA3-46DF-B236-C4C200F54294}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/vc8/fceux.vcproj b/vc/vc8_fceux.vcproj
similarity index 94%
rename from vc8/fceux.vcproj
rename to vc/vc8_fceux.vcproj
index a83bf387..8910cc3f 100644
--- a/vc8/fceux.vcproj
+++ b/vc/vc8_fceux.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="vc8_bin_$(ConfigurationName)"
+			IntermediateDirectory="vc8_obj_$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
 			>
@@ -103,92 +103,10 @@
 				CommandLine="xcopy /y /d &quot;$(ProjectDir)\..\src\drivers\win\7z.dll&quot; &quot;$(OutDir)&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="dxguid.lib winmm.lib dinput.lib ws2_32.lib ddraw.lib dsound.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				EntryPointSymbol="mainCRTStartup"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\output"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="vc8_obj_$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
@@ -271,6 +189,88 @@
 				CommandLine="xcopy /y /d &quot;$(ProjectDir)\..\src\drivers\win\7z.dll&quot; &quot;$(OutDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="false"
+				ForceConformanceInForLoopScope="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="dxguid.lib winmm.lib dinput.lib ws2_32.lib ddraw.lib dsound.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				EntryPointSymbol="mainCRTStartup"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
@@ -714,7 +714,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -723,7 +723,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -873,7 +873,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -882,7 +882,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -999,7 +999,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1008,7 +1008,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1119,7 +1119,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1128,7 +1128,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2260,15 +2260,6 @@
 						CompileAs="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -2279,6 +2270,15 @@
 						CompileAs="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -2338,7 +2338,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2347,7 +2347,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2517,7 +2517,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|x64"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -2526,7 +2526,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
diff --git a/vc9/fceux.sln b/vc/vc9_fceux.sln
similarity index 86%
rename from vc9/fceux.sln
rename to vc/vc9_fceux.sln
index 92da9b2c..7be2907a 100644
--- a/vc9/fceux.sln
+++ b/vc/vc9_fceux.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fceux", "fceux.vcproj", "{6893EF44-FEA3-46DF-B236-C4C200F54294}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fceux", "vc9_fceux.vcproj", "{6893EF44-FEA3-46DF-B236-C4C200F54294}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/vc9/fceux.vcproj b/vc/vc9_fceux.vcproj
similarity index 94%
rename from vc9/fceux.vcproj
rename to vc/vc9_fceux.vcproj
index 25dcc264..1190e120 100644
--- a/vc9/fceux.vcproj
+++ b/vc/vc9_fceux.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="fceux"
 	ProjectGUID="{6893EF44-FEA3-46DF-B236-C4C200F54294}"
 	RootNamespace="fceux"
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="vc9_bin_$(ConfigurationName)"
+			IntermediateDirectory="vc9_obj_$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
 			>
@@ -106,7 +106,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\output"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="vc9_obj_$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
diff --git a/vc8/zip.exe b/vc/zip.exe
similarity index 100%
rename from vc8/zip.exe
rename to vc/zip.exe
diff --git a/vc8/.gitignore b/vc8/.gitignore
deleted file mode 100644
index 674deb69..00000000
--- a/vc8/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# A simulation of Subversion default ignores, generated by reposurgeon.
-*.o
-*.lo
-*.la
-*.al
-*.libs
-*.so
-*.so.[0-9]*
-*.a
-*.pyc
-*.pyo
-*.rej
-*~
-*.#*
-.*.swp
-.DS_store
-# Simulated Subversion default ignores end here
diff --git a/vc9/archive.bat b/vc9/archive.bat
deleted file mode 100644
index 5e2728ab..00000000
--- a/vc9/archive.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-del /s fceux.zip
-copy ..\output\fceux.exe .
-upx ..\output\fceux.exe
-cd ..\output
-..\vc8\zip -X -9 -r ..\vc8\fceux.zip fceux.exe fceux.chm 7z.dll palettes
-move /y ..\vc8\fceux.exe .
-copy /y luapack\luapack.zip ..\vc8\
-..\vc8\zip -X -9 -r ..\vc8\luapack.zip auxlib.lua
-cd ..\documentation
-..\vc8\zip -X -9 -r ..\vc8\luapack.zip examplelua
-cd ..\vc8
\ No newline at end of file
diff --git a/vc9/deploy.bat b/vc9/deploy.bat
deleted file mode 100644
index 96175153..00000000
--- a/vc9/deploy.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call archive.bat
-call upload.bat %1
\ No newline at end of file
diff --git a/vc9/lua/lua5.1.lib b/vc9/lua/lua5.1.lib
deleted file mode 100644
index 3f20493e..00000000
Binary files a/vc9/lua/lua5.1.lib and /dev/null differ
diff --git a/vc9/pscp.exe b/vc9/pscp.exe
deleted file mode 100644
index 10a70f3b..00000000
Binary files a/vc9/pscp.exe and /dev/null differ
diff --git a/vc9/upload.bat b/vc9/upload.bat
deleted file mode 100644
index f8d69cb8..00000000
--- a/vc9/upload.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-pscp -pw %1 fceux.zip fceux@www.pi-r-squared.com:web/zip/fceux.zip
-pscp -pw %1 luapack.zip fceux@www.pi-r-squared.com:web/luapack/luapack.zip
\ No newline at end of file
diff --git a/vc9/upx.exe b/vc9/upx.exe
deleted file mode 100644
index 6266213c..00000000
Binary files a/vc9/upx.exe and /dev/null differ
diff --git a/vc9/zip.exe b/vc9/zip.exe
deleted file mode 100644
index a00a81c4..00000000
Binary files a/vc9/zip.exe and /dev/null differ