diff --git a/GPU/CMakeLists.txt b/GPU/CMakeLists.txt
index 57d64efba..50998db76 100644
--- a/GPU/CMakeLists.txt
+++ b/GPU/CMakeLists.txt
@@ -2,7 +2,7 @@ set(SRCS
 	GPUCommon.cpp
 	GPUState.cpp
 	Math3D.cpp
-	GLES/DisplayListInterpreter.cpp
+	GLES/GLES_GPU.cpp
 	GLES/FragmentShaderGenerator.cpp
 	GLES/Framebuffer.cpp
 	GLES/IndexGenerator.cpp
diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/GLES_GPU.cpp
similarity index 98%
rename from GPU/GLES/DisplayListInterpreter.cpp
rename to GPU/GLES/GLES_GPU.cpp
index 1698f6d17..e6463aab2 100644
--- a/GPU/GLES/DisplayListInterpreter.cpp
+++ b/GPU/GLES/GLES_GPU.cpp
@@ -24,19 +24,19 @@
 #include "Core/Reporting.h"
 #include "Core/System.h"
 
-#include "../GPUState.h"
-#include "../ge_constants.h"
-#include "../GeDisasm.h"
+#include "GPU/GPUState.h"
+#include "GPU/ge_constants.h"
+#include "GPU/GeDisasm.h"
 
-#include "ShaderManager.h"
-#include "DisplayListInterpreter.h"
-#include "Framebuffer.h"
-#include "TransformPipeline.h"
-#include "TextureCache.h"
+#include "GPU/GLES/ShaderManager.h"
+#include "GPU/GLES/GLES_GPU.h"
+#include "GPU/GLES/Framebuffer.h"
+#include "GPU/GLES/TransformPipeline.h"
+#include "GPU/GLES/TextureCache.h"
 
-#include "../../Core/HLE/sceKernelThread.h"
-#include "../../Core/HLE/sceKernelInterrupt.h"
-#include "../../Core/HLE/sceGe.h"
+#include "Core/HLE/sceKernelThread.h"
+#include "Core/HLE/sceKernelInterrupt.h"
+#include "Core/HLE/sceGe.h"
 
 static const u8 flushOnChangedBeforeCommandList[] = {
 	GE_CMD_REGION1,GE_CMD_REGION2,
diff --git a/GPU/GLES/DisplayListInterpreter.h b/GPU/GLES/GLES_GPU.h
similarity index 94%
rename from GPU/GLES/DisplayListInterpreter.h
rename to GPU/GLES/GLES_GPU.h
index 675cb2bff..1357ed29b 100644
--- a/GPU/GLES/DisplayListInterpreter.h
+++ b/GPU/GLES/GLES_GPU.h
@@ -20,13 +20,14 @@
 #include <list>
 #include <deque>
 
-#include "../GPUCommon.h"
-#include "Framebuffer.h"
-#include "VertexDecoder.h"
-#include "TransformPipeline.h"
-#include "TextureCache.h"
 #include "gfx_es2/fbo.h"
 
+#include "GPU/GPUCommon.h"
+#include "GPU/GLES/Framebuffer.h"
+#include "GPU/GLES/VertexDecoder.h"
+#include "GPU/GLES/TransformPipeline.h"
+#include "GPU/GLES/TextureCache.h"
+
 class ShaderManager;
 class LinkedShader;
 
diff --git a/GPU/GLES/StateMapping.cpp b/GPU/GLES/StateMapping.cpp
index 3480b6707..ebc3935fa 100644
--- a/GPU/GLES/StateMapping.cpp
+++ b/GPU/GLES/StateMapping.cpp
@@ -24,10 +24,10 @@
 #include "Core/System.h"
 #include "Core/Config.h"
 #include "Core/Reporting.h"
-#include "DisplayListInterpreter.h"
-#include "ShaderManager.h"
-#include "TextureCache.h"
-#include "Framebuffer.h"
+#include "GPU/GLES/GLES_GPU.h"
+#include "GPU/GLES/ShaderManager.h"
+#include "GPU/GLES/TextureCache.h"
+#include "GPU/GLES/Framebuffer.h"
 
 static const GLushort aLookup[11] = {
 	GL_DST_COLOR,
diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp
index 413f8881d..74261fb5d 100644
--- a/GPU/GLES/TransformPipeline.cpp
+++ b/GPU/GLES/TransformPipeline.cpp
@@ -33,12 +33,12 @@
 #include "GPU/GPUState.h"
 #include "GPU/ge_constants.h"
 
-#include "StateMapping.h"
-#include "TextureCache.h"
-#include "TransformPipeline.h"
-#include "VertexDecoder.h"
-#include "ShaderManager.h"
-#include "DisplayListInterpreter.h"
+#include "GPU/GLES/StateMapping.h"
+#include "GPU/GLES/TextureCache.h"
+#include "GPU/GLES/TransformPipeline.h"
+#include "GPU/GLES/VertexDecoder.h"
+#include "GPU/GLES/ShaderManager.h"
+#include "GPU/GLES/GLES_GPU.h"
 
 const GLuint glprim[8] = {
 	GL_POINTS,
diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj
index 90cec1b50..e5835a961 100644
--- a/GPU/GPU.vcxproj
+++ b/GPU/GPU.vcxproj
@@ -141,7 +141,7 @@
   <ItemGroup>
     <ClInclude Include="..\ext\xbrz\xbrz.h" />
     <ClInclude Include="ge_constants.h" />
-    <ClInclude Include="GLES\DisplayListInterpreter.h" />
+    <ClInclude Include="GLES\GLES_GPU.h" />
     <ClInclude Include="GLES\FragmentShaderGenerator.h" />
     <ClInclude Include="GLES\Framebuffer.h" />
     <ClInclude Include="GLES\IndexGenerator.h" />
@@ -167,7 +167,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\ext\xbrz\xbrz.cpp" />
-    <ClCompile Include="GLES\DisplayListInterpreter.cpp" />
+    <ClCompile Include="GLES\GLES_GPU.cpp" />
     <ClCompile Include="GLES\FragmentShaderGenerator.cpp" />
     <ClCompile Include="GLES\Framebuffer.cpp" />
     <ClCompile Include="GLES\IndexGenerator.cpp" />
@@ -202,4 +202,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/GPU/GPU.vcxproj.filters b/GPU/GPU.vcxproj.filters
index d57b98119..72a36f77e 100644
--- a/GPU/GPU.vcxproj.filters
+++ b/GPU/GPU.vcxproj.filters
@@ -21,9 +21,6 @@
     <ClInclude Include="Math3D.h">
       <Filter>Common</Filter>
     </ClInclude>
-    <ClInclude Include="GLES\DisplayListInterpreter.h">
-      <Filter>GLES</Filter>
-    </ClInclude>
     <ClInclude Include="GLES\FragmentShaderGenerator.h">
       <Filter>GLES</Filter>
     </ClInclude>
@@ -86,14 +83,14 @@
     <ClInclude Include="Software\TransformUnit.h">
       <Filter>Software</Filter>
     </ClInclude>
+    <ClInclude Include="GLES\GLES_GPU.h">
+      <Filter>GLES</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Math3D.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="GLES\DisplayListInterpreter.cpp">
-      <Filter>GLES</Filter>
-    </ClCompile>
     <ClCompile Include="GLES\FragmentShaderGenerator.cpp">
       <Filter>GLES</Filter>
     </ClCompile>
@@ -150,8 +147,11 @@
     <ClCompile Include="Software\TransformUnit.cpp">
       <Filter>Software</Filter>
     </ClCompile>
+    <ClCompile Include="GLES\GLES_GPU.cpp">
+      <Filter>GLES</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/GPU/GPUState.cpp b/GPU/GPUState.cpp
index 2bf65e27d..063965d18 100644
--- a/GPU/GPUState.cpp
+++ b/GPU/GPUState.cpp
@@ -15,14 +15,14 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "ge_constants.h"
-#include "GPUState.h"
-#include "GLES/ShaderManager.h"
-#include "GLES/DisplayListInterpreter.h"
-#include "Null/NullGpu.h"
-#include "Software/SoftGpu.h"
-#include "../Core/CoreParameter.h"
-#include "../Core/System.h"
+#include "GPU/ge_constants.h"
+#include "GPU/GPUState.h"
+#include "GPU/GLES/ShaderManager.h"
+#include "GPU/GLES/GLES_GPU.h"
+#include "GPU/Null/NullGpu.h"
+#include "GPU/Software/SoftGpu.h"
+#include "Core/CoreParameter.h"
+#include "Core/System.h"
 
 GPUgstate gstate;
 GPUStateCache gstate_c;
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index bd90b74e8..b0895657b 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -171,15 +171,15 @@ LOCAL_SRC_FILES := \
   $(SRC)/GPU/GPUState.cpp \
   $(SRC)/GPU/GeDisasm.cpp \
   $(SRC)/GPU/GLES/Framebuffer.cpp \
-  $(SRC)/GPU/GLES/DisplayListInterpreter.cpp.arm \
+  $(SRC)/GPU/GLES/GLES_GPU.cpp.arm \
   $(SRC)/GPU/GLES/TextureCache.cpp.arm \
   $(SRC)/GPU/GLES/IndexGenerator.cpp.arm \
   $(SRC)/GPU/GLES/TransformPipeline.cpp.arm \
   $(SRC)/GPU/GLES/StateMapping.cpp.arm \
   $(SRC)/GPU/GLES/VertexDecoder.cpp.arm \
-  $(SRC)/GPU/GLES/ShaderManager.cpp \
-  $(SRC)/GPU/GLES/VertexShaderGenerator.cpp \
-  $(SRC)/GPU/GLES/FragmentShaderGenerator.cpp \
+  $(SRC)/GPU/GLES/ShaderManager.cpp.arm \
+  $(SRC)/GPU/GLES/VertexShaderGenerator.cpp.arm \
+  $(SRC)/GPU/GLES/FragmentShaderGenerator.cpp.arm \
   $(SRC)/GPU/GLES/TextureScaler.cpp \
   $(SRC)/GPU/Null/NullGpu.cpp \
   $(SRC)/GPU/Software/Clipper.cpp \