diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
index 667bb89342..54aa462686 100644
--- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
+++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
@@ -686,14 +686,6 @@
 					RelativePath="..\..\x86\BaseblockEx.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\ps2\BiosTools.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\ps2\BiosTools.h"
-					>
-				</File>
 				<File
 					RelativePath="..\..\ps2\CoreEmuThread.cpp"
 					>
@@ -702,25 +694,9 @@
 					RelativePath="..\..\ps2\CoreEmuThread.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\MemoryCard.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\MemoryCard.h"
-					>
-				</File>
 				<Filter
 					Name="EmotionEngine"
 					>
-					<File
-						RelativePath="..\..\COP0.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\COP2.cpp"
-						>
-					</File>
 					<File
 						RelativePath="..\..\Counters.cpp"
 						>
@@ -737,246 +713,6 @@
 						RelativePath="..\..\Counters.h"
 						>
 					</File>
-					<File
-						RelativePath="..\..\EEregs.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\FPU.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\Interpreter.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\MMI.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\R5900.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\R5900.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\R5900Exceptions.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\R5900OpcodeImpl.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\R5900OpcodeTables.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\R5900OpcodeTables.h"
-						>
-					</File>
-					<Filter
-						Name="Dynarec"
-						>
-						<File
-							RelativePath="..\..\x86\iCOP0.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iCOP0.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iCOP2.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iCore.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iCore.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iFPU.cpp"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AssemblerOutput="0"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Devel|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AssemblerOutput="0"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AssemblerOutput="0"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\x86\iFPU.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iFPUd.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iMMI.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iMMI.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900Arit.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900AritImm.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900Branch.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900Jump.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900LoadStore.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900Misc.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900Move.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900MultDiv.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\iR5900Shift.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\x86\ir5900tables.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\VUmicroMem.cpp"
-							>
-						</File>
-						<Filter
-							Name="ix86-32"
-							>
-							<File
-								RelativePath="..\..\x86\ix86-32\iCore-32.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900-32.cpp"
-								>
-								<FileConfiguration
-									Name="Devel|Win32"
-									>
-									<Tool
-										Name="VCCLCompilerTool"
-										AssemblerOutput="4"
-									/>
-								</FileConfiguration>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900Arit.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900AritImm.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900Branch.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900Jump.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900LoadStore.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900Move.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900MultDiv.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900Shift.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\x86\ix86-32\iR5900Templates.cpp"
-								>
-							</File>
-						</Filter>
-						<Filter
-							Name="Interpreter"
-							>
-							<File
-								RelativePath="..\..\VU0microInterp.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\VU1microInterp.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\VUflags.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\VUflags.h"
-								>
-							</File>
-							<File
-								RelativePath="..\..\VUops.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\..\VUops.h"
-								>
-							</File>
-						</Filter>
-					</Filter>
 					<Filter
 						Name="Hardware"
 						>
@@ -1000,14 +736,6 @@
 							RelativePath="..\..\HwWrite.cpp"
 							>
 						</File>
-						<File
-							RelativePath="..\..\SPR.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\SPR.h"
-							>
-						</File>
 					</Filter>
 					<Filter
 						Name="Memory"
@@ -1042,40 +770,12 @@
 						</File>
 					</Filter>
 					<Filter
-						Name="VUmicro"
+						Name="VU"
 						>
 						<File
 							RelativePath="..\..\VU.h"
 							>
 						</File>
-						<File
-							RelativePath="..\..\VU0.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\VU0micro.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\VU0microInterp.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\VU1micro.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\VU1microInterp.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\VUflags.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\VUflags.h"
-							>
-						</File>
 						<File
 							RelativePath="..\..\VUmicro.h"
 							>
@@ -1084,14 +784,6 @@
 							RelativePath="..\..\VUmicroMem.cpp"
 							>
 						</File>
-						<File
-							RelativePath="..\..\VUops.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\..\VUops.h"
-							>
-						</File>
 						<Filter
 							Name="Dynarec"
 							>
@@ -1200,6 +892,46 @@
 								</File>
 							</Filter>
 						</Filter>
+						<Filter
+							Name="Interpreter"
+							>
+							<File
+								RelativePath="..\..\VU0.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\VU0micro.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\VU0microInterp.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\VU1micro.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\VU1microInterp.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\VUflags.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\VUflags.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\VUops.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\VUops.h"
+								>
+							</File>
+						</Filter>
 					</Filter>
 					<Filter
 						Name="DMAC"
@@ -1256,6 +988,238 @@
 								</File>
 							</Filter>
 						</Filter>
+						<Filter
+							Name="SPR"
+							>
+							<File
+								RelativePath="..\..\SPR.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\SPR.h"
+								>
+							</File>
+						</Filter>
+					</Filter>
+					<Filter
+						Name="EE"
+						>
+						<File
+							RelativePath="..\..\R5900.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\R5900Exceptions.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\R5900OpcodeTables.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\R5900OpcodeTables.h"
+							>
+						</File>
+						<Filter
+							Name="Dynarec"
+							>
+							<File
+								RelativePath="..\..\x86\iCOP0.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iCOP0.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iCOP2.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iCore.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iCore.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iFPU.cpp"
+								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										AssemblerOutput="0"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Devel|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										AssemblerOutput="0"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										AssemblerOutput="0"
+									/>
+								</FileConfiguration>
+							</File>
+							<File
+								RelativePath="..\..\x86\iFPU.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iFPUd.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iMMI.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iMMI.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900Arit.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900AritImm.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900Branch.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900Jump.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900LoadStore.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900Misc.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900Move.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900MultDiv.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\iR5900Shift.h"
+								>
+							</File>
+							<File
+								RelativePath="..\..\x86\ir5900tables.cpp"
+								>
+							</File>
+							<Filter
+								Name="ix86-32"
+								>
+								<File
+									RelativePath="..\..\x86\ix86-32\iCore-32.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900-32.cpp"
+									>
+									<FileConfiguration
+										Name="Devel|Win32"
+										>
+										<Tool
+											Name="VCCLCompilerTool"
+											AssemblerOutput="4"
+										/>
+									</FileConfiguration>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900Arit.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900AritImm.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900Branch.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900Jump.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900LoadStore.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900Move.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900MultDiv.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900Shift.cpp"
+									>
+								</File>
+								<File
+									RelativePath="..\..\x86\ix86-32\iR5900Templates.cpp"
+									>
+								</File>
+							</Filter>
+						</Filter>
+						<Filter
+							Name="Interpretter"
+							>
+							<File
+								RelativePath="..\..\COP0.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\COP2.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\FPU.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\Interpreter.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\MMI.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\R5900.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\..\R5900OpcodeImpl.cpp"
+								>
+							</File>
+						</Filter>
 					</Filter>
 				</Filter>
 				<Filter
@@ -1545,373 +1509,397 @@
 						RelativePath="..\..\DebugTools\DisVUops.h"
 						>
 					</File>
+					<Filter
+						Name="rdebug"
+						>
+						<File
+							RelativePath="..\..\rdebug\deci2.cpp"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2.h"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_dbgp.cpp"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_dbgp.h"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_dcmp.cpp"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_dcmp.h"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_drfp.h"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_iloadp.cpp"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_iloadp.h"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_netmp.cpp"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_netmp.h"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_ttyp.cpp"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath="..\..\rdebug\deci2_ttyp.h"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Devel|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								ExcludedFromBuild="true"
+								>
+								<Tool
+									Name="VCCustomBuildTool"
+								/>
+							</FileConfiguration>
+						</File>
+					</Filter>
 				</Filter>
 				<Filter
-					Name="rdebug"
+					Name="MemoryCard"
 					>
 					<File
-						RelativePath="..\..\rdebug\deci2.cpp"
+						RelativePath="..\..\MemoryCard.cpp"
 						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\rdebug\deci2.h"
+						RelativePath="..\..\MemoryCard.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="BIOS"
+					>
+					<File
+						RelativePath="..\..\ps2\BiosTools.cpp"
 						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\rdebug\deci2_dbgp.cpp"
+						RelativePath="..\..\ps2\BiosTools.h"
 						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_dbgp.h"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_dcmp.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_dcmp.h"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_drfp.h"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_iloadp.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_iloadp.h"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_netmp.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_netmp.h"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_ttyp.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\rdebug\deci2_ttyp.h"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Devel|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-							/>
-						</FileConfiguration>
 					</File>
 				</Filter>
 			</Filter>