diff --git a/.gitmodules b/.gitmodules
index 396e129fed..a45f065200 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,5 +6,5 @@
 	path = ffmpeg
 	url = https://github.com/hrydgard/ppsspp-ffmpeg
 [submodule "asmjit"]
-	path = asmjitsrc/asmjit
+	path = asmjit
 	url = https://github.com/kobalicekp/asmjit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 767c8c0d59..bfb3c82402 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,5 +2,5 @@ cmake_minimum_required(VERSION 2.8)
 
 set(ASMJIT_STATIC TRUE)
 
-add_subdirectory( asmjitsrc )
+add_subdirectory( asmjit )
 add_subdirectory( rpcs3 )
diff --git a/asmjitsrc/asmjit.vcxproj b/asmjitsrc/asmjit.vcxproj
index f27696341c..28da0c7bdb 100644
--- a/asmjitsrc/asmjit.vcxproj
+++ b/asmjitsrc/asmjit.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -19,34 +19,34 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="asmjit\src\asmjit\base\assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\codegen.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\constpool.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\context.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\cpuinfo.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\cputicks.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\defs.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\error.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\globals.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\logger.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\memorymanager.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\podvector.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\runtime.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\string.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\vmem.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\zone.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\contrib\winremoteruntime.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86context.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86cpuinfo.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86defs.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86func.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\assembler.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\codegen.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\compiler.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\constpool.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\context.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\cpuinfo.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\cputicks.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\defs.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\error.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\func.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\globals.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\logger.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\memorymanager.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\podvector.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\runtime.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\string.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\vmem.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\zone.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\contrib\winremoteruntime.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86assembler.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86compiler.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86context.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86cpuinfo.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86defs.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86func.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="asmjit\src\asmjit\base\constpool.h" />
+    <ClInclude Include="..\asmjit\src\asmjit\base\constpool.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{AC40FF01-426E-4838-A317-66354CEFAE88}</ProjectGuid>
diff --git a/asmjitsrc/asmjit.vcxproj.filters b/asmjitsrc/asmjit.vcxproj.filters
index 43ebc37017..3bc6ddf9b2 100644
--- a/asmjitsrc/asmjit.vcxproj.filters
+++ b/asmjitsrc/asmjit.vcxproj.filters
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="asmjit\src\asmjit\x86\x86assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86context.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86cpuinfo.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86defs.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\contrib\winremoteruntime.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\codegen.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\context.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\cpuinfo.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\cputicks.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\defs.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\error.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\globals.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\logger.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\memorymanager.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\podvector.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\runtime.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\string.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\vmem.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\zone.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\base\constpool.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86assembler.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86compiler.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86context.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86cpuinfo.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86defs.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\x86\x86func.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\contrib\winremoteruntime.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\assembler.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\codegen.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\compiler.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\context.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\cpuinfo.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\cputicks.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\defs.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\error.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\func.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\globals.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\logger.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\memorymanager.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\podvector.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\runtime.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\string.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\vmem.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\zone.cpp" />
+    <ClCompile Include="..\asmjit\src\asmjit\base\constpool.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="asmjit\src\asmjit\base\constpool.h" />
+    <ClInclude Include="..\asmjit\src\asmjit\base\constpool.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 961cc87b22..7ad4795be7 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -69,7 +69,7 @@ ${OPENAL_INCLUDE_DIR}
 "${RPCS3_SRC_DIR}/Loader"
 "${RPCS3_SRC_DIR}/Crypto"
 "${RPCS3_SRC_DIR}/.."
-"${RPCS3_SRC_DIR}/../asmjitsrc/asmjit/src/asmjit"
+"${RPCS3_SRC_DIR}/../asmjit/src/asmjit"
 )
 
 link_directories("${RPCS3_SRC_DIR}/../ffmpeg/${PLATFORM_ARCH}/lib")
@@ -94,7 +94,7 @@ RPCS3_SRC
 
 add_executable(rpcs3 ${RPCS3_SRC})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_CURRENT_BINARY_DIR}/../asmjitsrc/asmjit/") #hack because the asmjit cmake file force fno exceptions
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_CURRENT_BINARY_DIR}/../asmjit/") #hack because the asmjit cmake file force fno exceptions
 target_link_libraries(rpcs3  asmjit.a  ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${ZLIB_LIBRARIES})
 
 #set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h")
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index fa66ff2147..17809ade40 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug - MemLeak|Win32">
@@ -95,7 +95,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;.\OpenAL\include;$(IncludePath);..\asmjitsrc\asmjit\src\asmjit</IncludePath>
+    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit</IncludePath>
     <OutDir>$(SolutionDir)bin\</OutDir>
     <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName>
@@ -107,7 +107,7 @@
     <TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjitsrc\asmjit\src\asmjit</IncludePath>
+    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit</IncludePath>
     <OutDir>$(SolutionDir)bin\</OutDir>
     <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName>
@@ -120,7 +120,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;.\OpenAL\include;$(IncludePath);..\asmjitsrc\asmjit\src\asmjit</IncludePath>
+    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit</IncludePath>
     <OutDir>$(SolutionDir)bin\</OutDir>
     <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
@@ -129,7 +129,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjitsrc\asmjit\src\asmjit</IncludePath>
+    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit</IncludePath>
     <OutDir>$(SolutionDir)bin\</OutDir>
     <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <LinkIncremental>false</LinkIncremental>