diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 206e981493..dd4fca69bf 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -39,14 +39,14 @@ endif()
 set(GSdxSources
     GLLoader.cpp
     GLState.cpp
-    GPU.cpp
-    GPUDrawScanline.cpp
-    GPUDrawScanlineCodeGenerator.cpp
-    GPULocalMemory.cpp
-    GPURenderer.cpp
-    GPURendererSW.cpp
-    GPUSetupPrimCodeGenerator.cpp
-    GPUState.cpp
+    PSX/GPU.cpp
+    PSX/GPUDrawScanline.cpp
+    PSX/GPUDrawScanlineCodeGenerator.cpp
+    PSX/GPULocalMemory.cpp
+    PSX/GPURenderer.cpp
+    PSX/GPURendererSW.cpp
+    PSX/GPUSetupPrimCodeGenerator.cpp
+    PSX/GPUState.cpp
     GS.cpp
     GSAlignedClass.cpp
     GSBlock.cpp
@@ -72,7 +72,7 @@ set(GSdxSources
     GSHwHack.cpp
     GSLinuxDialog.cpp
     GSLocalMemory.cpp
-	GSLzma.cpp
+    GSLzma.cpp
     GSPerfMon.cpp
     GSPng.cpp
     GSRasterizer.cpp
@@ -111,17 +111,17 @@ set(GSdxSources
     )
 
 set(GSdxHeaders
-    GPU.h
-    GPUDrawScanline.h
-    GPUDrawScanlineCodeGenerator.h
-    GPUDrawingEnvironment.h
-    GPULocalMemory.h
-    GPURenderer.h
-    GPURendererSW.h
-    GPUScanlineEnvironment.h
-    GPUSetupPrimCodeGenerator.h
-    GPUState.h
-    GPUVertex.h
+    PSX/GPU.h
+    PSX/GPUDrawScanline.h
+    PSX/GPUDrawScanlineCodeGenerator.h
+    PSX/GPUDrawingEnvironment.h
+    PSX/GPULocalMemory.h
+    PSX/GPURenderer.h
+    PSX/GPURendererSW.h
+    PSX/GPUScanlineEnvironment.h
+    PSX/GPUSetupPrimCodeGenerator.h
+    PSX/GPUState.h
+    PSX/GPUVertex.h
     GS.h
     GSAlignedClass.h
     GSBlock.h
diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp
index 47576fc39a..6631bb77cd 100644
--- a/plugins/GSdx/GSdx.cpp
+++ b/plugins/GSdx/GSdx.cpp
@@ -22,7 +22,7 @@
 #include "stdafx.h"
 #include "GSdx.h"
 #include "GS.h"
-#include "GPU.h"
+#include "PSX/GPU.h"
 
 static void* s_hModule;
 
diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj
index 103182df49..d107375d9d 100644
--- a/plugins/GSdx/GSdx.vcxproj
+++ b/plugins/GSdx/GSdx.vcxproj
@@ -578,15 +578,6 @@
   <ItemGroup>
     <ClCompile Include="GLLoader.cpp" />
     <ClCompile Include="GLState.cpp" />
-    <ClCompile Include="GPU.cpp" />
-    <ClCompile Include="GPUDrawScanline.cpp" />
-    <ClCompile Include="GPUDrawScanlineCodeGenerator.cpp" />
-    <ClCompile Include="GPULocalMemory.cpp" />
-    <ClCompile Include="GPURenderer.cpp" />
-    <ClCompile Include="GPURendererSW.cpp" />
-    <ClCompile Include="GPUSettingsDlg.cpp" />
-    <ClCompile Include="GPUSetupPrimCodeGenerator.cpp" />
-    <ClCompile Include="GPUState.cpp" />
     <ClCompile Include="GS.cpp" />
     <ClCompile Include="GSAlignedClass.cpp" />
     <ClCompile Include="GSBlock.cpp" />
@@ -809,6 +800,15 @@
     <ClCompile Include="GSWnd.cpp" />
     <ClCompile Include="GSWndDX.cpp" />
     <ClCompile Include="GSWndWGL.cpp" />
+    <ClCompile Include="PSX\GPU.cpp" />
+    <ClCompile Include="PSX\GPUDrawScanline.cpp" />
+    <ClCompile Include="PSX\GPUDrawScanlineCodeGenerator.cpp" />
+    <ClCompile Include="PSX\GPULocalMemory.cpp" />
+    <ClCompile Include="PSX\GPURenderer.cpp" />
+    <ClCompile Include="PSX\GPURendererSW.cpp" />
+    <ClCompile Include="PSX\GPUSettingsDlg.cpp" />
+    <ClCompile Include="PSX\GPUSetupPrimCodeGenerator.cpp" />
+    <ClCompile Include="PSX\GPUState.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -839,18 +839,6 @@
     <ClInclude Include="config.h" />
     <ClInclude Include="GLLoader.h" />
     <ClInclude Include="GLState.h" />
-    <ClInclude Include="GPU.h" />
-    <ClInclude Include="GPUDrawingEnvironment.h" />
-    <ClInclude Include="GPUDrawScanline.h" />
-    <ClInclude Include="GPUDrawScanlineCodeGenerator.h" />
-    <ClInclude Include="GPULocalMemory.h" />
-    <ClInclude Include="GPURenderer.h" />
-    <ClInclude Include="GPURendererSW.h" />
-    <ClInclude Include="GPUScanlineEnvironment.h" />
-    <ClInclude Include="GPUSettingsDlg.h" />
-    <ClInclude Include="GPUSetupPrimCodeGenerator.h" />
-    <ClInclude Include="GPUState.h" />
-    <ClInclude Include="GPUVertex.h" />
     <ClInclude Include="GS.h" />
     <ClInclude Include="GSAlignedClass.h" />
     <ClInclude Include="GSBlock.h" />
@@ -920,6 +908,18 @@
     <ClInclude Include="GSWnd.h" />
     <ClInclude Include="GSWndDX.h" />
     <ClInclude Include="GSWndWGL.h" />
+    <ClInclude Include="PSX\GPU.h" />
+    <ClInclude Include="PSX\GPUDrawingEnvironment.h" />
+    <ClInclude Include="PSX\GPUDrawScanline.h" />
+    <ClInclude Include="PSX\GPUDrawScanlineCodeGenerator.h" />
+    <ClInclude Include="PSX\GPULocalMemory.h" />
+    <ClInclude Include="PSX\GPURenderer.h" />
+    <ClInclude Include="PSX\GPURendererSW.h" />
+    <ClInclude Include="PSX\GPUScanlineEnvironment.h" />
+    <ClInclude Include="PSX\GPUSettingsDlg.h" />
+    <ClInclude Include="PSX\GPUSetupPrimCodeGenerator.h" />
+    <ClInclude Include="PSX\GPUState.h" />
+    <ClInclude Include="PSX\GPUVertex.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="svnrev.h" />
     <ClInclude Include="resource.h" />
diff --git a/plugins/GSdx/GSdx.vcxproj.filters b/plugins/GSdx/GSdx.vcxproj.filters
index 4a4f06bdc7..e16e0ba524 100644
--- a/plugins/GSdx/GSdx.vcxproj.filters
+++ b/plugins/GSdx/GSdx.vcxproj.filters
@@ -207,33 +207,6 @@
     <ClCompile Include="GLState.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GPUDrawScanline.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GPUDrawScanlineCodeGenerator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GPULocalMemory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GPURenderer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GPURendererSW.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GPUSettingsDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GPUSetupPrimCodeGenerator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GPUState.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="GSDeviceDX.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -285,6 +258,33 @@
     <ClCompile Include="GSPng.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="PSX\GPU.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PSX\GPUDrawScanline.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PSX\GPUDrawScanlineCodeGenerator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PSX\GPULocalMemory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PSX\GPURenderer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PSX\GPURendererSW.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PSX\GPUSettingsDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PSX\GPUSetupPrimCodeGenerator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PSX\GPUState.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="GLLoader.h">
@@ -506,42 +506,6 @@
     <ClInclude Include="xbyak\xbyak_util.h">
       <Filter>Xbyak</Filter>
     </ClInclude>
-    <ClInclude Include="GPU.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPUDrawingEnvironment.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPUDrawScanline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPUDrawScanlineCodeGenerator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPULocalMemory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPURenderer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPURendererSW.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPUScanlineEnvironment.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPUSettingsDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPUSetupPrimCodeGenerator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPUState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GPUVertex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="GSTextureSW.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -563,6 +527,42 @@
     <ClInclude Include="GSPng.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="PSX\GPU.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPUDrawingEnvironment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPUDrawScanline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPUDrawScanlineCodeGenerator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPULocalMemory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPURenderer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPURendererSW.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPUScanlineEnvironment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPUSettingsDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPUSetupPrimCodeGenerator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPUState.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PSX\GPUVertex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\logo10.bmp">
diff --git a/plugins/GSdx/GPU.cpp b/plugins/GSdx/PSX/GPU.cpp
similarity index 100%
rename from plugins/GSdx/GPU.cpp
rename to plugins/GSdx/PSX/GPU.cpp
index 8b2bf21552..baf3fca2ee 100644
--- a/plugins/GSdx/GPU.cpp
+++ b/plugins/GSdx/PSX/GPU.cpp
@@ -22,8 +22,8 @@
 #include "stdafx.h"
 #include "GSdx.h"
 #include "GSUtil.h"
-#include "GPURendererSW.h"
 #include "GSDeviceNull.h"
+#include "GPURendererSW.h"
 
 #ifdef _WIN32
 
diff --git a/plugins/GSdx/GPU.h b/plugins/GSdx/PSX/GPU.h
similarity index 100%
rename from plugins/GSdx/GPU.h
rename to plugins/GSdx/PSX/GPU.h
diff --git a/plugins/GSdx/GPUDrawScanline.cpp b/plugins/GSdx/PSX/GPUDrawScanline.cpp
similarity index 100%
rename from plugins/GSdx/GPUDrawScanline.cpp
rename to plugins/GSdx/PSX/GPUDrawScanline.cpp
diff --git a/plugins/GSdx/GPUDrawScanline.h b/plugins/GSdx/PSX/GPUDrawScanline.h
similarity index 100%
rename from plugins/GSdx/GPUDrawScanline.h
rename to plugins/GSdx/PSX/GPUDrawScanline.h
diff --git a/plugins/GSdx/GPUDrawScanlineCodeGenerator.cpp b/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.cpp
similarity index 100%
rename from plugins/GSdx/GPUDrawScanlineCodeGenerator.cpp
rename to plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.cpp
diff --git a/plugins/GSdx/GPUDrawScanlineCodeGenerator.h b/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.h
similarity index 100%
rename from plugins/GSdx/GPUDrawScanlineCodeGenerator.h
rename to plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.h
diff --git a/plugins/GSdx/GPUDrawingEnvironment.h b/plugins/GSdx/PSX/GPUDrawingEnvironment.h
similarity index 100%
rename from plugins/GSdx/GPUDrawingEnvironment.h
rename to plugins/GSdx/PSX/GPUDrawingEnvironment.h
diff --git a/plugins/GSdx/GPULocalMemory.cpp b/plugins/GSdx/PSX/GPULocalMemory.cpp
similarity index 100%
rename from plugins/GSdx/GPULocalMemory.cpp
rename to plugins/GSdx/PSX/GPULocalMemory.cpp
diff --git a/plugins/GSdx/GPULocalMemory.h b/plugins/GSdx/PSX/GPULocalMemory.h
similarity index 100%
rename from plugins/GSdx/GPULocalMemory.h
rename to plugins/GSdx/PSX/GPULocalMemory.h
diff --git a/plugins/GSdx/GPURenderer.cpp b/plugins/GSdx/PSX/GPURenderer.cpp
similarity index 100%
rename from plugins/GSdx/GPURenderer.cpp
rename to plugins/GSdx/PSX/GPURenderer.cpp
diff --git a/plugins/GSdx/GPURenderer.h b/plugins/GSdx/PSX/GPURenderer.h
similarity index 100%
rename from plugins/GSdx/GPURenderer.h
rename to plugins/GSdx/PSX/GPURenderer.h
diff --git a/plugins/GSdx/GPURendererSW.cpp b/plugins/GSdx/PSX/GPURendererSW.cpp
similarity index 100%
rename from plugins/GSdx/GPURendererSW.cpp
rename to plugins/GSdx/PSX/GPURendererSW.cpp
diff --git a/plugins/GSdx/GPURendererSW.h b/plugins/GSdx/PSX/GPURendererSW.h
similarity index 100%
rename from plugins/GSdx/GPURendererSW.h
rename to plugins/GSdx/PSX/GPURendererSW.h
diff --git a/plugins/GSdx/GPUScanlineEnvironment.h b/plugins/GSdx/PSX/GPUScanlineEnvironment.h
similarity index 100%
rename from plugins/GSdx/GPUScanlineEnvironment.h
rename to plugins/GSdx/PSX/GPUScanlineEnvironment.h
diff --git a/plugins/GSdx/GPUSettingsDlg.cpp b/plugins/GSdx/PSX/GPUSettingsDlg.cpp
similarity index 100%
rename from plugins/GSdx/GPUSettingsDlg.cpp
rename to plugins/GSdx/PSX/GPUSettingsDlg.cpp
index a862d91089..59ccf07597 100644
--- a/plugins/GSdx/GPUSettingsDlg.cpp
+++ b/plugins/GSdx/PSX/GPUSettingsDlg.cpp
@@ -21,10 +21,10 @@
 
 #include "stdafx.h"
 #include "GSdx.h"
-#include "GPU.h"
 #include "GSUtil.h"
-#include "GPUSettingsDlg.h"
 #include "resource.h"
+#include "GPU.h"
+#include "GPUSettingsDlg.h"
 
 GPUSettingsDlg::GPUSettingsDlg()
 	: GSDialog(IDD_GPUCONFIG)
diff --git a/plugins/GSdx/GPUSettingsDlg.h b/plugins/GSdx/PSX/GPUSettingsDlg.h
similarity index 100%
rename from plugins/GSdx/GPUSettingsDlg.h
rename to plugins/GSdx/PSX/GPUSettingsDlg.h
diff --git a/plugins/GSdx/GPUSetupPrimCodeGenerator.cpp b/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.cpp
similarity index 100%
rename from plugins/GSdx/GPUSetupPrimCodeGenerator.cpp
rename to plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.cpp
diff --git a/plugins/GSdx/GPUSetupPrimCodeGenerator.h b/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.h
similarity index 100%
rename from plugins/GSdx/GPUSetupPrimCodeGenerator.h
rename to plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.h
diff --git a/plugins/GSdx/GPUState.cpp b/plugins/GSdx/PSX/GPUState.cpp
similarity index 100%
rename from plugins/GSdx/GPUState.cpp
rename to plugins/GSdx/PSX/GPUState.cpp
diff --git a/plugins/GSdx/GPUState.h b/plugins/GSdx/PSX/GPUState.h
similarity index 100%
rename from plugins/GSdx/GPUState.h
rename to plugins/GSdx/PSX/GPUState.h
diff --git a/plugins/GSdx/GPUVertex.h b/plugins/GSdx/PSX/GPUVertex.h
similarity index 100%
rename from plugins/GSdx/GPUVertex.h
rename to plugins/GSdx/PSX/GPUVertex.h
diff --git a/plugins/GSdx/vsprops/common.props b/plugins/GSdx/vsprops/common.props
index e013f88c2c..508d213c66 100644
--- a/plugins/GSdx/vsprops/common.props
+++ b/plugins/GSdx/vsprops/common.props
@@ -13,7 +13,7 @@
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4456;4458;4996;4995;4324;4100;4101;4201;4556;4127;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(VTUNE_AMPLIFIER_XE_2015_DIR)include;$(SolutionDir)unfree;$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\libpng;$(SolutionDir)3rdparty\opencl;$(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VTUNE_AMPLIFIER_XE_2015_DIR)include;$(ProjectDir);$(SolutionDir)unfree;$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\libpng;$(SolutionDir)3rdparty\opencl;$(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>