diff --git a/common/build/Utilities/utilities.vcxproj b/common/build/Utilities/utilities.vcxproj
index c687c9086a..fbf3091568 100644
--- a/common/build/Utilities/utilities.vcxproj
+++ b/common/build/Utilities/utilities.vcxproj
@@ -110,6 +110,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\Utilities\EmbeddedImage.h" />
+    <ClInclude Include="..\..\include\Utilities\boost_spsc_queue.hpp" />
     <ClInclude Include="..\..\include\Utilities\ScopedAlloc.h" />
     <ClInclude Include="..\..\src\Utilities\ThreadingInternal.h" />
     <ClInclude Include="..\..\include\Utilities\Assertions.h" />
diff --git a/common/build/Utilities/utilities.vcxproj.filters b/common/build/Utilities/utilities.vcxproj.filters
index e645959405..434cd0e88c 100644
--- a/common/build/Utilities/utilities.vcxproj.filters
+++ b/common/build/Utilities/utilities.vcxproj.filters
@@ -132,6 +132,9 @@
     <ClInclude Include="..\..\include\Utilities\Assertions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\Utilities\boost_spsc_queue.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\Utilities\CheckedStaticBox.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/GSdx/boost_spsc_queue.hpp b/common/include/Utilities/boost_spsc_queue.hpp
similarity index 100%
rename from plugins/GSdx/boost_spsc_queue.hpp
rename to common/include/Utilities/boost_spsc_queue.hpp
diff --git a/common/src/Utilities/CMakeLists.txt b/common/src/Utilities/CMakeLists.txt
index 8dcee537f3..3eca6dec1d 100644
--- a/common/src/Utilities/CMakeLists.txt
+++ b/common/src/Utilities/CMakeLists.txt
@@ -49,6 +49,7 @@ set(UtilitiesSources
 # variable with all headers of this library
 set(UtilitiesHeaders
 	../../include/Utilities/Assertions.h
+	../../include/Utilities/boost_spsc_queue.hpp
 	../../include/Utilities/CheckedStaticBox.h
 	../../include/Utilities/Console.h
 	../../include/Utilities/Dependencies.h
diff --git a/pcsx2/Gif_Unit.h b/pcsx2/Gif_Unit.h
index d425e58a24..dc3c0760b3 100644
--- a/pcsx2/Gif_Unit.h
+++ b/pcsx2/Gif_Unit.h
@@ -21,7 +21,7 @@
 #include "GS.h"
 
 // FIXME common path ?
-#include "../plugins/GSdx/boost_spsc_queue.hpp"
+#include "Utilities/boost_spsc_queue.hpp"
 
 struct GS_Packet;
 extern void Gif_MTGS_Wait(bool isMTVU);
diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 4270e568fa..d8c80efe7d 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -47,8 +47,6 @@ if(OPENCL_API)
 endif()
 
 set(GSdxSources
-    GLLoader.cpp
-    GLState.cpp
     PSX/GPU.cpp
     PSX/GPUDrawScanline.cpp
     PSX/GPUDrawScanlineCodeGenerator.cpp
@@ -64,129 +62,92 @@ set(GSdxSources
     GSClut.cpp
     GSCodeBuffer.cpp
     GSCrc.cpp
-    GSDevice.cpp
-    GSDeviceOGL.cpp
-    GSDeviceNull.cpp
-    GSDirtyRect.cpp
     GSDrawingContext.cpp
-    GSDrawScanline.cpp
-    GSDrawScanlineCodeGenerator.cpp
-    GSDrawScanlineCodeGenerator.x64.cpp
-    GSDrawScanlineCodeGenerator.x64.avx.cpp
-    GSDrawScanlineCodeGenerator.x64.avx2.cpp
-    GSDrawScanlineCodeGenerator.x86.cpp
-    GSDrawScanlineCodeGenerator.x86.avx.cpp
-    GSDrawScanlineCodeGenerator.x86.avx2.cpp
     GSDump.cpp
-    GSFunctionMap.cpp
-    GSHwHack.cpp
     GSLocalMemory.cpp
     GSLzma.cpp
     GSPerfMon.cpp
     GSPng.cpp
-    GSRasterizer.cpp
-    GSRenderer.cpp
-    GSRendererCL.cpp
-    GSRendererHW.cpp
-    GSRendererNull.cpp
-    GSRendererOGL.cpp
-    GSRendererSW.cpp
-    GSOsdManager.cpp
-    GSSetting.cpp
-    GSSetupPrimCodeGenerator.cpp
-    GSSetupPrimCodeGenerator.x64.cpp
-    GSSetupPrimCodeGenerator.x64.avx.cpp
-    GSSetupPrimCodeGenerator.x64.avx2.cpp
-    GSSetupPrimCodeGenerator.x86.cpp
-    GSSetupPrimCodeGenerator.x86.avx.cpp
-    GSSetupPrimCodeGenerator.x86.avx2.cpp
-    GSShaderOGL.cpp
     GSState.cpp
     GSTables.cpp
-    GSTexture.cpp
-    GSTextureCache.cpp
-    GSTextureCacheSW.cpp
-    GSTextureCacheOGL.cpp
-    GSTextureOGL.cpp
-    GSTextureNull.cpp
-    GSTextureSW.cpp
     GSUtil.cpp
     GSVector.cpp
-    GSVertexTrace.cpp
-    GSWnd.cpp
     GSdx.cpp
     GSdxResources.cpp
     stdafx.cpp
+    Renderers/Common/GSDevice.cpp
+    Renderers/Common/GSDirtyRect.cpp
+    Renderers/Common/GSFunctionMap.cpp
+    Renderers/Common/GSOsdManager.cpp
+    Renderers/Common/GSRenderer.cpp
+    Renderers/Common/GSTexture.cpp
+    Renderers/Common/GSTextureCache.cpp
+    Renderers/Common/GSVertexTrace.cpp
+    Renderers/Null/GSDeviceNull.cpp
+    Renderers/Null/GSRendererNull.cpp
+    Renderers/Null/GSTextureNull.cpp
+    Renderers/HW/GSHwHack.cpp
+    Renderers/HW/GSRendererHW.cpp
+    Renderers/SW/GSDrawScanline.cpp
+    Renderers/SW/GSDrawScanlineCodeGenerator.cpp
+    Renderers/SW/GSDrawScanlineCodeGenerator.x64.cpp
+    Renderers/SW/GSDrawScanlineCodeGenerator.x64.avx.cpp
+    Renderers/SW/GSDrawScanlineCodeGenerator.x64.avx2.cpp
+    Renderers/SW/GSDrawScanlineCodeGenerator.x86.cpp
+    Renderers/SW/GSDrawScanlineCodeGenerator.x86.avx.cpp
+    Renderers/SW/GSDrawScanlineCodeGenerator.x86.avx2.cpp
+    Renderers/SW/GSRasterizer.cpp
+    Renderers/SW/GSRendererSW.cpp
+    Renderers/SW/GSSetupPrimCodeGenerator.cpp
+    Renderers/SW/GSSetupPrimCodeGenerator.x64.cpp
+    Renderers/SW/GSSetupPrimCodeGenerator.x64.avx.cpp
+    Renderers/SW/GSSetupPrimCodeGenerator.x64.avx2.cpp
+    Renderers/SW/GSSetupPrimCodeGenerator.x86.cpp
+    Renderers/SW/GSSetupPrimCodeGenerator.x86.avx.cpp
+    Renderers/SW/GSSetupPrimCodeGenerator.x86.avx2.cpp
+    Renderers/SW/GSTextureCacheSW.cpp
+    Renderers/SW/GSTextureSW.cpp
+    Renderers/OpenGL/GLLoader.cpp
+    Renderers/OpenGL/GLState.cpp
+    Renderers/OpenGL/GSDeviceOGL.cpp
+    Renderers/OpenGL/GSRendererOGL.cpp
+    Renderers/OpenGL/GSShaderOGL.cpp
+    Renderers/OpenGL/GSTextureCacheOGL.cpp
+    Renderers/OpenGL/GSTextureOGL.cpp
+    Renderers/OpenCL/GSRendererCL.cpp
+    Window/GSSetting.cpp
+    Window/GSWnd.cpp
     )
 
 set(GSdxHeaders
     config.h
-    GLLoader.h
-    GLState.h
     GSAlignedClass.h
     GSBlock.h
-    GSCaptureDlg.h
     GSCapture.h
     GSClut.h
     GSCodeBuffer.h
     GSCrc.h
-    GSDevice.h
-    GSDeviceNull.h
-    GSDeviceOGL.h
-    GSDialog.h
-    GSDirtyRect.h
     GSDrawingContext.h
     GSDrawingEnvironment.h
-    GSDrawScanlineCodeGenerator.h
-    GSDrawScanline.h
     GSDump.h
     GSdx.h
     GSdxResources.h
-    GSFastList.h
-    GSFunctionMap.h
     GS.h
     GSLocalMemory.h
     GSLzma.h
-    GSOsdManager.h
     GSPerfMon.h
     GSPng.h
-    GSRasterizer.h
-    GSRendererCL.h
-    GSRenderer.h
-    GSRendererHW.h
-    GSRendererNull.h
-    GSRendererOGL.h
-    GSRendererSW.h
-    GSScanlineEnvironment.h
-    GSSetting.h
-    GSSettingsDlg.h
-    GSSetupPrimCodeGenerator.h
-    GSShaderOGL.h
     GSState.h
     GSTables.h
-    GSTextureCache.h
-    GSTextureCacheOGL.h
-    GSTextureCacheSW.h
-    GSTexture.h
-    GSTextureNull.h
-    GSTextureOGL.h
-    GSTextureSW.h
     GSThread_CXX11.h
     GSThread.h
-    GSUniformBufferOGL.h
     GSUtil.h
     GSVector.h
     GSVector4.h
     GSVector4i.h
     GSVector8.h
     GSVector8i.h
-    GSVertexArrayOGL.h
-    GSVertex.h
-    GSVertexHW.h
-    GSVertexList.h
-    GSVertexSW.h
-    GSVertexTrace.h
-    GSWnd.h
+    stdafx.h
     PSX/GPUDrawingEnvironment.h
     PSX/GPUDrawScanlineCodeGenerator.h
     PSX/GPUDrawScanline.h
@@ -198,7 +159,46 @@ set(GSdxHeaders
     PSX/GPUSetupPrimCodeGenerator.h
     PSX/GPUState.h
     PSX/GPUVertex.h
-    stdafx.h
+    Renderers/Common/GSDevice.h
+    Renderers/Common/GSDirtyRect.h
+    Renderers/Common/GSFastList.h
+    Renderers/Common/GSFunctionMap.h
+    Renderers/Common/GSOsdManager.h
+    Renderers/Common/GSRenderer.h
+    Renderers/Common/GSTextureCache.h
+    Renderers/Common/GSTexture.h
+    Renderers/Common/GSVertex.h
+    Renderers/Common/GSVertexList.h
+    Renderers/Common/GSVertexTrace.h
+    Renderers/Null/GSDeviceNull.h
+    Renderers/Null/GSRendererNull.h
+    Renderers/Null/GSTextureNull.h
+    Renderers/HW/GSRendererHW.h
+    Renderers/HW/GSVertexHW.h
+    Renderers/SW/GSDrawScanlineCodeGenerator.h
+    Renderers/SW/GSDrawScanline.h
+    Renderers/SW/GSRasterizer.h
+    Renderers/SW/GSRendererSW.h
+    Renderers/SW/GSScanlineEnvironment.h
+    Renderers/SW/GSSetupPrimCodeGenerator.h
+    Renderers/SW/GSTextureCacheSW.h
+    Renderers/SW/GSTextureSW.h
+    Renderers/SW/GSVertexSW.h
+    Renderers/OpenGL/GLLoader.h
+    Renderers/OpenGL/GLState.h
+    Renderers/OpenGL/GSDeviceOGL.h
+    Renderers/OpenGL/GSRendererOGL.h
+    Renderers/OpenGL/GSShaderOGL.h
+    Renderers/OpenGL/GSTextureCacheOGL.h
+    Renderers/OpenGL/GSTextureOGL.h
+    Renderers/OpenGL/GSUniformBufferOGL.h
+    Renderers/OpenGL/GSVertexArrayOGL.h
+    Renderers/OpenCL/GSRendererCL.h
+    Window/GSCaptureDlg.h
+    Window/GSDialog.h
+    Window/GSSetting.h
+    Window/GSSettingsDlg.h
+    Window/GSWnd.h
     xbyak/xbyak.h
     xbyak/xbyak_mnemonic.h
     xbyak/xbyak_util.h
@@ -206,56 +206,55 @@ set(GSdxHeaders
 
 if(Windows)
     LIST(APPEND GSdxSources
-        GSCaptureDlg.cpp
-        GSDevice11.cpp
-        GSDevice9.cpp
-        GSDeviceDX.cpp
-        GSDialog.cpp
-        GSRendererDX11.cpp
-        GSRendererDX9.cpp
-        GSRendererDX.cpp
-        GSSettingsDlg.cpp
-        GSTexture11.cpp
-        GSTexture9.cpp
-        GSTextureCache11.cpp
-        GSTextureCache9.cpp
-        GSTextureFX11.cpp
-        GSTextureFX9.cpp
-        GSTextureFX.cpp
+        Renderers/DX11/GSDevice11.cpp
+        Renderers/DX9/GSDevice9.cpp
+        Renderers/DXCommon/GSDeviceDX.cpp
+        Window/GSDialog.cpp
+        Renderers/DX11/GSRendererDX11.cpp
+        Renderers/DX9/GSRendererDX9.cpp
+        Renderers/DXCommon/GSRendererDX.cpp
+        Renderers/DX11/GSTexture11.cpp
+        Renderers/DX9/GSTexture9.cpp
+        Renderers/DX11/GSTextureCache11.cpp
+        Renderers/DX9/GSTextureCache9.cpp
+        Renderers/DX11/GSTextureFX11.cpp
+        Renderers/DX9/GSTextureFX9.cpp
         GSVertexList.cpp
-        GSVertexSW.cpp
-        GSWndDX.cpp
-        GSWndWGL.cpp
+        Renderers/SW/GSVertexSW.cpp
+        Window/GSCaptureDlg.cpp
+        Window/GSSettingsDlg.cpp
+        Window/GSWndDX.cpp
+        Window/GSWndWGL.cpp
         PSX/GPUSettingsDlg.cpp
         )
 
     LIST(APPEND GSdxHeaders
-        GSDevice11.h
-        GSDevice9.h
-        GSDeviceDX.h
-        GSRendererDX11.h
-        GSRendererDX9.h
-        GSRendererDX.h
-        GSTexture11.h
-        GSTexture9.h
-        GSTextureCache11.h
-        GSTextureCache9.h
-        GSWndDX.h
-        GSWndWGL.h
+        Renderers/DX11/GSDevice11.h
+        Renderers/DX9/GSDevice9.h
+        Renderers/DXCommon/GSDeviceDX.h
+        Renderers/DX11/GSRendererDX11.h
+        Renderers/DX9/GSRendererDX9.h
+        Renderers/DXCommon/GSRendererDX.h
+        Renderers/DX11/GSTexture11.h
+        Renderers/DX9/GSTexture9.h
+        Renderers/DX11/GSTextureCache11.h
+        Renderers/DX9/GSTextureCache9.h
+        Window/GSWndDX.h
+        Window/GSWndWGL.h
         PSX/GPUSettingsDlg.h
         resource.h
         targetver.h
         )
 else()
     LIST(APPEND GSdxSources
-        GSLinuxDialog.cpp
-        GSWndOGL.cpp
-        GSWndEGL.cpp
+        Window/GSLinuxDialog.cpp
+        Window/GSWndOGL.cpp
+        Window/GSWndEGL.cpp
         )
 
     LIST(APPEND GSdxHeaders
-        GSWndEGL.h
-        GSWndOGL.h
+        Window/GSWndEGL.h
+        Window/GSWndOGL.h
         )
 endif()
 
diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp
index 27d512c7d8..09daee37a8 100644
--- a/plugins/GSdx/GS.cpp
+++ b/plugins/GSdx/GS.cpp
@@ -22,30 +22,30 @@
 #include "stdafx.h"
 #include "GSdx.h"
 #include "GSUtil.h"
-#include "GSRendererSW.h"
-#include "GSRendererNull.h"
-#include "GSDeviceNull.h"
-#include "GSDeviceOGL.h"
-#include "GSRendererOGL.h"
-#include "GSRendererCL.h"
+#include "Renderers/SW/GSRendererSW.h"
+#include "Renderers/Null/GSRendererNull.h"
+#include "Renderers/Null/GSDeviceNull.h"
+#include "Renderers/OpenGL/GSDeviceOGL.h"
+#include "Renderers/OpenGL/GSRendererOGL.h"
+#include "Renderers/OpenCL/GSRendererCL.h"
 #include "GSLzma.h"
 
 #ifdef _WIN32
 
-#include "GSRendererDX9.h"
-#include "GSRendererDX11.h"
-#include "GSDevice9.h"
-#include "GSDevice11.h"
-#include "GSWndDX.h"
-#include "GSWndWGL.h"
-#include "GSSettingsDlg.h"
+#include "Renderers/DX9/GSRendererDX9.h"
+#include "Renderers/DX11/GSRendererDX11.h"
+#include "Renderers/DX9/GSDevice9.h"
+#include "Renderers/DX11/GSDevice11.h"
+#include "Window/GSWndDX.h"
+#include "Window/GSWndWGL.h"
+#include "Window/GSSettingsDlg.h"
 
 static HRESULT s_hr = E_FAIL;
 
 #else
 
-#include "GSWndOGL.h"
-#include "GSWndEGL.h"
+#include "Window/GSWndOGL.h"
+#include "Window/GSWndEGL.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
diff --git a/plugins/GSdx/GSCapture.h b/plugins/GSdx/GSCapture.h
index af82d8a9d6..94559d26b0 100644
--- a/plugins/GSdx/GSCapture.h
+++ b/plugins/GSdx/GSCapture.h
@@ -25,7 +25,7 @@
 #include "GSPng.h"
 
 #ifdef _WIN32
-#include "GSCaptureDlg.h"
+#include "Window/GSCaptureDlg.h"
 #endif
 
 class GSCapture
diff --git a/plugins/GSdx/GSDump.h b/plugins/GSdx/GSDump.h
index e9fe59baa2..6db9163862 100644
--- a/plugins/GSdx/GSDump.h
+++ b/plugins/GSdx/GSDump.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GS.h"
-#include "GSVertexSW.h"
+#include "Renderers/SW/GSVertexSW.h"
 #include <lzma.h>
 
 /*
diff --git a/plugins/GSdx/GSLocalMemory.cpp b/plugins/GSdx/GSLocalMemory.cpp
index 76477dbbfd..ad456ef436 100644
--- a/plugins/GSdx/GSLocalMemory.cpp
+++ b/plugins/GSdx/GSLocalMemory.cpp
@@ -2008,7 +2008,7 @@ void GSLocalMemory::ReadTextureBlock4HHP(uint32 bp, uint8* dst, int dstpitch, co
 
 //
 
-#include "GSTextureSW.h"
+#include "Renderers/SW/GSTextureSW.h"
 
 void GSLocalMemory::SaveBMP(const std::string& fn, uint32 bp, uint32 bw, uint32 psm, int w, int h)
 {
diff --git a/plugins/GSdx/GSState.h b/plugins/GSdx/GSState.h
index ee1b937937..62e1fe2652 100644
--- a/plugins/GSdx/GSState.h
+++ b/plugins/GSdx/GSState.h
@@ -25,12 +25,12 @@
 #include "GSLocalMemory.h"
 #include "GSDrawingContext.h"
 #include "GSDrawingEnvironment.h"
-#include "GSVertex.h"
-#include "GSVertexTrace.h"
+#include "Renderers/Common/GSVertex.h"
+#include "Renderers/Common/GSVertexTrace.h"
 #include "GSUtil.h"
 #include "GSPerfMon.h"
 #include "GSVector.h"
-#include "GSDevice.h"
+#include "Renderers/Common/GSDevice.h"
 #include "GSCrc.h"
 #include "GSAlignedClass.h"
 #include "GSDump.h"
diff --git a/plugins/GSdx/GSTextureFX.cpp b/plugins/GSdx/GSTextureFX.cpp
deleted file mode 100644
index 4deab34da2..0000000000
--- a/plugins/GSdx/GSTextureFX.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *	Copyright (C) 2007-2009 Gabest
- *	http://www.gabest.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "stdafx.h"
-#include "GSTextureFX.h"
-
-GSTextureFX::GSTextureFX()
-	: m_dev(NULL)
-{
-}
-
-bool GSTextureFX::Create(GSDevice* dev)
-{
-	m_dev = dev;
-
-	return true;
-}
-
diff --git a/plugins/GSdx/GSThread_CXX11.h b/plugins/GSdx/GSThread_CXX11.h
index 938b609710..5fa266fb04 100644
--- a/plugins/GSdx/GSThread_CXX11.h
+++ b/plugins/GSdx/GSThread_CXX11.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GSdx.h"
-#include "boost_spsc_queue.hpp"
+#include "Utilities/boost_spsc_queue.hpp"
 
 template<class T, int CAPACITY> class GSJobQueue final
 {
diff --git a/plugins/GSdx/GSUtil.cpp b/plugins/GSdx/GSUtil.cpp
index 6f08745216..8e6a27f6e6 100644
--- a/plugins/GSdx/GSUtil.cpp
+++ b/plugins/GSdx/GSUtil.cpp
@@ -23,7 +23,7 @@
 #include "GSUtil.h"
 
 #ifdef _WIN32
-#include "GSDeviceDX.h"
+#include "Renderers/DXCommon/GSDeviceDX.h"
 #include <VersionHelpers.h>
 #include "svnrev.h"
 #else
diff --git a/plugins/GSdx/GSdx.h b/plugins/GSdx/GSdx.h
index 4cc1595925..cfd47d7790 100644
--- a/plugins/GSdx/GSdx.h
+++ b/plugins/GSdx/GSdx.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSSetting.h"
+#include "Window/GSSetting.h"
 #include "GS.h"
 
 class GSdxApp
diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj
index 421acd2d54..e21bb692f7 100644
--- a/plugins/GSdx/GSdx.vcxproj
+++ b/plugins/GSdx/GSdx.vcxproj
@@ -90,85 +90,85 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="GLLoader.cpp" />
-    <ClCompile Include="GLState.cpp" />
+    <ClCompile Include="Renderers\OpenGL\GLLoader.cpp" />
+    <ClCompile Include="Renderers\OpenGL\GLState.cpp" />
     <ClCompile Include="GS.cpp" />
     <ClCompile Include="GSAlignedClass.cpp" />
     <ClCompile Include="GSBlock.cpp" />
     <ClCompile Include="GSCapture.cpp" />
-    <ClCompile Include="GSCaptureDlg.cpp" />
+    <ClCompile Include="Window\GSCaptureDlg.cpp" />
     <ClCompile Include="GSClut.cpp" />
     <ClCompile Include="GSCodeBuffer.cpp" />
     <ClCompile Include="GSCrc.cpp" />
-    <ClCompile Include="GSDevice.cpp" />
-    <ClCompile Include="GSDevice11.cpp" />
-    <ClCompile Include="GSDevice9.cpp" />
-    <ClCompile Include="GSDeviceDX.cpp" />
-    <ClCompile Include="GSDeviceNull.cpp" />
-    <ClCompile Include="GSDeviceOGL.cpp" />
-    <ClCompile Include="GSDialog.cpp" />
-    <ClCompile Include="GSDirtyRect.cpp" />
+    <ClCompile Include="Renderers\Common\GSDevice.cpp" />
+    <ClCompile Include="Renderers\DX11\GSDevice11.cpp" />
+    <ClCompile Include="Renderers\DX9\GSDevice9.cpp" />
+    <ClCompile Include="Renderers\DXCommon\GSDeviceDX.cpp" />
+    <ClCompile Include="Renderers\Null\GSDeviceNull.cpp" />
+    <ClCompile Include="Renderers\OpenGL\GSDeviceOGL.cpp" />
+    <ClCompile Include="Window\GSDialog.cpp" />
+    <ClCompile Include="Renderers\Common\GSDirtyRect.cpp" />
     <ClCompile Include="GSDrawingContext.cpp" />
-    <ClCompile Include="GSDrawScanline.cpp" />
-    <ClCompile Include="GSDrawScanlineCodeGenerator.cpp" />
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x64.avx.cpp" />
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x64.avx2.cpp" />
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x64.cpp" />
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x86.avx.cpp" />
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x86.avx2.cpp" />
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x86.cpp" />
+    <ClCompile Include="Renderers\SW\GSDrawScanline.cpp" />
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.cpp" />
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x64.avx.cpp" />
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x64.avx2.cpp" />
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x64.cpp" />
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x86.avx.cpp" />
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x86.avx2.cpp" />
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x86.cpp" />
     <ClCompile Include="GSDump.cpp" />
     <ClCompile Include="GSdx.cpp" />
-    <ClCompile Include="GSFunctionMap.cpp" />
-    <ClCompile Include="GSHwHack.cpp" />
+    <ClCompile Include="Renderers\Common\GSFunctionMap.cpp" />
+    <ClCompile Include="Renderers\HW\GSHwHack.cpp" />
     <ClCompile Include="GSLocalMemory.cpp" />
     <ClCompile Include="GSLzma.cpp" />
     <ClCompile Include="GSPerfMon.cpp" />
-    <ClCompile Include="GSOsdManager.cpp" />
+    <ClCompile Include="Renderers\Common\GSOsdManager.cpp" />
     <ClCompile Include="GSPng.cpp" />
-    <ClCompile Include="GSRasterizer.cpp" />
-    <ClCompile Include="GSRenderer.cpp" />
-    <ClCompile Include="GSRendererCL.cpp" />
-    <ClCompile Include="GSRendererDX.cpp" />
-    <ClCompile Include="GSRendererDX11.cpp" />
-    <ClCompile Include="GSRendererDX9.cpp" />
-    <ClCompile Include="GSRendererHW.cpp" />
-    <ClCompile Include="GSRendererNull.cpp" />
-    <ClCompile Include="GSRendererOGL.cpp" />
-    <ClCompile Include="GSRendererSW.cpp" />
-    <ClCompile Include="GSSetting.cpp" />
-    <ClCompile Include="GSSettingsDlg.cpp" />
-    <ClCompile Include="GSSetupPrimCodeGenerator.cpp" />
-    <ClCompile Include="GSSetupPrimCodeGenerator.x64.avx.cpp" />
-    <ClCompile Include="GSSetupPrimCodeGenerator.x64.avx2.cpp" />
-    <ClCompile Include="GSSetupPrimCodeGenerator.x64.cpp" />
-    <ClCompile Include="GSSetupPrimCodeGenerator.x86.avx.cpp" />
-    <ClCompile Include="GSSetupPrimCodeGenerator.x86.avx2.cpp" />
-    <ClCompile Include="GSSetupPrimCodeGenerator.x86.cpp" />
-    <ClCompile Include="GSShaderOGL.cpp" />
+    <ClCompile Include="Renderers\SW\GSRasterizer.cpp" />
+    <ClCompile Include="Renderers\Common\GSRenderer.cpp" />
+    <ClCompile Include="Renderers\OpenCL\GSRendererCL.cpp" />
+    <ClCompile Include="Renderers\DXCommon\GSRendererDX.cpp" />
+    <ClCompile Include="Renderers\DX11\GSRendererDX11.cpp" />
+    <ClCompile Include="Renderers\DX9\GSRendererDX9.cpp" />
+    <ClCompile Include="Renderers\HW\GSRendererHW.cpp" />
+    <ClCompile Include="Renderers\Null\GSRendererNull.cpp" />
+    <ClCompile Include="Renderers\OpenGL\GSRendererOGL.cpp" />
+    <ClCompile Include="Renderers\SW\GSRendererSW.cpp" />
+    <ClCompile Include="Window\GSSetting.cpp" />
+    <ClCompile Include="Window\GSSettingsDlg.cpp" />
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.cpp" />
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x64.avx.cpp" />
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x64.avx2.cpp" />
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x64.cpp" />
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x86.avx.cpp" />
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x86.avx2.cpp" />
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x86.cpp" />
+    <ClCompile Include="Renderers\OpenGL\GSShaderOGL.cpp" />
     <ClCompile Include="GSState.cpp" />
     <ClCompile Include="GSTables.cpp" />
-    <ClCompile Include="GSTexture.cpp" />
-    <ClCompile Include="GSTexture11.cpp" />
-    <ClCompile Include="GSTexture9.cpp" />
-    <ClCompile Include="GSTextureOGL.cpp" />
-    <ClCompile Include="GSTextureCache.cpp" />
-    <ClCompile Include="GSTextureCache11.cpp" />
-    <ClCompile Include="GSTextureCache9.cpp" />
-    <ClCompile Include="GSTextureCacheOGL.cpp" />
-    <ClCompile Include="GSTextureCacheSW.cpp" />
-    <ClCompile Include="GSTextureFX11.cpp" />
-    <ClCompile Include="GSTextureFX9.cpp" />
-    <ClCompile Include="GSTextureNull.cpp" />
-    <ClCompile Include="GSTextureSW.cpp" />
+    <ClCompile Include="Renderers\Common\GSTexture.cpp" />
+    <ClCompile Include="Renderers\DX11\GSTexture11.cpp" />
+    <ClCompile Include="Renderers\DX9\GSTexture9.cpp" />
+    <ClCompile Include="Renderers\OpenGL\GSTextureOGL.cpp" />
+    <ClCompile Include="Renderers\Common\GSTextureCache.cpp" />
+    <ClCompile Include="Renderers\DX11\GSTextureCache11.cpp" />
+    <ClCompile Include="Renderers\DX9\GSTextureCache9.cpp" />
+    <ClCompile Include="Renderers\OpenGL\GSTextureCacheOGL.cpp" />
+    <ClCompile Include="Renderers\SW\GSTextureCacheSW.cpp" />
+    <ClCompile Include="Renderers\DX11\GSTextureFX11.cpp" />
+    <ClCompile Include="Renderers\DX9\GSTextureFX9.cpp" />
+    <ClCompile Include="Renderers\Null\GSTextureNull.cpp" />
+    <ClCompile Include="Renderers\SW\GSTextureSW.cpp" />
     <ClCompile Include="GSUtil.cpp" />
     <ClCompile Include="GSVector.cpp" />
-    <ClCompile Include="GSVertexList.cpp" />
-    <ClCompile Include="GSVertexSW.cpp" />
-    <ClCompile Include="GSVertexTrace.cpp" />
-    <ClCompile Include="GSWnd.cpp" />
-    <ClCompile Include="GSWndDX.cpp" />
-    <ClCompile Include="GSWndWGL.cpp" />
+    <ClCompile Include="Renderers\Common\GSVertexList.cpp" />
+    <ClCompile Include="Renderers\SW\GSVertexSW.cpp" />
+    <ClCompile Include="Renderers\Common\GSVertexTrace.cpp" />
+    <ClCompile Include="Window\GSWnd.cpp" />
+    <ClCompile Include="Window\GSWndDX.cpp" />
+    <ClCompile Include="Window\GSWndWGL.cpp" />
     <ClCompile Include="PSX\GPU.cpp" />
     <ClCompile Include="PSX\GPUDrawScanline.cpp" />
     <ClCompile Include="PSX\GPUDrawScanlineCodeGenerator.cpp" />
@@ -183,85 +183,84 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="boost_spsc_queue.hpp" />
     <ClInclude Include="config.h" />
-    <ClInclude Include="GLLoader.h" />
-    <ClInclude Include="GLState.h" />
+    <ClInclude Include="Renderers\OpenGL\GLLoader.h" />
+    <ClInclude Include="Renderers\OpenGL\GLState.h" />
     <ClInclude Include="GS.h" />
     <ClInclude Include="GSAlignedClass.h" />
     <ClInclude Include="GSBlock.h" />
     <ClInclude Include="GSCapture.h" />
-    <ClInclude Include="GSCaptureDlg.h" />
+    <ClInclude Include="Window\GSCaptureDlg.h" />
     <ClInclude Include="GSClut.h" />
     <ClInclude Include="GSCodeBuffer.h" />
     <ClInclude Include="GSCrc.h" />
-    <ClInclude Include="GSDevice.h" />
-    <ClInclude Include="GSDevice11.h" />
-    <ClInclude Include="GSDevice9.h" />
-    <ClInclude Include="GSDeviceDX.h" />
-    <ClInclude Include="GSDeviceNull.h" />
-    <ClInclude Include="GSDeviceOGL.h" />
-    <ClInclude Include="GSDialog.h" />
-    <ClInclude Include="GSDirtyRect.h" />
+    <ClInclude Include="Renderers\Common\GSDevice.h" />
+    <ClInclude Include="Renderers\DX11\GSDevice11.h" />
+    <ClInclude Include="Renderers\DX9\GSDevice9.h" />
+    <ClInclude Include="Renderers\DXCommon\GSDeviceDX.h" />
+    <ClInclude Include="Renderers\Null\GSDeviceNull.h" />
+    <ClInclude Include="Renderers\OpenGL\GSDeviceOGL.h" />
+    <ClInclude Include="Window\GSDialog.h" />
+    <ClInclude Include="Renderers\Common\GSDirtyRect.h" />
     <ClInclude Include="GSDrawingContext.h" />
     <ClInclude Include="GSDrawingEnvironment.h" />
-    <ClInclude Include="GSDrawScanline.h" />
-    <ClInclude Include="GSDrawScanlineCodeGenerator.h" />
+    <ClInclude Include="Renderers\SW\GSDrawScanline.h" />
+    <ClInclude Include="Renderers\SW\GSDrawScanlineCodeGenerator.h" />
     <ClInclude Include="GSDump.h" />
     <ClInclude Include="GSdx.h" />
-    <ClInclude Include="GSFastList.h" />
-    <ClInclude Include="GSFunctionMap.h" />
+    <ClInclude Include="Renderers\Common\GSFastList.h" />
+    <ClInclude Include="Renderers\Common\GSFunctionMap.h" />
     <ClInclude Include="GSLocalMemory.h" />
     <ClInclude Include="GSLzma.h" />
     <ClInclude Include="GSPerfMon.h" />
-    <ClInclude Include="GSOsdManager.h" />
+    <ClInclude Include="Renderers\Common\GSOsdManager.h" />
     <ClInclude Include="GSPng.h" />
-    <ClInclude Include="GSRasterizer.h" />
-    <ClInclude Include="GSRenderer.h" />
-    <ClInclude Include="GSRendererCL.h" />
-    <ClInclude Include="GSRendererDX.h" />
-    <ClInclude Include="GSRendererDX11.h" />
-    <ClInclude Include="GSRendererDX9.h" />
-    <ClInclude Include="GSRendererHW.h" />
-    <ClInclude Include="GSRendererNull.h" />
-    <ClInclude Include="GSRendererOGL.h" />
-    <ClInclude Include="GSRendererSW.h" />
-    <ClInclude Include="GSScanlineEnvironment.h" />
-    <ClInclude Include="GSSetting.h" />
-    <ClInclude Include="GSSettingsDlg.h" />
-    <ClInclude Include="GSSetupPrimCodeGenerator.h" />
-    <ClInclude Include="GSShaderOGL.h" />
+    <ClInclude Include="Renderers\SW\GSRasterizer.h" />
+    <ClInclude Include="Renderers\Common\GSRenderer.h" />
+    <ClInclude Include="Renderers\OpenCL\GSRendererCL.h" />
+    <ClInclude Include="Renderers\DXCommon\GSRendererDX.h" />
+    <ClInclude Include="Renderers\DX11\GSRendererDX11.h" />
+    <ClInclude Include="Renderers\DX9\GSRendererDX9.h" />
+    <ClInclude Include="Renderers\HW\GSRendererHW.h" />
+    <ClInclude Include="Renderers\Null\GSRendererNull.h" />
+    <ClInclude Include="Renderers\OpenGL\GSRendererOGL.h" />
+    <ClInclude Include="Renderers\SW\GSRendererSW.h" />
+    <ClInclude Include="Renderers\SW\GSScanlineEnvironment.h" />
+    <ClInclude Include="Window\GSSetting.h" />
+    <ClInclude Include="Window\GSSettingsDlg.h" />
+    <ClInclude Include="Renderers\SW\GSSetupPrimCodeGenerator.h" />
+    <ClInclude Include="Renderers\OpenGL\GSShaderOGL.h" />
     <ClInclude Include="GSState.h" />
     <ClInclude Include="GSTables.h" />
-    <ClInclude Include="GSTexture.h" />
-    <ClInclude Include="GSTexture11.h" />
-    <ClInclude Include="GSTexture9.h" />
-    <ClInclude Include="GSTextureOGL.h" />
-    <ClInclude Include="GSTextureCache.h" />
-    <ClInclude Include="GSTextureCache11.h" />
-    <ClInclude Include="GSTextureCache9.h" />
-    <ClInclude Include="GSTextureCacheOGL.h" />
-    <ClInclude Include="GSTextureCacheSW.h" />
-    <ClInclude Include="GSTextureNull.h" />
-    <ClInclude Include="GSTextureSW.h" />
+    <ClInclude Include="Renderers\Common\GSTexture.h" />
+    <ClInclude Include="Renderers\DX11\GSTexture11.h" />
+    <ClInclude Include="Renderers\DX9\GSTexture9.h" />
+    <ClInclude Include="Renderers\OpenGL\GSTextureOGL.h" />
+    <ClInclude Include="Renderers\Common\GSTextureCache.h" />
+    <ClInclude Include="Renderers\DX11\GSTextureCache11.h" />
+    <ClInclude Include="Renderers\DX9\GSTextureCache9.h" />
+    <ClInclude Include="Renderers\OpenGL\GSTextureCacheOGL.h" />
+    <ClInclude Include="Renderers\SW\GSTextureCacheSW.h" />
+    <ClInclude Include="Renderers\Null\GSTextureNull.h" />
+    <ClInclude Include="Renderers\SW\GSTextureSW.h" />
     <ClInclude Include="GSThread.h" />
     <ClInclude Include="GSThread_CXX11.h" />
-    <ClInclude Include="GSUniformBufferOGL.h" />
+    <ClInclude Include="Renderers\OpenGL\GSUniformBufferOGL.h" />
     <ClInclude Include="GSUtil.h" />
     <ClInclude Include="GSVector.h" />
     <ClInclude Include="GSVector4i.h" />
     <ClInclude Include="GSVector4.h" />
     <ClInclude Include="GSVector8i.h" />
     <ClInclude Include="GSVector8.h" />
-    <ClInclude Include="GSVertex.h" />
-    <ClInclude Include="GSVertexArrayOGL.h" />
-    <ClInclude Include="GSVertexHW.h" />
-    <ClInclude Include="GSVertexList.h" />
-    <ClInclude Include="GSVertexSW.h" />
-    <ClInclude Include="GSVertexTrace.h" />
-    <ClInclude Include="GSWnd.h" />
-    <ClInclude Include="GSWndDX.h" />
-    <ClInclude Include="GSWndWGL.h" />
+    <ClInclude Include="Renderers\Common\GSVertex.h" />
+    <ClInclude Include="Renderers\OpenGL\GSVertexArrayOGL.h" />
+    <ClInclude Include="Renderers\HW\GSVertexHW.h" />
+    <ClInclude Include="Renderers\Common\GSVertexList.h" />
+    <ClInclude Include="Renderers\SW\GSVertexSW.h" />
+    <ClInclude Include="Renderers\Common\GSVertexTrace.h" />
+    <ClInclude Include="Window\GSWnd.h" />
+    <ClInclude Include="Window\GSWndDX.h" />
+    <ClInclude Include="Window\GSWndWGL.h" />
     <ClInclude Include="PSX\GPU.h" />
     <ClInclude Include="PSX\GPUDrawingEnvironment.h" />
     <ClInclude Include="PSX\GPUDrawScanline.h" />
diff --git a/plugins/GSdx/GSdx.vcxproj.filters b/plugins/GSdx/GSdx.vcxproj.filters
index f38241a19d..f4dcabab9a 100644
--- a/plugins/GSdx/GSdx.vcxproj.filters
+++ b/plugins/GSdx/GSdx.vcxproj.filters
@@ -33,7 +33,7 @@
     <ClCompile Include="GSCapture.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSCaptureDlg.cpp">
+    <ClCompile Include="Window\GSCaptureDlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="GSClut.cpp">
@@ -45,31 +45,31 @@
     <ClCompile Include="GSCrc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDevice.cpp">
+    <ClCompile Include="Renderers\Common\GSDevice.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDevice11.cpp">
+    <ClCompile Include="Renderers\DX11\GSDevice11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDevice9.cpp">
+    <ClCompile Include="Renderers\DX9\GSDevice9.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDeviceNull.cpp">
+    <ClCompile Include="Renderers\Null\GSDeviceNull.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDeviceOGL.cpp">
+    <ClCompile Include="Renderers\OpenGL\GSDeviceOGL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDialog.cpp">
+    <ClCompile Include="Window\GSDialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDirtyRect.cpp">
+    <ClCompile Include="Renderers\Common\GSDirtyRect.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDrawScanline.cpp">
+    <ClCompile Include="Renderers\SW\GSDrawScanline.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDrawScanlineCodeGenerator.cpp">
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="GSDump.cpp">
@@ -78,10 +78,10 @@
     <ClCompile Include="GSdx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSFunctionMap.cpp">
+    <ClCompile Include="Renderers\Common\GSFunctionMap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSHwHack.cpp">
+    <ClCompile Include="Renderers\HW\GSHwHack.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="GSLocalMemory.cpp">
@@ -90,46 +90,43 @@
     <ClCompile Include="GSPerfMon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSOsdManager.cpp">
+    <ClCompile Include="Renderers\Common\GSOsdManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRasterizer.cpp">
+    <ClCompile Include="Renderers\SW\GSRasterizer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRenderer.cpp">
+    <ClCompile Include="Renderers\Common\GSRenderer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRendererDX.cpp">
+    <ClCompile Include="Renderers\DXCommon\GSRendererDX.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRendererDX11.cpp">
+    <ClCompile Include="Renderers\DX11\GSRendererDX11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRendererDX9.cpp">
+    <ClCompile Include="Renderers\DX9\GSRendererDX9.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRendererHW.cpp">
+    <ClCompile Include="Renderers\HW\GSRendererHW.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRendererNull.cpp">
+    <ClCompile Include="Renderers\Null\GSRendererNull.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRendererOGL.cpp">
+    <ClCompile Include="Renderers\OpenGL\GSRendererOGL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRendererSW.cpp">
+    <ClCompile Include="Renderers\SW\GSRendererSW.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSetting.cpp">
+    <ClCompile Include="Window\GSSetting.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSettingsDlg.cpp">
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSetupPrimCodeGenerator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GSShaderOGL.cpp">
+    <ClCompile Include="Renderers\OpenGL\GSShaderOGL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="GSState.cpp">
@@ -138,40 +135,40 @@
     <ClCompile Include="GSTables.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTexture.cpp">
+    <ClCompile Include="Renderers\Common\GSTexture.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTexture11.cpp">
+    <ClCompile Include="Renderers\DX11\GSTexture11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTexture9.cpp">
+    <ClCompile Include="Renderers\DX9\GSTexture9.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureOGL.cpp">
+    <ClCompile Include="Renderers\OpenGL\GSTextureOGL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureCache.cpp">
+    <ClCompile Include="Renderers\Common\GSTextureCache.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureCache11.cpp">
+    <ClCompile Include="Renderers\DX11\GSTextureCache11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureCache9.cpp">
+    <ClCompile Include="Renderers\DX9\GSTextureCache9.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureCacheOGL.cpp">
+    <ClCompile Include="Renderers\OpenGL\GSTextureCacheOGL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureCacheSW.cpp">
+    <ClCompile Include="Renderers\SW\GSTextureCacheSW.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureFX11.cpp">
+    <ClCompile Include="Renderers\DX11\GSTextureFX11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureFX9.cpp">
+    <ClCompile Include="Renderers\DX9\GSTextureFX9.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureNull.cpp">
+    <ClCompile Include="Renderers\Null\GSTextureNull.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="GSUtil.cpp">
@@ -180,76 +177,76 @@
     <ClCompile Include="GSVector.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSVertexList.cpp">
+    <ClCompile Include="Renderers\Common\GSVertexList.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSVertexSW.cpp">
+    <ClCompile Include="Renderers\SW\GSVertexSW.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSVertexTrace.cpp">
+    <ClCompile Include="Renderers\Common\GSVertexTrace.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSWnd.cpp">
+    <ClCompile Include="Window\GSWnd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSWndDX.cpp">
+    <ClCompile Include="Window\GSWndDX.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSWndWGL.cpp">
+    <ClCompile Include="Window\GSWndWGL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GLLoader.cpp">
+    <ClCompile Include="Renderers\OpenGL\GLLoader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GLState.cpp">
+    <ClCompile Include="Renderers\OpenGL\GLState.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDeviceDX.cpp">
+    <ClCompile Include="Renderers\DXCommon\GSDeviceDX.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSTextureSW.cpp">
+    <ClCompile Include="Renderers\SW\GSTextureSW.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSetupPrimCodeGenerator.x64.avx.cpp">
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x64.avx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSetupPrimCodeGenerator.x64.cpp">
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x64.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSetupPrimCodeGenerator.x86.avx.cpp">
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x86.avx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSetupPrimCodeGenerator.x86.cpp">
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x86.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x64.avx.cpp">
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x64.avx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x64.avx2.cpp">
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x64.avx2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x64.cpp">
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x64.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x86.avx.cpp">
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x86.avx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x86.cpp">
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x86.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSDrawScanlineCodeGenerator.x86.avx2.cpp">
+    <ClCompile Include="Renderers\SW\GSDrawScanlineCodeGenerator.x86.avx2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSetupPrimCodeGenerator.x86.avx2.cpp">
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x86.avx2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSSetupPrimCodeGenerator.x64.avx2.cpp">
+    <ClCompile Include="Renderers\SW\GSSetupPrimCodeGenerator.x64.avx2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GSRendererCL.cpp">
+    <ClCompile Include="Renderers\OpenCL\GSRendererCL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="GSDrawingContext.cpp">
@@ -288,12 +285,15 @@
     <ClCompile Include="GSLzma.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Window\GSSettingsDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="GLLoader.h">
+    <ClInclude Include="Renderers\OpenGL\GLLoader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GLState.h">
+    <ClInclude Include="Renderers\OpenGL\GLState.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GS.h">
@@ -308,7 +308,7 @@
     <ClInclude Include="GSCapture.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSCaptureDlg.h">
+    <ClInclude Include="Window\GSCaptureDlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSClut.h">
@@ -320,28 +320,28 @@
     <ClInclude Include="GSCrc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDevice.h">
+    <ClInclude Include="Renderers\Common\GSDevice.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDevice11.h">
+    <ClInclude Include="Renderers\DX11\GSDevice11.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDevice9.h">
+    <ClInclude Include="Renderers\DX9\GSDevice9.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDeviceDX.h">
+    <ClInclude Include="Renderers\DXCommon\GSDeviceDX.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDeviceNull.h">
+    <ClInclude Include="Renderers\Null\GSDeviceNull.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDeviceOGL.h">
+    <ClInclude Include="Renderers\OpenGL\GSDeviceOGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDialog.h">
+    <ClInclude Include="Window\GSDialog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDirtyRect.h">
+    <ClInclude Include="Renderers\Common\GSDirtyRect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSDrawingContext.h">
@@ -350,10 +350,10 @@
     <ClInclude Include="GSDrawingEnvironment.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDrawScanline.h">
+    <ClInclude Include="Renderers\SW\GSDrawScanline.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSDrawScanlineCodeGenerator.h">
+    <ClInclude Include="Renderers\SW\GSDrawScanlineCodeGenerator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSDump.h">
@@ -362,7 +362,7 @@
     <ClInclude Include="GSdx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSFunctionMap.h">
+    <ClInclude Include="Renderers\Common\GSFunctionMap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSLocalMemory.h">
@@ -371,49 +371,49 @@
     <ClInclude Include="GSPerfMon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSOsdManager.h">
+    <ClInclude Include="Renderers\Common\GSOsdManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRasterizer.h">
+    <ClInclude Include="Renderers\SW\GSRasterizer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRenderer.h">
+    <ClInclude Include="Renderers\Common\GSRenderer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRendererDX.h">
+    <ClInclude Include="Renderers\DXCommon\GSRendererDX.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRendererDX11.h">
+    <ClInclude Include="Renderers\DX11\GSRendererDX11.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRendererDX9.h">
+    <ClInclude Include="Renderers\DX9\GSRendererDX9.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRendererHW.h">
+    <ClInclude Include="Renderers\HW\GSRendererHW.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRendererNull.h">
+    <ClInclude Include="Renderers\Null\GSRendererNull.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRendererOGL.h">
+    <ClInclude Include="Renderers\OpenGL\GSRendererOGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRendererSW.h">
+    <ClInclude Include="Renderers\SW\GSRendererSW.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSScanlineEnvironment.h">
+    <ClInclude Include="Renderers\SW\GSScanlineEnvironment.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSSetting.h">
+    <ClInclude Include="Window\GSSetting.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSSettingsDlg.h">
+    <ClInclude Include="Window\GSSettingsDlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSSetupPrimCodeGenerator.h">
+    <ClInclude Include="Renderers\SW\GSSetupPrimCodeGenerator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSShaderOGL.h">
+    <ClInclude Include="Renderers\OpenGL\GSShaderOGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSState.h">
@@ -422,40 +422,40 @@
     <ClInclude Include="GSTables.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTexture.h">
+    <ClInclude Include="Renderers\Common\GSTexture.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTexture11.h">
+    <ClInclude Include="Renderers\DX11\GSTexture11.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTexture9.h">
+    <ClInclude Include="Renderers\DX9\GSTexture9.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTextureOGL.h">
+    <ClInclude Include="Renderers\OpenGL\GSTextureOGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTextureCache.h">
+    <ClInclude Include="Renderers\Common\GSTextureCache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTextureCache11.h">
+    <ClInclude Include="Renderers\DX11\GSTextureCache11.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTextureCache9.h">
+    <ClInclude Include="Renderers\DX9\GSTextureCache9.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTextureCacheOGL.h">
+    <ClInclude Include="Renderers\OpenGL\GSTextureCacheOGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTextureCacheSW.h">
+    <ClInclude Include="Renderers\SW\GSTextureCacheSW.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSTextureNull.h">
+    <ClInclude Include="Renderers\Null\GSTextureNull.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSThread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSUniformBufferOGL.h">
+    <ClInclude Include="Renderers\OpenGL\GSUniformBufferOGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSUtil.h">
@@ -476,31 +476,31 @@
     <ClInclude Include="GSVector8.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSVertex.h">
+    <ClInclude Include="Renderers\Common\GSVertex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSVertexArrayOGL.h">
+    <ClInclude Include="Renderers\OpenGL\GSVertexArrayOGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSVertexHW.h">
+    <ClInclude Include="Renderers\HW\GSVertexHW.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSVertexList.h">
+    <ClInclude Include="Renderers\Common\GSVertexList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSVertexSW.h">
+    <ClInclude Include="Renderers\SW\GSVertexSW.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSVertexTrace.h">
+    <ClInclude Include="Renderers\Common\GSVertexTrace.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSWnd.h">
+    <ClInclude Include="Window\GSWnd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSWndDX.h">
+    <ClInclude Include="Window\GSWndDX.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSWndWGL.h">
+    <ClInclude Include="Window\GSWndWGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="stdafx.h">
@@ -521,7 +521,7 @@
     <ClInclude Include="xbyak\xbyak_util.h">
       <Filter>Xbyak</Filter>
     </ClInclude>
-    <ClInclude Include="GSTextureSW.h">
+    <ClInclude Include="Renderers\SW\GSTextureSW.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="config.h">
@@ -530,7 +530,7 @@
     <ClInclude Include="targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSRendererCL.h">
+    <ClInclude Include="Renderers\OpenCL\GSRendererCL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSPng.h">
@@ -572,18 +572,15 @@
     <ClInclude Include="PSX\GPUVertex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="boost_spsc_queue.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GSFastList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="GSThread_CXX11.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="GSLzma.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Renderers\Common\GSFastList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\logo9.bmp">
@@ -640,4 +637,4 @@
       <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/plugins/GSdx/PSX/GPU.cpp b/plugins/GSdx/PSX/GPU.cpp
index 703075c70f..a9127c3488 100644
--- a/plugins/GSdx/PSX/GPU.cpp
+++ b/plugins/GSdx/PSX/GPU.cpp
@@ -22,14 +22,14 @@
 #include "stdafx.h"
 #include "GSdx.h"
 #include "GSUtil.h"
-#include "GSDeviceNull.h"
+#include "Renderers/Null/GSDeviceNull.h"
 #include "GPURendererSW.h"
 
 #ifdef _WIN32
 
 #include "GPUSettingsDlg.h"
-#include "GSDevice9.h"
-#include "GSDevice11.h"
+#include "Renderers/DX9/GSDevice9.h"
+#include "Renderers/DX11/GSDevice11.h"
 
 static HRESULT s_hr = E_FAIL;
 
diff --git a/plugins/GSdx/PSX/GPUDrawScanline.h b/plugins/GSdx/PSX/GPUDrawScanline.h
index e65f31d708..aff3ea7c63 100644
--- a/plugins/GSdx/PSX/GPUDrawScanline.h
+++ b/plugins/GSdx/PSX/GPUDrawScanline.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GPUState.h"
-#include "GSRasterizer.h"
+#include "Renderers/SW/GSRasterizer.h"
 #include "GPUScanlineEnvironment.h"
 #include "GPUSetupPrimCodeGenerator.h"
 #include "GPUDrawScanlineCodeGenerator.h"
diff --git a/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.cpp b/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.cpp
index 8f0f1508a2..02d2fe8c3a 100644
--- a/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.cpp
+++ b/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.cpp
@@ -23,7 +23,7 @@
 
 #include "stdafx.h"
 #include "GPUDrawScanlineCodeGenerator.h"
-#include "GSVertexSW.h"
+#include "Renderers/SW/GSVertexSW.h"
 
 static const int _args = 8;
 static const int _top = _args + 4;
diff --git a/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.h b/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.h
index d522c8146a..0ab869893c 100644
--- a/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.h
+++ b/plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GPUScanlineEnvironment.h"
-#include "GSFunctionMap.h"
+#include "Renderers/Common/GSFunctionMap.h"
 
 using namespace Xbyak;
 
diff --git a/plugins/GSdx/PSX/GPULocalMemory.cpp b/plugins/GSdx/PSX/GPULocalMemory.cpp
index 1fc431d565..41bb93e105 100644
--- a/plugins/GSdx/PSX/GPULocalMemory.cpp
+++ b/plugins/GSdx/PSX/GPULocalMemory.cpp
@@ -581,7 +581,7 @@ void GPULocalMemory::Expand24(const uint16* RESTRICT src, uint32* RESTRICT dst,
 	}
 }
 
-#include "GSTextureSW.h"
+#include "Renderers/SW/GSTextureSW.h"
 
 void GPULocalMemory::SaveBMP(const std::string& fn, const GSVector4i& r2, int tp, int cx, int cy)
 {
diff --git a/plugins/GSdx/PSX/GPURenderer.h b/plugins/GSdx/PSX/GPURenderer.h
index 631346d887..566bbfd95e 100644
--- a/plugins/GSdx/PSX/GPURenderer.h
+++ b/plugins/GSdx/PSX/GPURenderer.h
@@ -22,10 +22,10 @@
 #pragma once
 
 #include "GPUState.h"
-#include "GSVertexList.h"
-#include "GSDevice.h"
+#include "Renderers/Common/GSVertexList.h"
+#include "Renderers/Common/GSDevice.h"
 #ifdef _WIN32
-#include "GSWndDX.h"
+#include "Window/GSWndDX.h"
 #endif
 
 class GPURenderer : public GPUState
diff --git a/plugins/GSdx/PSX/GPUSettingsDlg.h b/plugins/GSdx/PSX/GPUSettingsDlg.h
index 8d05952427..97c488904e 100644
--- a/plugins/GSdx/PSX/GPUSettingsDlg.h
+++ b/plugins/GSdx/PSX/GPUSettingsDlg.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "GSDialog.h"
-#include "GSSetting.h"
+#include "Window/GSDialog.h"
+#include "Window/GSSetting.h"
 
 class GPUSettingsDlg : public GSDialog
 {
diff --git a/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.cpp b/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.cpp
index 9539205ecf..6766b55fbd 100644
--- a/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.cpp
+++ b/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.cpp
@@ -23,7 +23,7 @@
 
 #include "stdafx.h"
 #include "GPUSetupPrimCodeGenerator.h"
-#include "GSVertexSW.h"
+#include "Renderers/SW/GSVertexSW.h"
 
 using namespace Xbyak;
 
diff --git a/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.h b/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.h
index 056c833712..6e39acbb79 100644
--- a/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.h
+++ b/plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GPUScanlineEnvironment.h"
-#include "GSFunctionMap.h"
+#include "Renderers/Common/GSFunctionMap.h"
 
 class GPUSetupPrimCodeGenerator : public GSCodeGenerator
 {
diff --git a/plugins/GSdx/GSDevice.cpp b/plugins/GSdx/Renderers/Common/GSDevice.cpp
similarity index 100%
rename from plugins/GSdx/GSDevice.cpp
rename to plugins/GSdx/Renderers/Common/GSDevice.cpp
diff --git a/plugins/GSdx/GSDevice.h b/plugins/GSdx/Renderers/Common/GSDevice.h
similarity index 99%
rename from plugins/GSdx/GSDevice.h
rename to plugins/GSdx/Renderers/Common/GSDevice.h
index a55a995915..489077e6c9 100644
--- a/plugins/GSdx/GSDevice.h
+++ b/plugins/GSdx/Renderers/Common/GSDevice.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GSFastList.h"
-#include "GSWnd.h"
+#include "Window/GSWnd.h"
 #include "GSTexture.h"
 #include "GSVertex.h"
 #include "GSAlignedClass.h"
diff --git a/plugins/GSdx/GSDirtyRect.cpp b/plugins/GSdx/Renderers/Common/GSDirtyRect.cpp
similarity index 100%
rename from plugins/GSdx/GSDirtyRect.cpp
rename to plugins/GSdx/Renderers/Common/GSDirtyRect.cpp
diff --git a/plugins/GSdx/GSDirtyRect.h b/plugins/GSdx/Renderers/Common/GSDirtyRect.h
similarity index 100%
rename from plugins/GSdx/GSDirtyRect.h
rename to plugins/GSdx/Renderers/Common/GSDirtyRect.h
diff --git a/plugins/GSdx/GSFastList.h b/plugins/GSdx/Renderers/Common/GSFastList.h
similarity index 100%
rename from plugins/GSdx/GSFastList.h
rename to plugins/GSdx/Renderers/Common/GSFastList.h
diff --git a/plugins/GSdx/GSFunctionMap.cpp b/plugins/GSdx/Renderers/Common/GSFunctionMap.cpp
similarity index 100%
rename from plugins/GSdx/GSFunctionMap.cpp
rename to plugins/GSdx/Renderers/Common/GSFunctionMap.cpp
diff --git a/plugins/GSdx/GSFunctionMap.h b/plugins/GSdx/Renderers/Common/GSFunctionMap.h
similarity index 99%
rename from plugins/GSdx/GSFunctionMap.h
rename to plugins/GSdx/Renderers/Common/GSFunctionMap.h
index b47d97bb81..d944184df0 100644
--- a/plugins/GSdx/GSFunctionMap.h
+++ b/plugins/GSdx/Renderers/Common/GSFunctionMap.h
@@ -26,7 +26,7 @@
 #include "xbyak/xbyak.h"
 #include "xbyak/xbyak_util.h"
 
-#include "GSScanlineEnvironment.h"
+#include "Renderers/SW/GSScanlineEnvironment.h"
 
 template<class KEY, class VALUE> class GSFunctionMap
 {
diff --git a/plugins/GSdx/GSOsdManager.cpp b/plugins/GSdx/Renderers/Common/GSOsdManager.cpp
similarity index 100%
rename from plugins/GSdx/GSOsdManager.cpp
rename to plugins/GSdx/Renderers/Common/GSOsdManager.cpp
diff --git a/plugins/GSdx/GSOsdManager.h b/plugins/GSdx/Renderers/Common/GSOsdManager.h
similarity index 100%
rename from plugins/GSdx/GSOsdManager.h
rename to plugins/GSdx/Renderers/Common/GSOsdManager.h
diff --git a/plugins/GSdx/GSRenderer.cpp b/plugins/GSdx/Renderers/Common/GSRenderer.cpp
similarity index 100%
rename from plugins/GSdx/GSRenderer.cpp
rename to plugins/GSdx/Renderers/Common/GSRenderer.cpp
diff --git a/plugins/GSdx/GSRenderer.h b/plugins/GSdx/Renderers/Common/GSRenderer.h
similarity index 98%
rename from plugins/GSdx/GSRenderer.h
rename to plugins/GSdx/Renderers/Common/GSRenderer.h
index e618e1a980..a56074118c 100644
--- a/plugins/GSdx/GSRenderer.h
+++ b/plugins/GSdx/Renderers/Common/GSRenderer.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GSdx.h"
-#include "GSWnd.h"
+#include "Window/GSWnd.h"
 #include "GSState.h"
 #include "GSCapture.h"
 
diff --git a/plugins/GSdx/GSTexture.cpp b/plugins/GSdx/Renderers/Common/GSTexture.cpp
similarity index 100%
rename from plugins/GSdx/GSTexture.cpp
rename to plugins/GSdx/Renderers/Common/GSTexture.cpp
diff --git a/plugins/GSdx/GSTexture.h b/plugins/GSdx/Renderers/Common/GSTexture.h
similarity index 100%
rename from plugins/GSdx/GSTexture.h
rename to plugins/GSdx/Renderers/Common/GSTexture.h
diff --git a/plugins/GSdx/GSTextureCache.cpp b/plugins/GSdx/Renderers/Common/GSTextureCache.cpp
similarity index 99%
rename from plugins/GSdx/GSTextureCache.cpp
rename to plugins/GSdx/Renderers/Common/GSTextureCache.cpp
index 95734913c0..b2a9a5bb4a 100644
--- a/plugins/GSdx/GSTextureCache.cpp
+++ b/plugins/GSdx/Renderers/Common/GSTextureCache.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "stdafx.h"
-#include "GSTextureCache.h"
+#include "Renderers/Common/GSTextureCache.h"
 #include "GSUtil.h"
 
 bool s_IS_DIRECT3D11 = false;
diff --git a/plugins/GSdx/GSTextureCache.h b/plugins/GSdx/Renderers/Common/GSTextureCache.h
similarity index 100%
rename from plugins/GSdx/GSTextureCache.h
rename to plugins/GSdx/Renderers/Common/GSTextureCache.h
diff --git a/plugins/GSdx/GSVertex.h b/plugins/GSdx/Renderers/Common/GSVertex.h
similarity index 96%
rename from plugins/GSdx/GSVertex.h
rename to plugins/GSdx/Renderers/Common/GSVertex.h
index 606613cfbe..ee1d4a2a15 100644
--- a/plugins/GSdx/GSVertex.h
+++ b/plugins/GSdx/Renderers/Common/GSVertex.h
@@ -23,8 +23,8 @@
 
 #include "GS.h"
 #include "GSVector.h"
-#include "GSVertexHW.h"
-#include "GSVertexSW.h"
+#include "Renderers/HW/GSVertexHW.h"
+#include "Renderers/SW/GSVertexSW.h"
 
 #pragma pack(push, 1)
 
diff --git a/plugins/GSdx/GSVertexList.cpp b/plugins/GSdx/Renderers/Common/GSVertexList.cpp
similarity index 100%
rename from plugins/GSdx/GSVertexList.cpp
rename to plugins/GSdx/Renderers/Common/GSVertexList.cpp
diff --git a/plugins/GSdx/GSVertexList.h b/plugins/GSdx/Renderers/Common/GSVertexList.h
similarity index 100%
rename from plugins/GSdx/GSVertexList.h
rename to plugins/GSdx/Renderers/Common/GSVertexList.h
diff --git a/plugins/GSdx/GSVertexTrace.cpp b/plugins/GSdx/Renderers/Common/GSVertexTrace.cpp
similarity index 100%
rename from plugins/GSdx/GSVertexTrace.cpp
rename to plugins/GSdx/Renderers/Common/GSVertexTrace.cpp
diff --git a/plugins/GSdx/GSVertexTrace.h b/plugins/GSdx/Renderers/Common/GSVertexTrace.h
similarity index 96%
rename from plugins/GSdx/GSVertexTrace.h
rename to plugins/GSdx/Renderers/Common/GSVertexTrace.h
index 59c5a0de14..a3c0741ee6 100644
--- a/plugins/GSdx/GSVertexTrace.h
+++ b/plugins/GSdx/Renderers/Common/GSVertexTrace.h
@@ -23,8 +23,8 @@
 
 #include "GSDrawingContext.h"
 #include "GSVertex.h"
-#include "GSVertexSW.h"
-#include "GSVertexHW.h"
+#include "Renderers/SW/GSVertexSW.h"
+#include "Renderers/HW/GSVertexHW.h"
 #include "GSFunctionMap.h"
 
 class GSState;
diff --git a/plugins/GSdx/GSDevice11.cpp b/plugins/GSdx/Renderers/DX11/GSDevice11.cpp
similarity index 100%
rename from plugins/GSdx/GSDevice11.cpp
rename to plugins/GSdx/Renderers/DX11/GSDevice11.cpp
diff --git a/plugins/GSdx/GSDevice11.h b/plugins/GSdx/Renderers/DX11/GSDevice11.h
similarity index 99%
rename from plugins/GSdx/GSDevice11.h
rename to plugins/GSdx/Renderers/DX11/GSDevice11.h
index 0db9581d76..dc7a1da083 100644
--- a/plugins/GSdx/GSDevice11.h
+++ b/plugins/GSdx/Renderers/DX11/GSDevice11.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSDeviceDX.h"
+#include "Renderers\DXCommon\GSDeviceDX.h"
 #include "GSTexture11.h"
 
 struct GSVertexShader11
diff --git a/plugins/GSdx/GSRendererDX11.cpp b/plugins/GSdx/Renderers/DX11/GSRendererDX11.cpp
similarity index 100%
rename from plugins/GSdx/GSRendererDX11.cpp
rename to plugins/GSdx/Renderers/DX11/GSRendererDX11.cpp
diff --git a/plugins/GSdx/GSRendererDX11.h b/plugins/GSdx/Renderers/DX11/GSRendererDX11.h
similarity index 93%
rename from plugins/GSdx/GSRendererDX11.h
rename to plugins/GSdx/Renderers/DX11/GSRendererDX11.h
index e24e1d53b3..60833daae7 100644
--- a/plugins/GSdx/GSRendererDX11.h
+++ b/plugins/GSdx/Renderers/DX11/GSRendererDX11.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "GSRendererDX.h"
-#include "GSVertexHW.h"
+#include "Renderers/DXCommon/GSRendererDX.h"
+#include "Renderers/HW/GSVertexHW.h"
 #include "GSTextureCache11.h"
 
 class GSRendererDX11 : public GSRendererDX
diff --git a/plugins/GSdx/GSTexture11.cpp b/plugins/GSdx/Renderers/DX11/GSTexture11.cpp
similarity index 100%
rename from plugins/GSdx/GSTexture11.cpp
rename to plugins/GSdx/Renderers/DX11/GSTexture11.cpp
diff --git a/plugins/GSdx/GSTexture11.h b/plugins/GSdx/Renderers/DX11/GSTexture11.h
similarity index 97%
rename from plugins/GSdx/GSTexture11.h
rename to plugins/GSdx/Renderers/DX11/GSTexture11.h
index 366f353a93..570fb614e9 100644
--- a/plugins/GSdx/GSTexture11.h
+++ b/plugins/GSdx/Renderers/DX11/GSTexture11.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSTexture.h"
+#include "Renderers/Common/GSTexture.h"
 
 class GSTexture11 : public GSTexture
 {
diff --git a/plugins/GSdx/GSTextureCache11.cpp b/plugins/GSdx/Renderers/DX11/GSTextureCache11.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureCache11.cpp
rename to plugins/GSdx/Renderers/DX11/GSTextureCache11.cpp
diff --git a/plugins/GSdx/GSTextureCache11.h b/plugins/GSdx/Renderers/DX11/GSTextureCache11.h
similarity index 96%
rename from plugins/GSdx/GSTextureCache11.h
rename to plugins/GSdx/Renderers/DX11/GSTextureCache11.h
index 0c6f6264fa..e65d0fb442 100644
--- a/plugins/GSdx/GSTextureCache11.h
+++ b/plugins/GSdx/Renderers/DX11/GSTextureCache11.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSTextureCache.h"
+#include "Renderers/Common/GSTextureCache.h"
 #include "GSDevice11.h"
 
 class GSTextureCache11 : public GSTextureCache
diff --git a/plugins/GSdx/GSTextureFX11.cpp b/plugins/GSdx/Renderers/DX11/GSTextureFX11.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureFX11.cpp
rename to plugins/GSdx/Renderers/DX11/GSTextureFX11.cpp
diff --git a/plugins/GSdx/GSDevice9.cpp b/plugins/GSdx/Renderers/DX9/GSDevice9.cpp
similarity index 100%
rename from plugins/GSdx/GSDevice9.cpp
rename to plugins/GSdx/Renderers/DX9/GSDevice9.cpp
diff --git a/plugins/GSdx/GSDevice9.h b/plugins/GSdx/Renderers/DX9/GSDevice9.h
similarity index 99%
rename from plugins/GSdx/GSDevice9.h
rename to plugins/GSdx/Renderers/DX9/GSDevice9.h
index 2f9b545ebf..976859ca31 100644
--- a/plugins/GSdx/GSDevice9.h
+++ b/plugins/GSdx/Renderers/DX9/GSDevice9.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSDeviceDX.h"
+#include "Renderers/DXCommon/GSDeviceDX.h"
 #include "GSTexture9.h"
 
 struct Direct3DSamplerState9
diff --git a/plugins/GSdx/GSRendererDX9.cpp b/plugins/GSdx/Renderers/DX9/GSRendererDX9.cpp
similarity index 100%
rename from plugins/GSdx/GSRendererDX9.cpp
rename to plugins/GSdx/Renderers/DX9/GSRendererDX9.cpp
diff --git a/plugins/GSdx/GSRendererDX9.h b/plugins/GSdx/Renderers/DX9/GSRendererDX9.h
similarity index 93%
rename from plugins/GSdx/GSRendererDX9.h
rename to plugins/GSdx/Renderers/DX9/GSRendererDX9.h
index f89945449a..970be1e195 100644
--- a/plugins/GSdx/GSRendererDX9.h
+++ b/plugins/GSdx/Renderers/DX9/GSRendererDX9.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "GSRendererDX.h"
-#include "GSVertexHW.h"
+#include "Renderers/DXCommon/GSRendererDX.h"
+#include "Renderers/HW/GSVertexHW.h"
 #include "GSTextureCache9.h"
 
 class GSRendererDX9 : public GSRendererDX
diff --git a/plugins/GSdx/GSTexture9.cpp b/plugins/GSdx/Renderers/DX9/GSTexture9.cpp
similarity index 100%
rename from plugins/GSdx/GSTexture9.cpp
rename to plugins/GSdx/Renderers/DX9/GSTexture9.cpp
diff --git a/plugins/GSdx/GSTexture9.h b/plugins/GSdx/Renderers/DX9/GSTexture9.h
similarity index 97%
rename from plugins/GSdx/GSTexture9.h
rename to plugins/GSdx/Renderers/DX9/GSTexture9.h
index d82a3a18b8..bea64c20a7 100644
--- a/plugins/GSdx/GSTexture9.h
+++ b/plugins/GSdx/Renderers/DX9/GSTexture9.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSTexture.h"
+#include "Renderers/Common/GSTexture.h"
 
 class GSTexture9 : public GSTexture
 {
diff --git a/plugins/GSdx/GSTextureCache9.cpp b/plugins/GSdx/Renderers/DX9/GSTextureCache9.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureCache9.cpp
rename to plugins/GSdx/Renderers/DX9/GSTextureCache9.cpp
diff --git a/plugins/GSdx/GSTextureCache9.h b/plugins/GSdx/Renderers/DX9/GSTextureCache9.h
similarity index 96%
rename from plugins/GSdx/GSTextureCache9.h
rename to plugins/GSdx/Renderers/DX9/GSTextureCache9.h
index 43852cd9db..fbbc16a154 100644
--- a/plugins/GSdx/GSTextureCache9.h
+++ b/plugins/GSdx/Renderers/DX9/GSTextureCache9.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSTextureCache.h"
+#include "Renderers/Common/GSTextureCache.h"
 #include "GSDevice9.h"
 
 class GSTextureCache9 : public GSTextureCache
diff --git a/plugins/GSdx/GSTextureFX9.cpp b/plugins/GSdx/Renderers/DX9/GSTextureFX9.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureFX9.cpp
rename to plugins/GSdx/Renderers/DX9/GSTextureFX9.cpp
diff --git a/plugins/GSdx/GSDeviceDX.cpp b/plugins/GSdx/Renderers/DXCommon/GSDeviceDX.cpp
similarity index 100%
rename from plugins/GSdx/GSDeviceDX.cpp
rename to plugins/GSdx/Renderers/DXCommon/GSDeviceDX.cpp
diff --git a/plugins/GSdx/GSDeviceDX.h b/plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h
similarity index 99%
rename from plugins/GSdx/GSDeviceDX.h
rename to plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h
index 0cdaa7ff9a..4306757b81 100644
--- a/plugins/GSdx/GSDeviceDX.h
+++ b/plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GSVector.h"
-#include "GSDevice.h"
+#include "Renderers/Common/GSDevice.h"
 #include "GSAlignedClass.h"
 
 class GSDeviceDX : public GSDevice
diff --git a/plugins/GSdx/GSRendererDX.cpp b/plugins/GSdx/Renderers/DXCommon/GSRendererDX.cpp
similarity index 100%
rename from plugins/GSdx/GSRendererDX.cpp
rename to plugins/GSdx/Renderers/DXCommon/GSRendererDX.cpp
diff --git a/plugins/GSdx/GSRendererDX.h b/plugins/GSdx/Renderers/DXCommon/GSRendererDX.h
similarity index 98%
rename from plugins/GSdx/GSRendererDX.h
rename to plugins/GSdx/Renderers/DXCommon/GSRendererDX.h
index 1964a133ce..30f76dc942 100644
--- a/plugins/GSdx/GSRendererDX.h
+++ b/plugins/GSdx/Renderers/DXCommon/GSRendererDX.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSRendererHW.h"
+#include "Renderers/HW/GSRendererHW.h"
 #include "GSDeviceDX.h"
 
 class GSRendererDX : public GSRendererHW
diff --git a/plugins/GSdx/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
similarity index 100%
rename from plugins/GSdx/GSHwHack.cpp
rename to plugins/GSdx/Renderers/HW/GSHwHack.cpp
diff --git a/plugins/GSdx/GSRendererHW.cpp b/plugins/GSdx/Renderers/HW/GSRendererHW.cpp
similarity index 100%
rename from plugins/GSdx/GSRendererHW.cpp
rename to plugins/GSdx/Renderers/HW/GSRendererHW.cpp
diff --git a/plugins/GSdx/GSRendererHW.h b/plugins/GSdx/Renderers/HW/GSRendererHW.h
similarity index 97%
rename from plugins/GSdx/GSRendererHW.h
rename to plugins/GSdx/Renderers/HW/GSRendererHW.h
index 00793bb036..95901cbca1 100644
--- a/plugins/GSdx/GSRendererHW.h
+++ b/plugins/GSdx/Renderers/HW/GSRendererHW.h
@@ -21,10 +21,10 @@
 
 #pragma once
 
-#include "GSRenderer.h"
-#include "GSTextureCache.h"
+#include "Renderers/Common/GSRenderer.h"
+#include "Renderers/Common/GSTextureCache.h"
 #include "GSCrc.h"
-#include "GSFunctionMap.h"
+#include "Renderers/Common/GSFunctionMap.h"
 #include "GSState.h"
 
 class GSRendererHW : public GSRenderer
diff --git a/plugins/GSdx/GSVertexHW.h b/plugins/GSdx/Renderers/HW/GSVertexHW.h
similarity index 100%
rename from plugins/GSdx/GSVertexHW.h
rename to plugins/GSdx/Renderers/HW/GSVertexHW.h
diff --git a/plugins/GSdx/GSDeviceNull.cpp b/plugins/GSdx/Renderers/Null/GSDeviceNull.cpp
similarity index 100%
rename from plugins/GSdx/GSDeviceNull.cpp
rename to plugins/GSdx/Renderers/Null/GSDeviceNull.cpp
diff --git a/plugins/GSdx/GSDeviceNull.h b/plugins/GSdx/Renderers/Null/GSDeviceNull.h
similarity index 97%
rename from plugins/GSdx/GSDeviceNull.h
rename to plugins/GSdx/Renderers/Null/GSDeviceNull.h
index ecd7b2af60..7eeeedad53 100644
--- a/plugins/GSdx/GSDeviceNull.h
+++ b/plugins/GSdx/Renderers/Null/GSDeviceNull.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSDevice.h"
+#include "Renderers/Common/GSDevice.h"
 #include "GSTextureNull.h"
 
 class GSDeviceNull : public GSDevice
diff --git a/plugins/GSdx/GSRendererNull.cpp b/plugins/GSdx/Renderers/Null/GSRendererNull.cpp
similarity index 100%
rename from plugins/GSdx/GSRendererNull.cpp
rename to plugins/GSdx/Renderers/Null/GSRendererNull.cpp
diff --git a/plugins/GSdx/GSRendererNull.h b/plugins/GSdx/Renderers/Null/GSRendererNull.h
similarity index 96%
rename from plugins/GSdx/GSRendererNull.h
rename to plugins/GSdx/Renderers/Null/GSRendererNull.h
index d7db221b73..a9c6e7fc14 100644
--- a/plugins/GSdx/GSRendererNull.h
+++ b/plugins/GSdx/Renderers/Null/GSRendererNull.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSRenderer.h"
+#include "Renderers/Common/GSRenderer.h"
 
 class GSRendererNull : public GSRenderer
 {
diff --git a/plugins/GSdx/GSTextureNull.cpp b/plugins/GSdx/Renderers/Null/GSTextureNull.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureNull.cpp
rename to plugins/GSdx/Renderers/Null/GSTextureNull.cpp
diff --git a/plugins/GSdx/GSTextureNull.h b/plugins/GSdx/Renderers/Null/GSTextureNull.h
similarity index 97%
rename from plugins/GSdx/GSTextureNull.h
rename to plugins/GSdx/Renderers/Null/GSTextureNull.h
index 0f1d457ad4..20cc951e4f 100644
--- a/plugins/GSdx/GSTextureNull.h
+++ b/plugins/GSdx/Renderers/Null/GSTextureNull.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSTexture.h"
+#include "Renderers/Common/GSTexture.h"
 
 class GSTextureNull : public GSTexture
 {
diff --git a/plugins/GSdx/GSRendererCL.cpp b/plugins/GSdx/Renderers/OpenCL/GSRendererCL.cpp
similarity index 100%
rename from plugins/GSdx/GSRendererCL.cpp
rename to plugins/GSdx/Renderers/OpenCL/GSRendererCL.cpp
diff --git a/plugins/GSdx/GSRendererCL.h b/plugins/GSdx/Renderers/OpenCL/GSRendererCL.h
similarity index 99%
rename from plugins/GSdx/GSRendererCL.h
rename to plugins/GSdx/Renderers/OpenCL/GSRendererCL.h
index ceb346b5e9..3de5dc79d1 100644
--- a/plugins/GSdx/GSRendererCL.h
+++ b/plugins/GSdx/Renderers/OpenCL/GSRendererCL.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSRenderer.h"
+#include "Renderers/Common/GSRenderer.h"
 
 #ifdef ENABLE_OPENCL
 
diff --git a/plugins/GSdx/GLLoader.cpp b/plugins/GSdx/Renderers/OpenGL/GLLoader.cpp
similarity index 100%
rename from plugins/GSdx/GLLoader.cpp
rename to plugins/GSdx/Renderers/OpenGL/GLLoader.cpp
diff --git a/plugins/GSdx/GLLoader.h b/plugins/GSdx/Renderers/OpenGL/GLLoader.h
similarity index 100%
rename from plugins/GSdx/GLLoader.h
rename to plugins/GSdx/Renderers/OpenGL/GLLoader.h
diff --git a/plugins/GSdx/GLState.cpp b/plugins/GSdx/Renderers/OpenGL/GLState.cpp
similarity index 100%
rename from plugins/GSdx/GLState.cpp
rename to plugins/GSdx/Renderers/OpenGL/GLState.cpp
diff --git a/plugins/GSdx/GLState.h b/plugins/GSdx/Renderers/OpenGL/GLState.h
similarity index 100%
rename from plugins/GSdx/GLState.h
rename to plugins/GSdx/Renderers/OpenGL/GLState.h
diff --git a/plugins/GSdx/GSDeviceOGL.cpp b/plugins/GSdx/Renderers/OpenGL/GSDeviceOGL.cpp
similarity index 99%
rename from plugins/GSdx/GSDeviceOGL.cpp
rename to plugins/GSdx/Renderers/OpenGL/GSDeviceOGL.cpp
index edef23e959..4eb08009b9 100644
--- a/plugins/GSdx/GSDeviceOGL.cpp
+++ b/plugins/GSdx/Renderers/OpenGL/GSDeviceOGL.cpp
@@ -24,7 +24,7 @@
 #include "GSDeviceOGL.h"
 #include "GLState.h"
 #include "GSUtil.h"
-#include "GSOsdManager.h"
+#include "Renderers/Common/GSOsdManager.h"
 #include <fstream>
 
 //#define ONLY_LINES
diff --git a/plugins/GSdx/GSDeviceOGL.h b/plugins/GSdx/Renderers/OpenGL/GSDeviceOGL.h
similarity index 99%
rename from plugins/GSdx/GSDeviceOGL.h
rename to plugins/GSdx/Renderers/OpenGL/GSDeviceOGL.h
index d2ca94e036..c6bd9b8952 100644
--- a/plugins/GSdx/GSDeviceOGL.h
+++ b/plugins/GSdx/Renderers/OpenGL/GSDeviceOGL.h
@@ -21,14 +21,14 @@
 
 #pragma once
 
-#include "GSDevice.h"
+#include "Renderers/Common/GSDevice.h"
 #include "GSTextureOGL.h"
 #include "GSdx.h"
 #include "GSVertexArrayOGL.h"
 #include "GSUniformBufferOGL.h"
 #include "GSShaderOGL.h"
 #include "GLState.h"
-#include "GSOsdManager.h"
+#include "Renderers/Common/GSOsdManager.h"
 
 // A couple of flag to determine the blending behavior
 #define BLEND_A_MAX		(0x100) // Impossible blending uses coeff bigger than 1
diff --git a/plugins/GSdx/GSRendererOGL.cpp b/plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp
similarity index 99%
rename from plugins/GSdx/GSRendererOGL.cpp
rename to plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp
index d4838d3145..c6ea676a1a 100644
--- a/plugins/GSdx/GSRendererOGL.cpp
+++ b/plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 #include "GSRendererOGL.h"
-#include "GSRenderer.h"
+#include "Renderers/Common/GSRenderer.h"
 
 
 GSRendererOGL::GSRendererOGL()
diff --git a/plugins/GSdx/GSRendererOGL.h b/plugins/GSdx/Renderers/OpenGL/GSRendererOGL.h
similarity index 95%
rename from plugins/GSdx/GSRendererOGL.h
rename to plugins/GSdx/Renderers/OpenGL/GSRendererOGL.h
index 253981e3d5..3cc48c4c3f 100644
--- a/plugins/GSdx/GSRendererOGL.h
+++ b/plugins/GSdx/Renderers/OpenGL/GSRendererOGL.h
@@ -21,11 +21,11 @@
 
 #pragma once
 
-#include "GSRendererHW.h"
+#include "Renderers/HW/GSRendererHW.h"
 
-#include "GSRenderer.h"
+#include "Renderers/Common/GSRenderer.h"
 #include "GSTextureCacheOGL.h"
-#include "GSVertexHW.h"
+#include "Renderers/HW/GSVertexHW.h"
 
 class GSRendererOGL final : public GSRendererHW
 {
diff --git a/plugins/GSdx/GSShaderOGL.cpp b/plugins/GSdx/Renderers/OpenGL/GSShaderOGL.cpp
similarity index 100%
rename from plugins/GSdx/GSShaderOGL.cpp
rename to plugins/GSdx/Renderers/OpenGL/GSShaderOGL.cpp
diff --git a/plugins/GSdx/GSShaderOGL.h b/plugins/GSdx/Renderers/OpenGL/GSShaderOGL.h
similarity index 100%
rename from plugins/GSdx/GSShaderOGL.h
rename to plugins/GSdx/Renderers/OpenGL/GSShaderOGL.h
diff --git a/plugins/GSdx/GSTextureCacheOGL.cpp b/plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureCacheOGL.cpp
rename to plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.cpp
diff --git a/plugins/GSdx/GSTextureCacheOGL.h b/plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.h
similarity index 96%
rename from plugins/GSdx/GSTextureCacheOGL.h
rename to plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.h
index a308140103..b36b59f7f8 100644
--- a/plugins/GSdx/GSTextureCacheOGL.h
+++ b/plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "GSTextureCache.h"
+#include "Renderers/Common/GSTextureCache.h"
 #include "GSDeviceOGL.h"
 
 class GSTextureCacheOGL final : public GSTextureCache
diff --git a/plugins/GSdx/GSTextureOGL.cpp b/plugins/GSdx/Renderers/OpenGL/GSTextureOGL.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureOGL.cpp
rename to plugins/GSdx/Renderers/OpenGL/GSTextureOGL.cpp
diff --git a/plugins/GSdx/GSTextureOGL.h b/plugins/GSdx/Renderers/OpenGL/GSTextureOGL.h
similarity index 98%
rename from plugins/GSdx/GSTextureOGL.h
rename to plugins/GSdx/Renderers/OpenGL/GSTextureOGL.h
index 0fd1d3bc10..05a467218c 100644
--- a/plugins/GSdx/GSTextureOGL.h
+++ b/plugins/GSdx/Renderers/OpenGL/GSTextureOGL.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSTexture.h"
+#include "Renderers/Common/GSTexture.h"
 
 namespace PboPool {
 	inline void BindPbo();
diff --git a/plugins/GSdx/GSUniformBufferOGL.h b/plugins/GSdx/Renderers/OpenGL/GSUniformBufferOGL.h
similarity index 100%
rename from plugins/GSdx/GSUniformBufferOGL.h
rename to plugins/GSdx/Renderers/OpenGL/GSUniformBufferOGL.h
diff --git a/plugins/GSdx/GSVertexArrayOGL.h b/plugins/GSdx/Renderers/OpenGL/GSVertexArrayOGL.h
similarity index 100%
rename from plugins/GSdx/GSVertexArrayOGL.h
rename to plugins/GSdx/Renderers/OpenGL/GSVertexArrayOGL.h
diff --git a/plugins/GSdx/GSDrawScanline.cpp b/plugins/GSdx/Renderers/SW/GSDrawScanline.cpp
similarity index 100%
rename from plugins/GSdx/GSDrawScanline.cpp
rename to plugins/GSdx/Renderers/SW/GSDrawScanline.cpp
diff --git a/plugins/GSdx/GSDrawScanline.h b/plugins/GSdx/Renderers/SW/GSDrawScanline.h
similarity index 100%
rename from plugins/GSdx/GSDrawScanline.h
rename to plugins/GSdx/Renderers/SW/GSDrawScanline.h
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.cpp b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.cpp
similarity index 100%
rename from plugins/GSdx/GSDrawScanlineCodeGenerator.cpp
rename to plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.cpp
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.h b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.h
similarity index 99%
rename from plugins/GSdx/GSDrawScanlineCodeGenerator.h
rename to plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.h
index 754a13b639..bbe04c5483 100644
--- a/plugins/GSdx/GSDrawScanlineCodeGenerator.h
+++ b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GSScanlineEnvironment.h"
-#include "GSFunctionMap.h"
+#include "Renderers/Common/GSFunctionMap.h"
 #include "GSUtil.h"
 
 using namespace Xbyak;
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.x64.avx.cpp b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x64.avx.cpp
similarity index 100%
rename from plugins/GSdx/GSDrawScanlineCodeGenerator.x64.avx.cpp
rename to plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x64.avx.cpp
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.x64.avx2.cpp b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x64.avx2.cpp
similarity index 100%
rename from plugins/GSdx/GSDrawScanlineCodeGenerator.x64.avx2.cpp
rename to plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x64.avx2.cpp
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.x64.cpp b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x64.cpp
similarity index 100%
rename from plugins/GSdx/GSDrawScanlineCodeGenerator.x64.cpp
rename to plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x64.cpp
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.x86.avx.cpp b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x86.avx.cpp
similarity index 100%
rename from plugins/GSdx/GSDrawScanlineCodeGenerator.x86.avx.cpp
rename to plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x86.avx.cpp
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.x86.avx2.cpp b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x86.avx2.cpp
similarity index 100%
rename from plugins/GSdx/GSDrawScanlineCodeGenerator.x86.avx2.cpp
rename to plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x86.avx2.cpp
diff --git a/plugins/GSdx/GSDrawScanlineCodeGenerator.x86.cpp b/plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x86.cpp
similarity index 100%
rename from plugins/GSdx/GSDrawScanlineCodeGenerator.x86.cpp
rename to plugins/GSdx/Renderers/SW/GSDrawScanlineCodeGenerator.x86.cpp
diff --git a/plugins/GSdx/GSRasterizer.cpp b/plugins/GSdx/Renderers/SW/GSRasterizer.cpp
similarity index 100%
rename from plugins/GSdx/GSRasterizer.cpp
rename to plugins/GSdx/Renderers/SW/GSRasterizer.cpp
diff --git a/plugins/GSdx/GSRasterizer.h b/plugins/GSdx/Renderers/SW/GSRasterizer.h
similarity index 98%
rename from plugins/GSdx/GSRasterizer.h
rename to plugins/GSdx/Renderers/SW/GSRasterizer.h
index 0c38e21847..15857ec958 100644
--- a/plugins/GSdx/GSRasterizer.h
+++ b/plugins/GSdx/Renderers/SW/GSRasterizer.h
@@ -22,8 +22,8 @@
 #pragma once
 
 #include "GS.h"
-#include "GSVertexSW.h"
-#include "GSFunctionMap.h"
+#include "Renderers/SW/GSVertexSW.h"
+#include "Renderers/Common/GSFunctionMap.h"
 #include "GSAlignedClass.h"
 #include "GSPerfMon.h"
 #include "GSThread_CXX11.h"
diff --git a/plugins/GSdx/GSRendererSW.cpp b/plugins/GSdx/Renderers/SW/GSRendererSW.cpp
similarity index 100%
rename from plugins/GSdx/GSRendererSW.cpp
rename to plugins/GSdx/Renderers/SW/GSRendererSW.cpp
diff --git a/plugins/GSdx/GSRendererSW.h b/plugins/GSdx/Renderers/SW/GSRendererSW.h
similarity index 96%
rename from plugins/GSdx/GSRendererSW.h
rename to plugins/GSdx/Renderers/SW/GSRendererSW.h
index 1c6b758a8b..53d41218c0 100644
--- a/plugins/GSdx/GSRendererSW.h
+++ b/plugins/GSdx/Renderers/SW/GSRendererSW.h
@@ -21,9 +21,9 @@
 
 #pragma once
 
-#include "GSRenderer.h"
-#include "GSTextureCacheSW.h"
-#include "GSDrawScanline.h"
+#include "Renderers/Common/GSRenderer.h"
+#include "Renderers/SW/GSTextureCacheSW.h"
+#include "Renderers/SW/GSDrawScanline.h"
 
 class GSRendererSW : public GSRenderer
 {
diff --git a/plugins/GSdx/GSScanlineEnvironment.h b/plugins/GSdx/Renderers/SW/GSScanlineEnvironment.h
similarity index 100%
rename from plugins/GSdx/GSScanlineEnvironment.h
rename to plugins/GSdx/Renderers/SW/GSScanlineEnvironment.h
diff --git a/plugins/GSdx/GSSetupPrimCodeGenerator.cpp b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.cpp
similarity index 100%
rename from plugins/GSdx/GSSetupPrimCodeGenerator.cpp
rename to plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.cpp
diff --git a/plugins/GSdx/GSSetupPrimCodeGenerator.h b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.h
similarity index 94%
rename from plugins/GSdx/GSSetupPrimCodeGenerator.h
rename to plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.h
index 928de3646d..0f288eed05 100644
--- a/plugins/GSdx/GSSetupPrimCodeGenerator.h
+++ b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "GSScanlineEnvironment.h"
-#include "GSFunctionMap.h"
+#include "Renderers/SW/GSScanlineEnvironment.h"
+#include "Renderers/Common/GSFunctionMap.h"
 #include "GSUtil.h"
 
 class GSSetupPrimCodeGenerator : public GSCodeGenerator
diff --git a/plugins/GSdx/GSSetupPrimCodeGenerator.x64.avx.cpp b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x64.avx.cpp
similarity index 100%
rename from plugins/GSdx/GSSetupPrimCodeGenerator.x64.avx.cpp
rename to plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x64.avx.cpp
diff --git a/plugins/GSdx/GSSetupPrimCodeGenerator.x64.avx2.cpp b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x64.avx2.cpp
similarity index 100%
rename from plugins/GSdx/GSSetupPrimCodeGenerator.x64.avx2.cpp
rename to plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x64.avx2.cpp
diff --git a/plugins/GSdx/GSSetupPrimCodeGenerator.x64.cpp b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x64.cpp
similarity index 100%
rename from plugins/GSdx/GSSetupPrimCodeGenerator.x64.cpp
rename to plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x64.cpp
diff --git a/plugins/GSdx/GSSetupPrimCodeGenerator.x86.avx.cpp b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x86.avx.cpp
similarity index 100%
rename from plugins/GSdx/GSSetupPrimCodeGenerator.x86.avx.cpp
rename to plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x86.avx.cpp
diff --git a/plugins/GSdx/GSSetupPrimCodeGenerator.x86.avx2.cpp b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x86.avx2.cpp
similarity index 100%
rename from plugins/GSdx/GSSetupPrimCodeGenerator.x86.avx2.cpp
rename to plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x86.avx2.cpp
diff --git a/plugins/GSdx/GSSetupPrimCodeGenerator.x86.cpp b/plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x86.cpp
similarity index 100%
rename from plugins/GSdx/GSSetupPrimCodeGenerator.x86.cpp
rename to plugins/GSdx/Renderers/SW/GSSetupPrimCodeGenerator.x86.cpp
diff --git a/plugins/GSdx/GSTextureCacheSW.cpp b/plugins/GSdx/Renderers/SW/GSTextureCacheSW.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureCacheSW.cpp
rename to plugins/GSdx/Renderers/SW/GSTextureCacheSW.cpp
diff --git a/plugins/GSdx/GSTextureCacheSW.h b/plugins/GSdx/Renderers/SW/GSTextureCacheSW.h
similarity index 96%
rename from plugins/GSdx/GSTextureCacheSW.h
rename to plugins/GSdx/Renderers/SW/GSTextureCacheSW.h
index a288051cfb..008c131d6c 100644
--- a/plugins/GSdx/GSTextureCacheSW.h
+++ b/plugins/GSdx/Renderers/SW/GSTextureCacheSW.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "GSRenderer.h"
-#include "GSFastList.h"
+#include "Renderers/Common/GSRenderer.h"
+#include "Renderers/Common/GSFastList.h"
 
 class GSTextureCacheSW
 {
diff --git a/plugins/GSdx/GSTextureSW.cpp b/plugins/GSdx/Renderers/SW/GSTextureSW.cpp
similarity index 100%
rename from plugins/GSdx/GSTextureSW.cpp
rename to plugins/GSdx/Renderers/SW/GSTextureSW.cpp
diff --git a/plugins/GSdx/GSTextureSW.h b/plugins/GSdx/Renderers/SW/GSTextureSW.h
similarity index 97%
rename from plugins/GSdx/GSTextureSW.h
rename to plugins/GSdx/Renderers/SW/GSTextureSW.h
index aa54be4ace..5772ee16a3 100644
--- a/plugins/GSdx/GSTextureSW.h
+++ b/plugins/GSdx/Renderers/SW/GSTextureSW.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "GSTexture.h"
+#include "Renderers/Common/GSTexture.h"
 
 class GSTextureSW final : public GSTexture
 {
diff --git a/plugins/GSdx/GSVertexSW.cpp b/plugins/GSdx/Renderers/SW/GSVertexSW.cpp
similarity index 100%
rename from plugins/GSdx/GSVertexSW.cpp
rename to plugins/GSdx/Renderers/SW/GSVertexSW.cpp
diff --git a/plugins/GSdx/GSVertexSW.h b/plugins/GSdx/Renderers/SW/GSVertexSW.h
similarity index 100%
rename from plugins/GSdx/GSVertexSW.h
rename to plugins/GSdx/Renderers/SW/GSVertexSW.h
diff --git a/plugins/GSdx/GSCaptureDlg.cpp b/plugins/GSdx/Window/GSCaptureDlg.cpp
similarity index 100%
rename from plugins/GSdx/GSCaptureDlg.cpp
rename to plugins/GSdx/Window/GSCaptureDlg.cpp
diff --git a/plugins/GSdx/GSCaptureDlg.h b/plugins/GSdx/Window/GSCaptureDlg.h
similarity index 100%
rename from plugins/GSdx/GSCaptureDlg.h
rename to plugins/GSdx/Window/GSCaptureDlg.h
diff --git a/plugins/GSdx/GSDialog.cpp b/plugins/GSdx/Window/GSDialog.cpp
similarity index 100%
rename from plugins/GSdx/GSDialog.cpp
rename to plugins/GSdx/Window/GSDialog.cpp
diff --git a/plugins/GSdx/GSDialog.h b/plugins/GSdx/Window/GSDialog.h
similarity index 100%
rename from plugins/GSdx/GSDialog.h
rename to plugins/GSdx/Window/GSDialog.h
diff --git a/plugins/GSdx/GSLinuxDialog.cpp b/plugins/GSdx/Window/GSLinuxDialog.cpp
similarity index 100%
rename from plugins/GSdx/GSLinuxDialog.cpp
rename to plugins/GSdx/Window/GSLinuxDialog.cpp
diff --git a/plugins/GSdx/GSSetting.cpp b/plugins/GSdx/Window/GSSetting.cpp
similarity index 100%
rename from plugins/GSdx/GSSetting.cpp
rename to plugins/GSdx/Window/GSSetting.cpp
diff --git a/plugins/GSdx/GSSetting.h b/plugins/GSdx/Window/GSSetting.h
similarity index 100%
rename from plugins/GSdx/GSSetting.h
rename to plugins/GSdx/Window/GSSetting.h
diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/Window/GSSettingsDlg.cpp
similarity index 99%
rename from plugins/GSdx/GSSettingsDlg.cpp
rename to plugins/GSdx/Window/GSSettingsDlg.cpp
index 7616871dcb..0fbb9e93f2 100644
--- a/plugins/GSdx/GSSettingsDlg.cpp
+++ b/plugins/GSdx/Window/GSSettingsDlg.cpp
@@ -23,8 +23,8 @@
 #include "GSdx.h"
 #include "GSSettingsDlg.h"
 #include "GSUtil.h"
-#include "GSDevice9.h"
-#include "GSDevice11.h"
+#include "Renderers/DX9/GSDevice9.h"
+#include "Renderers/DX11/GSDevice11.h"
 #include "resource.h"
 #include "GSSetting.h"
 #include <algorithm>
diff --git a/plugins/GSdx/GSSettingsDlg.h b/plugins/GSdx/Window/GSSettingsDlg.h
similarity index 100%
rename from plugins/GSdx/GSSettingsDlg.h
rename to plugins/GSdx/Window/GSSettingsDlg.h
diff --git a/plugins/GSdx/GSWnd.cpp b/plugins/GSdx/Window/GSWnd.cpp
similarity index 100%
rename from plugins/GSdx/GSWnd.cpp
rename to plugins/GSdx/Window/GSWnd.cpp
diff --git a/plugins/GSdx/GSWnd.h b/plugins/GSdx/Window/GSWnd.h
similarity index 100%
rename from plugins/GSdx/GSWnd.h
rename to plugins/GSdx/Window/GSWnd.h
diff --git a/plugins/GSdx/GSWndDX.cpp b/plugins/GSdx/Window/GSWndDX.cpp
similarity index 100%
rename from plugins/GSdx/GSWndDX.cpp
rename to plugins/GSdx/Window/GSWndDX.cpp
diff --git a/plugins/GSdx/GSWndDX.h b/plugins/GSdx/Window/GSWndDX.h
similarity index 100%
rename from plugins/GSdx/GSWndDX.h
rename to plugins/GSdx/Window/GSWndDX.h
diff --git a/plugins/GSdx/GSWndEGL.cpp b/plugins/GSdx/Window/GSWndEGL.cpp
similarity index 100%
rename from plugins/GSdx/GSWndEGL.cpp
rename to plugins/GSdx/Window/GSWndEGL.cpp
diff --git a/plugins/GSdx/GSWndEGL.h b/plugins/GSdx/Window/GSWndEGL.h
similarity index 100%
rename from plugins/GSdx/GSWndEGL.h
rename to plugins/GSdx/Window/GSWndEGL.h
diff --git a/plugins/GSdx/GSWndOGL.cpp b/plugins/GSdx/Window/GSWndOGL.cpp
similarity index 100%
rename from plugins/GSdx/GSWndOGL.cpp
rename to plugins/GSdx/Window/GSWndOGL.cpp
diff --git a/plugins/GSdx/GSWndOGL.h b/plugins/GSdx/Window/GSWndOGL.h
similarity index 100%
rename from plugins/GSdx/GSWndOGL.h
rename to plugins/GSdx/Window/GSWndOGL.h
diff --git a/plugins/GSdx/GSWndWGL.cpp b/plugins/GSdx/Window/GSWndWGL.cpp
similarity index 100%
rename from plugins/GSdx/GSWndWGL.cpp
rename to plugins/GSdx/Window/GSWndWGL.cpp
diff --git a/plugins/GSdx/GSWndWGL.h b/plugins/GSdx/Window/GSWndWGL.h
similarity index 100%
rename from plugins/GSdx/GSWndWGL.h
rename to plugins/GSdx/Window/GSWndWGL.h
diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h
index e97e01d6bf..297b826fe7 100644
--- a/plugins/GSdx/stdafx.h
+++ b/plugins/GSdx/stdafx.h
@@ -132,7 +132,7 @@ typedef int64 sint64;
 	#include <GL/gl.h>
 	#include <GL/glext.h>
 	#include <GL/wglext.h>
-	#include "GLLoader.h"
+	#include "Renderers/OpenGL/GLLoader.h"
 
 	#define DIRECTORY_SEPARATOR '\\'
 
@@ -141,7 +141,7 @@ typedef int64 sint64;
 	// Note use GL/glcorearb.h on the future
 	#include <GL/gl.h>
 	#include <GL/glext.h>
-	#include "GLLoader.h"
+	#include "Renderers/OpenGL/GLLoader.h"
 
 	#include <sys/stat.h> // mkdir
 
diff --git a/plugins/GSdx_legacy/GSThread_CXX11.h b/plugins/GSdx_legacy/GSThread_CXX11.h
index 21711814ba..378a571f14 100644
--- a/plugins/GSdx_legacy/GSThread_CXX11.h
+++ b/plugins/GSdx_legacy/GSThread_CXX11.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "GSdx.h"
-#include "boost_spsc_queue.hpp"
+#include "Utilities/boost_spsc_queue.hpp"
 
 class IGSThread
 {