diff --git a/Android/jni/Project64-core/Project64-core.mk b/Android/jni/Project64-core/Project64-core.mk
index 6c25cec53..745a7d617 100644
--- a/Android/jni/Project64-core/Project64-core.mk
+++ b/Android/jni/Project64-core/Project64-core.mk
@@ -41,17 +41,17 @@ LOCAL_SRC_FILES :=                                                     \
     $(SRCDIR)/N64System/Mips/SystemEvents.cpp                          \
     $(SRCDIR)/N64System/Mips/SystemTiming.cpp                          \
     $(SRCDIR)/N64System/Mips/TLBclass.cpp                              \
+    $(SRCDIR)/N64System/Recompiler/x86/x86RecompilerOps.cpp            \
     $(SRCDIR)/N64System/Recompiler/LoopAnalysis.cpp                    \
     $(SRCDIR)/N64System/Recompiler/CodeBlock.cpp                       \
     $(SRCDIR)/N64System/Recompiler/SectionInfo.cpp                     \
     $(SRCDIR)/N64System/Recompiler/FunctionInfo.cpp                    \
     $(SRCDIR)/N64System/Recompiler/FunctionMapClass.cpp                \
     $(SRCDIR)/N64System/Recompiler/RecompilerClass.cpp                 \
+    $(SRCDIR)/N64System/Recompiler/RecompilerCodeLog.cpp               \
     $(SRCDIR)/N64System/Recompiler/RecompilerMemory.cpp                \
-    $(SRCDIR)/N64System/Recompiler/RecompilerOps.cpp                   \
     $(SRCDIR)/N64System/Recompiler/CodeSection.cpp                     \
     $(SRCDIR)/N64System/Recompiler/RegInfo.cpp                         \
-    $(SRCDIR)/N64System/Recompiler/x86CodeLog.cpp                      \
     $(SRCDIR)/N64System/Recompiler/X86ops.cpp                          \
     $(SRCDIR)/N64System/CheatClass.cpp                                 \
     $(SRCDIR)/N64System/FramePerSecondClass.cpp                        \
diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
index e52949876..3511f5067 100644
--- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
+++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
@@ -11,7 +11,7 @@
 #pragma once
 #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
 #include "TranslateVaddr.h"
-#include <Project64-core/N64System/Recompiler/RecompilerOps.h>
+#include <Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h>
 #include <Project64-core/N64System/Interpreter/InterpreterOps.h>
 #include <Project64-core/N64System/Mips/PifRam.h>
 #include <Project64-core/N64System/Mips/FlashRam.h>
diff --git a/Source/Project64-core/N64System/Recompiler/CodeBlock.h b/Source/Project64-core/N64System/Recompiler/CodeBlock.h
index c29b87ea5..8e86310a5 100644
--- a/Source/Project64-core/N64System/Recompiler/CodeBlock.h
+++ b/Source/Project64-core/N64System/Recompiler/CodeBlock.h
@@ -10,7 +10,7 @@
 ****************************************************************************/
 #pragma once
 #include <Common/md5.h>
-#include <Project64-core/N64System/Recompiler/RecompilerOps.h>
+#include <Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h>
 #include <Project64-core/N64System/Recompiler/ExitInfo.h>
 #include <Project64-core/N64System/Recompiler/CodeSection.h>
 
diff --git a/Source/Project64-core/N64System/Recompiler/CodeSection.h b/Source/Project64-core/N64System/Recompiler/CodeSection.h
index b1c91660c..6178316a5 100644
--- a/Source/Project64-core/N64System/Recompiler/CodeSection.h
+++ b/Source/Project64-core/N64System/Recompiler/CodeSection.h
@@ -10,7 +10,7 @@
 ****************************************************************************/
 #pragma once
 #include "JumpInfo.h"
-#include <Project64-core/N64System/Recompiler/RecompilerOps.h>
+#include <Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h>
 
 class CCodeBlock;
 
diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
similarity index 99%
rename from Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp
rename to Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
index 733c50ba9..589df0802 100644
--- a/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp
+++ b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
@@ -16,10 +16,10 @@
 #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
 #include <Project64-core/N64System/Recompiler/RecompilerClass.h>
 #include <Project64-core/N64System/Recompiler/CodeSection.h>
-#include <Project64-core/N64System/Recompiler/RecompilerOps.h>
+#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
+#include <Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h>
 #include <Project64-core/N64System/N64Class.h>
 #include <stdio.h>
-#include "RecompilerCodeLog.h"
 
 CCodeSection * CRecompilerOps::m_Section = NULL;
 CRegInfo       CRecompilerOps::m_RegWorkingSet;
diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerOps.h b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h
similarity index 100%
rename from Source/Project64-core/N64System/Recompiler/RecompilerOps.h
rename to Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h
diff --git a/Source/Project64-core/Project64-core.vcproj b/Source/Project64-core/Project64-core.vcproj
index 94667c7d1..c1d5702a2 100644
--- a/Source/Project64-core/Project64-core.vcproj
+++ b/Source/Project64-core/Project64-core.vcproj
@@ -468,10 +468,6 @@
 						RelativePath=".\N64System\Recompiler\RecompilerMemory.cpp"
 						>
 					</File>
-					<File
-						RelativePath=".\N64System\Recompiler\RecompilerOps.cpp"
-						>
-					</File>
 					<File
 						RelativePath=".\N64System\Recompiler\RegInfo.cpp"
 						>
@@ -484,6 +480,14 @@
 						RelativePath=".\N64System\Recompiler\X86ops.cpp"
 						>
 					</File>
+					<Filter
+						Name="x86"
+						>
+						<File
+							RelativePath=".\N64System\Recompiler\x86\x86RecompilerOps.cpp"
+							>
+						</File>
+					</Filter>
 				</Filter>
 			</Filter>
 			<Filter
diff --git a/Source/Project64-core/Project64-core.vcxproj b/Source/Project64-core/Project64-core.vcxproj
index c07b8ec96..f792a4c0b 100644
--- a/Source/Project64-core/Project64-core.vcxproj
+++ b/Source/Project64-core/Project64-core.vcxproj
@@ -74,10 +74,10 @@
     <ClCompile Include="N64System\Recompiler\RecompilerClass.cpp" />
     <ClCompile Include="N64System\Recompiler\RecompilerCodeLog.cpp" />
     <ClCompile Include="N64System\Recompiler\RecompilerMemory.cpp" />
-    <ClCompile Include="N64System\Recompiler\RecompilerOps.cpp" />
     <ClCompile Include="N64System\Recompiler\RegInfo.cpp" />
     <ClCompile Include="N64System\Recompiler\SectionInfo.cpp" />
     <ClCompile Include="N64System\Recompiler\X86ops.cpp" />
+    <ClCompile Include="N64System\Recompiler\x86\x86RecompilerOps.cpp" />
     <ClCompile Include="N64System\SpeedLimiterClass.cpp" />
     <ClCompile Include="N64System\SystemGlobals.cpp" />
     <ClCompile Include="Plugins\AudioPlugin.cpp" />
@@ -172,6 +172,7 @@
     <ClInclude Include="N64System\Recompiler\RegInfo.h" />
     <ClInclude Include="N64System\Recompiler\SectionInfo.h" />
     <ClInclude Include="N64System\Recompiler\X86ops.h" />
+    <ClInclude Include="N64System\Recompiler\x86\x86RecompilerOps.h" />
     <ClInclude Include="N64System\SpeedLimiterClass.h" />
     <ClInclude Include="N64System\SystemGlobals.h" />
     <ClInclude Include="Notification.h" />
diff --git a/Source/Project64-core/Project64-core.vcxproj.filters b/Source/Project64-core/Project64-core.vcxproj.filters
index eb2719797..657b0cc51 100644
--- a/Source/Project64-core/Project64-core.vcxproj.filters
+++ b/Source/Project64-core/Project64-core.vcxproj.filters
@@ -79,6 +79,12 @@
     <Filter Include="Source Files\N64 System\Arm">
       <UniqueIdentifier>{8c526293-ee42-44b0-938f-f3c1cc18a986}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\N64 System\Recompiler\x86">
+      <UniqueIdentifier>{84d10022-4b24-4ba2-bfef-f85d16dfdc09}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System\Recompiler\x86">
+      <UniqueIdentifier>{b6d9fd3a-e8e5-42a2-8bcc-8fa430dd8aaa}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -234,9 +240,6 @@
     <ClCompile Include="N64System\Recompiler\RecompilerMemory.cpp">
       <Filter>Source Files\N64 System\Recompiler</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Recompiler\RecompilerOps.cpp">
-      <Filter>Source Files\N64 System\Recompiler</Filter>
-    </ClCompile>
     <ClCompile Include="N64System\Recompiler\RegInfo.cpp">
       <Filter>Source Files\N64 System\Recompiler</Filter>
     </ClCompile>
@@ -318,6 +321,9 @@
     <ClCompile Include="N64System\Recompiler\RecompilerCodeLog.cpp">
       <Filter>Source Files\N64 System\Recompiler</Filter>
     </ClCompile>
+    <ClCompile Include="N64System\Recompiler\x86\x86RecompilerOps.cpp">
+      <Filter>Source Files\N64 System\Recompiler\x86</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -611,5 +617,8 @@
     <ClInclude Include="N64System\Recompiler\RecompilerCodeLog.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
+    <ClInclude Include="N64System\Recompiler\x86\x86RecompilerOps.h">
+      <Filter>Header Files\N64 System\Recompiler\x86</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file