diff --git a/Windows/Debugger/GEDebugger.cpp b/Windows/GEDebugger/GEDebugger.cpp
similarity index 98%
rename from Windows/Debugger/GEDebugger.cpp
rename to Windows/GEDebugger/GEDebugger.cpp
index 86cabe1a6a..dc29e7d1e2 100644
--- a/Windows/Debugger/GEDebugger.cpp
+++ b/Windows/GEDebugger/GEDebugger.cpp
@@ -16,7 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "native/base/mutex.h"
-#include "Windows/Debugger/GEDebugger.h"
+#include "Windows/GEDebugger/GEDebugger.h"
 #include "Windows/WindowsHost.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/GPUDebugInterface.h"
diff --git a/Windows/Debugger/GEDebugger.h b/Windows/GEDebugger/GEDebugger.h
similarity index 100%
rename from Windows/Debugger/GEDebugger.h
rename to Windows/GEDebugger/GEDebugger.h
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index 3ce17343d0..2414f9aaa6 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -279,7 +279,7 @@
     <ClCompile Include="Debugger\Debugger_Lists.cpp" />
     <ClCompile Include="Debugger\Debugger_MemoryDlg.cpp" />
     <ClCompile Include="Debugger\Debugger_VFPUDlg.cpp" />
-    <ClCompile Include="Debugger\GEDebugger.cpp" />
+    <ClCompile Include="GEDebugger\GEDebugger.cpp" />
     <ClCompile Include="DinputDevice.cpp" />
     <ClCompile Include="EmuThread.cpp" />
     <ClCompile Include="InputDevice.cpp" />
@@ -321,7 +321,7 @@
     <ClInclude Include="Debugger\Debugger_Lists.h" />
     <ClInclude Include="Debugger\Debugger_MemoryDlg.h" />
     <ClInclude Include="Debugger\Debugger_VFPUDlg.h" />
-    <ClInclude Include="Debugger\GEDebugger.h" />
+    <ClInclude Include="GEDebugger\GEDebugger.h" />
     <ClInclude Include="DinputDevice.h" />
     <ClInclude Include="EmuThread.h" />
     <ClInclude Include="InputDevice.h" />
diff --git a/Windows/PPSSPP.vcxproj.filters b/Windows/PPSSPP.vcxproj.filters
index 8144568496..d9acd0eadc 100644
--- a/Windows/PPSSPP.vcxproj.filters
+++ b/Windows/PPSSPP.vcxproj.filters
@@ -26,6 +26,9 @@
     <Filter Include="Other Platforms">
       <UniqueIdentifier>{d53d0871-8572-4393-822e-d14db0a88dab}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Windows\GE Debugger">
+      <UniqueIdentifier>{15f0e146-e39c-4bad-ba10-3c714a7dbf74}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Debugger\CtrlDisAsmView.cpp">
@@ -110,8 +113,8 @@
     <ClCompile Include="Debugger\Debugger_Lists.cpp">
       <Filter>Windows\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="Debugger\GEDebugger.cpp">
-      <Filter>Windows\Debugger</Filter>
+    <ClCompile Include="GEDebugger\GEDebugger.cpp">
+      <Filter>Windows\GE Debugger</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -200,8 +203,8 @@
     <ClInclude Include="Debugger\Debugger_Lists.h">
       <Filter>Windows\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="Debugger\GEDebugger.h">
-      <Filter>Windows\Debugger</Filter>
+    <ClInclude Include="GEDebugger\GEDebugger.h">
+      <Filter>Windows\GE Debugger</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index b3045ef5ba..d9c011fff4 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -38,7 +38,7 @@
 #include "Windows/OpenGLBase.h"
 #include "Windows/Debugger/Debugger_Disasm.h"
 #include "Windows/Debugger/Debugger_MemoryDlg.h"
-#include "Windows/Debugger/GEDebugger.h"
+#include "Windows/GEDebugger/GEDebugger.h"
 #include "main.h"
 
 #include "Core/Core.h"
diff --git a/Windows/main.cpp b/Windows/main.cpp
index 85e6f89dbb..4f1eb3ff7f 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -40,7 +40,7 @@
 #include "Windows/Debugger/Debugger_Disasm.h"
 #include "Windows/Debugger/Debugger_MemoryDlg.h"
 #include "Windows/Debugger/Debugger_VFPUDlg.h"
-#include "Windows/Debugger/GEDebugger.h"
+#include "Windows/GEDebugger/GEDebugger.h"
 
 #include "Windows/W32Util/DialogManager.h"
 
diff --git a/Windows/main.h b/Windows/main.h
index 2dd84f4b66..70f6ca5b9f 100644
--- a/Windows/main.h
+++ b/Windows/main.h
@@ -20,7 +20,7 @@
 
 #include "Debugger/Debugger_Disasm.h"
 #include "Debugger/Debugger_MemoryDlg.h"
-#include "Windows/Debugger/GEDebugger.h"
+#include "Windows/GEDebugger/GEDebugger.h"
 
 #include "Common/CommonWindows.h"