diff --git a/.gitignore b/.gitignore
index 47264a707..c08388f46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,5 +97,5 @@ Thumbs.db
 /Source/Project64-core/Version.h
 /Source/Project64-input/Version.h
 /Source/Project64-video/Version.h
-/Source/RSP/Version.h
+/Source/Project64-rsp/Version.h
 /Android/app/src/main/assets/assets.zip
diff --git a/Project64.sln b/Project64.sln
index 4a207ae69..16626941e 100644
--- a/Project64.sln
+++ b/Project64.sln
@@ -6,8 +6,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Source\Common\Common.vcxproj", "{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSP", "Source\RSP\RSP.vcxproj", "{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Settings", "Source\Settings\Settings.vcxproj", "{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zip", "Source\3rdParty\7zip\7zip.vcxproj", "{3326E128-33AF-422C-BB7C-67CC6B915610}"
@@ -61,6 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JoinSettings", "Source\Join
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}"
 	ProjectSection(ProjectDependencies) = postProject
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1} = {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}
 		{B685BB34-D700-4FCC-8503-9B6AA1A0C95D} = {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}
 		{D3F979CE-8FA7-48C9-A2B3-A33594B48536} = {D3F979CE-8FA7-48C9-A2B3-A33594B48536}
 	EndProjectSection
@@ -73,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SortRdb", "Source\SortRdb\S
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "Source\3rdParty\asmjit\asmjit.vcxproj", "{A72C9F08-EBB4-443D-9982-DA21AE8B367D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-rsp", "Source\Project64-rsp\Project64-rsp.vcxproj", "{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -89,14 +90,6 @@ Global
 		{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.Build.0 = Release|Win32
 		{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.ActiveCfg = Release|x64
 		{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.Build.0 = Release|x64
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.Build.0 = Debug|Win32
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.ActiveCfg = Debug|x64
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.Build.0 = Debug|x64
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.ActiveCfg = Release|Win32
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.Build.0 = Release|Win32
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|x64.ActiveCfg = Release|x64
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|x64.Build.0 = Release|x64
 		{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.Build.0 = Debug|Win32
 		{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|x64.ActiveCfg = Debug|x64
@@ -255,6 +248,14 @@ Global
 		{A72C9F08-EBB4-443D-9982-DA21AE8B367D}.Release|Win32.Build.0 = Release|Win32
 		{A72C9F08-EBB4-443D-9982-DA21AE8B367D}.Release|x64.ActiveCfg = Release|x64
 		{A72C9F08-EBB4-443D-9982-DA21AE8B367D}.Release|x64.Build.0 = Release|x64
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.Build.0 = Debug|Win32
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.ActiveCfg = Debug|x64
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.Build.0 = Debug|x64
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.ActiveCfg = Release|Win32
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.Build.0 = Release|Win32
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|x64.ActiveCfg = Release|x64
+		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source/RSP/Cpu.cpp b/Source/Project64-rsp/Cpu.cpp
similarity index 100%
rename from Source/RSP/Cpu.cpp
rename to Source/Project64-rsp/Cpu.cpp
diff --git a/Source/RSP/Cpu.h b/Source/Project64-rsp/Cpu.h
similarity index 100%
rename from Source/RSP/Cpu.h
rename to Source/Project64-rsp/Cpu.h
diff --git a/Source/RSP/Interpreter CPU.cpp b/Source/Project64-rsp/Interpreter CPU.cpp
similarity index 100%
rename from Source/RSP/Interpreter CPU.cpp
rename to Source/Project64-rsp/Interpreter CPU.cpp
diff --git a/Source/RSP/Interpreter CPU.h b/Source/Project64-rsp/Interpreter CPU.h
similarity index 100%
rename from Source/RSP/Interpreter CPU.h
rename to Source/Project64-rsp/Interpreter CPU.h
diff --git a/Source/RSP/Interpreter Ops.cpp b/Source/Project64-rsp/Interpreter Ops.cpp
similarity index 100%
rename from Source/RSP/Interpreter Ops.cpp
rename to Source/Project64-rsp/Interpreter Ops.cpp
diff --git a/Source/RSP/Interpreter Ops.h b/Source/Project64-rsp/Interpreter Ops.h
similarity index 100%
rename from Source/RSP/Interpreter Ops.h
rename to Source/Project64-rsp/Interpreter Ops.h
diff --git a/Source/RSP/Main.cpp b/Source/Project64-rsp/Main.cpp
similarity index 100%
rename from Source/RSP/Main.cpp
rename to Source/Project64-rsp/Main.cpp
diff --git a/Source/RSP/Mmx.cpp b/Source/Project64-rsp/Mmx.cpp
similarity index 100%
rename from Source/RSP/Mmx.cpp
rename to Source/Project64-rsp/Mmx.cpp
diff --git a/Source/RSP/OpCode.h b/Source/Project64-rsp/OpCode.h
similarity index 100%
rename from Source/RSP/OpCode.h
rename to Source/Project64-rsp/OpCode.h
diff --git a/Source/RSP/Profiling.cpp b/Source/Project64-rsp/Profiling.cpp
similarity index 100%
rename from Source/RSP/Profiling.cpp
rename to Source/Project64-rsp/Profiling.cpp
diff --git a/Source/RSP/Profiling.h b/Source/Project64-rsp/Profiling.h
similarity index 100%
rename from Source/RSP/Profiling.h
rename to Source/Project64-rsp/Profiling.h
diff --git a/Source/RSP/RSP.vcxproj.filters b/Source/Project64-rsp/Project64-rsp.filters
similarity index 100%
rename from Source/RSP/RSP.vcxproj.filters
rename to Source/Project64-rsp/Project64-rsp.filters
diff --git a/Source/RSP/RSP.rc b/Source/Project64-rsp/Project64-rsp.rc
similarity index 100%
rename from Source/RSP/RSP.rc
rename to Source/Project64-rsp/Project64-rsp.rc
diff --git a/Source/RSP/RSP.vcxproj b/Source/Project64-rsp/Project64-rsp.vcxproj
similarity index 95%
rename from Source/RSP/RSP.vcxproj
rename to Source/Project64-rsp/Project64-rsp.vcxproj
index fe69bbabe..aac23202a 100644
--- a/Source/RSP/RSP.vcxproj
+++ b/Source/Project64-rsp/Project64-rsp.vcxproj
@@ -42,7 +42,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <PreBuildEvent>
-      <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\RSP\Version.h.in" "$(SolutionDir)Source\RSP\Version.h"</Command>
+      <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-rsp\Version.h.in" "$(SolutionDir)Source\Project64-rsp\Version.h"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -85,9 +85,6 @@
     <ClInclude Include="Version.h" />
     <ClInclude Include="X86.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="RSP.rc" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.vcxproj">
       <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
@@ -99,4 +96,7 @@
       <Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Project64-rsp.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/RSP/RSP Command.cpp b/Source/Project64-rsp/RSP Command.cpp
similarity index 100%
rename from Source/RSP/RSP Command.cpp
rename to Source/Project64-rsp/RSP Command.cpp
diff --git a/Source/RSP/RSP Command.h b/Source/Project64-rsp/RSP Command.h
similarity index 100%
rename from Source/RSP/RSP Command.h
rename to Source/Project64-rsp/RSP Command.h
diff --git a/Source/RSP/RSP Register.cpp b/Source/Project64-rsp/RSP Register.cpp
similarity index 100%
rename from Source/RSP/RSP Register.cpp
rename to Source/Project64-rsp/RSP Register.cpp
diff --git a/Source/RSP/RSP Registers.h b/Source/Project64-rsp/RSP Registers.h
similarity index 100%
rename from Source/RSP/RSP Registers.h
rename to Source/Project64-rsp/RSP Registers.h
diff --git a/Source/RSP/Recompiler Analysis.cpp b/Source/Project64-rsp/Recompiler Analysis.cpp
similarity index 100%
rename from Source/RSP/Recompiler Analysis.cpp
rename to Source/Project64-rsp/Recompiler Analysis.cpp
diff --git a/Source/RSP/Recompiler CPU.cpp b/Source/Project64-rsp/Recompiler CPU.cpp
similarity index 100%
rename from Source/RSP/Recompiler CPU.cpp
rename to Source/Project64-rsp/Recompiler CPU.cpp
diff --git a/Source/RSP/Recompiler CPU.h b/Source/Project64-rsp/Recompiler CPU.h
similarity index 100%
rename from Source/RSP/Recompiler CPU.h
rename to Source/Project64-rsp/Recompiler CPU.h
diff --git a/Source/RSP/Recompiler Ops.cpp b/Source/Project64-rsp/Recompiler Ops.cpp
similarity index 100%
rename from Source/RSP/Recompiler Ops.cpp
rename to Source/Project64-rsp/Recompiler Ops.cpp
diff --git a/Source/RSP/Recompiler Ops.h b/Source/Project64-rsp/Recompiler Ops.h
similarity index 100%
rename from Source/RSP/Recompiler Ops.h
rename to Source/Project64-rsp/Recompiler Ops.h
diff --git a/Source/RSP/Recompiler Sections.cpp b/Source/Project64-rsp/Recompiler Sections.cpp
similarity index 100%
rename from Source/RSP/Recompiler Sections.cpp
rename to Source/Project64-rsp/Recompiler Sections.cpp
diff --git a/Source/RSP/Rsp.h b/Source/Project64-rsp/Rsp.h
similarity index 100%
rename from Source/RSP/Rsp.h
rename to Source/Project64-rsp/Rsp.h
diff --git a/Source/RSP/Sse.cpp b/Source/Project64-rsp/Sse.cpp
similarity index 100%
rename from Source/RSP/Sse.cpp
rename to Source/Project64-rsp/Sse.cpp
diff --git a/Source/RSP/Types.h b/Source/Project64-rsp/Types.h
similarity index 100%
rename from Source/RSP/Types.h
rename to Source/Project64-rsp/Types.h
diff --git a/Source/RSP/Version.h.in b/Source/Project64-rsp/Version.h.in
similarity index 100%
rename from Source/RSP/Version.h.in
rename to Source/Project64-rsp/Version.h.in
diff --git a/Source/RSP/X86.cpp b/Source/Project64-rsp/X86.cpp
similarity index 100%
rename from Source/RSP/X86.cpp
rename to Source/Project64-rsp/X86.cpp
diff --git a/Source/RSP/X86.h b/Source/Project64-rsp/X86.h
similarity index 100%
rename from Source/RSP/X86.h
rename to Source/Project64-rsp/X86.h
diff --git a/Source/RSP/breakpoint.cpp b/Source/Project64-rsp/breakpoint.cpp
similarity index 100%
rename from Source/RSP/breakpoint.cpp
rename to Source/Project64-rsp/breakpoint.cpp
diff --git a/Source/RSP/breakpoint.h b/Source/Project64-rsp/breakpoint.h
similarity index 100%
rename from Source/RSP/breakpoint.h
rename to Source/Project64-rsp/breakpoint.h
diff --git a/Source/RSP/dma.cpp b/Source/Project64-rsp/dma.cpp
similarity index 100%
rename from Source/RSP/dma.cpp
rename to Source/Project64-rsp/dma.cpp
diff --git a/Source/RSP/dma.h b/Source/Project64-rsp/dma.h
similarity index 100%
rename from Source/RSP/dma.h
rename to Source/Project64-rsp/dma.h
diff --git a/Source/RSP/log.cpp b/Source/Project64-rsp/log.cpp
similarity index 100%
rename from Source/RSP/log.cpp
rename to Source/Project64-rsp/log.cpp
diff --git a/Source/RSP/log.h b/Source/Project64-rsp/log.h
similarity index 100%
rename from Source/RSP/log.h
rename to Source/Project64-rsp/log.h
diff --git a/Source/RSP/memory.cpp b/Source/Project64-rsp/memory.cpp
similarity index 100%
rename from Source/RSP/memory.cpp
rename to Source/Project64-rsp/memory.cpp
diff --git a/Source/RSP/memory.h b/Source/Project64-rsp/memory.h
similarity index 100%
rename from Source/RSP/memory.h
rename to Source/Project64-rsp/memory.h
diff --git a/Source/RSP/resource.h b/Source/Project64-rsp/resource.h
similarity index 100%
rename from Source/RSP/resource.h
rename to Source/Project64-rsp/resource.h
diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
index bdb6bf052..be3f631b9 100644
--- a/Source/Project64/Project64.vcxproj
+++ b/Source/Project64/Project64.vcxproj
@@ -273,12 +273,12 @@
     <ProjectReference Include="..\Project64-core\Project64-core.vcxproj">
       <Project>{00c7b43a-ded7-4df0-b072-9a5783ef866d}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\Project64-rsp\Project64-rsp.vcxproj">
+      <Project>{a7ed562c-63f3-4b7e-b6b3-2cf7848752e1}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\Project64-video\Project64-video.vcxproj">
       <Project>{a4d13408-a794-4199-8fc7-4a9a32505005}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\RSP\RSP.vcxproj">
-      <Project>{a7ed562c-63f3-4b7e-b6b3-2cf7848752e1}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\UpdateVersion\UpdateVersion.vcxproj">
       <Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
     </ProjectReference>