diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index e1b3566bf..93f1c339d 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -6,13 +6,13 @@ set(SRCS
             config.cpp
             debugger/callstack.cpp
             debugger/disassembler.cpp
-            debugger/graphics.cpp
-            debugger/graphics_breakpoint_observer.cpp
-            debugger/graphics_breakpoints.cpp
-            debugger/graphics_cmdlists.cpp
-            debugger/graphics_surface.cpp
-            debugger/graphics_tracing.cpp
-            debugger/graphics_vertex_shader.cpp
+            debugger/graphics/graphics.cpp
+            debugger/graphics/graphics_breakpoint_observer.cpp
+            debugger/graphics/graphics_breakpoints.cpp
+            debugger/graphics/graphics_cmdlists.cpp
+            debugger/graphics/graphics_surface.cpp
+            debugger/graphics/graphics_tracing.cpp
+            debugger/graphics/graphics_vertex_shader.cpp
             debugger/profiler.cpp
             debugger/ramview.cpp
             debugger/registers.cpp
@@ -39,14 +39,14 @@ set(HEADERS
             config.h
             debugger/callstack.h
             debugger/disassembler.h
-            debugger/graphics.h
-            debugger/graphics_breakpoint_observer.h
-            debugger/graphics_breakpoints.h
-            debugger/graphics_breakpoints_p.h
-            debugger/graphics_cmdlists.h
-            debugger/graphics_surface.h
-            debugger/graphics_tracing.h
-            debugger/graphics_vertex_shader.h
+            debugger/graphics/graphics.h
+            debugger/graphics/graphics_breakpoint_observer.h
+            debugger/graphics/graphics_breakpoints.h
+            debugger/graphics/graphics_breakpoints_p.h
+            debugger/graphics/graphics_cmdlists.h
+            debugger/graphics/graphics_surface.h
+            debugger/graphics/graphics_tracing.h
+            debugger/graphics/graphics_vertex_shader.h
             debugger/profiler.h
             debugger/ramview.h
             debugger/registers.h
diff --git a/src/citra_qt/debugger/graphics.cpp b/src/citra_qt/debugger/graphics/graphics.cpp
similarity index 98%
rename from src/citra_qt/debugger/graphics.cpp
rename to src/citra_qt/debugger/graphics/graphics.cpp
index ef337827a..6a76adeae 100644
--- a/src/citra_qt/debugger/graphics.cpp
+++ b/src/citra_qt/debugger/graphics/graphics.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <QListView>
-#include "citra_qt/debugger/graphics.h"
+#include "citra_qt/debugger/graphics/graphics.h"
 #include "citra_qt/util/util.h"
 
 extern GraphicsDebugger g_debugger;
diff --git a/src/citra_qt/debugger/graphics.h b/src/citra_qt/debugger/graphics/graphics.h
similarity index 100%
rename from src/citra_qt/debugger/graphics.h
rename to src/citra_qt/debugger/graphics/graphics.h
diff --git a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp b/src/citra_qt/debugger/graphics/graphics_breakpoint_observer.cpp
similarity index 93%
rename from src/citra_qt/debugger/graphics_breakpoint_observer.cpp
rename to src/citra_qt/debugger/graphics/graphics_breakpoint_observer.cpp
index e01d3440e..dc6070dea 100644
--- a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp
+++ b/src/citra_qt/debugger/graphics/graphics_breakpoint_observer.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <QMetaType>
-#include "citra_qt/debugger/graphics_breakpoint_observer.h"
+#include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
 
 BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
                                                const QString& title, QWidget* parent)
diff --git a/src/citra_qt/debugger/graphics_breakpoint_observer.h b/src/citra_qt/debugger/graphics/graphics_breakpoint_observer.h
similarity index 100%
rename from src/citra_qt/debugger/graphics_breakpoint_observer.h
rename to src/citra_qt/debugger/graphics/graphics_breakpoint_observer.h
diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp
similarity index 98%
rename from src/citra_qt/debugger/graphics_breakpoints.cpp
rename to src/citra_qt/debugger/graphics/graphics_breakpoints.cpp
index d2a036dfa..030828ba8 100644
--- a/src/citra_qt/debugger/graphics_breakpoints.cpp
+++ b/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp
@@ -7,8 +7,8 @@
 #include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include "citra_qt/debugger/graphics_breakpoints.h"
-#include "citra_qt/debugger/graphics_breakpoints_p.h"
+#include "citra_qt/debugger/graphics/graphics_breakpoints.h"
+#include "citra_qt/debugger/graphics/graphics_breakpoints_p.h"
 #include "common/assert.h"
 
 BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent)
diff --git a/src/citra_qt/debugger/graphics_breakpoints.h b/src/citra_qt/debugger/graphics/graphics_breakpoints.h
similarity index 100%
rename from src/citra_qt/debugger/graphics_breakpoints.h
rename to src/citra_qt/debugger/graphics/graphics_breakpoints.h
diff --git a/src/citra_qt/debugger/graphics_breakpoints_p.h b/src/citra_qt/debugger/graphics/graphics_breakpoints_p.h
similarity index 100%
rename from src/citra_qt/debugger/graphics_breakpoints_p.h
rename to src/citra_qt/debugger/graphics/graphics_breakpoints_p.h
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp
similarity index 99%
rename from src/citra_qt/debugger/graphics_cmdlists.cpp
rename to src/citra_qt/debugger/graphics/graphics_cmdlists.cpp
index 98b619dea..dab529e3a 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp
@@ -13,7 +13,7 @@
 #include <QSpinBox>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include "citra_qt/debugger/graphics_cmdlists.h"
+#include "citra_qt/debugger/graphics/graphics_cmdlists.h"
 #include "citra_qt/util/spinbox.h"
 #include "citra_qt/util/util.h"
 #include "common/vector_math.h"
diff --git a/src/citra_qt/debugger/graphics_cmdlists.h b/src/citra_qt/debugger/graphics/graphics_cmdlists.h
similarity index 100%
rename from src/citra_qt/debugger/graphics_cmdlists.h
rename to src/citra_qt/debugger/graphics/graphics_cmdlists.h
diff --git a/src/citra_qt/debugger/graphics_surface.cpp b/src/citra_qt/debugger/graphics/graphics_surface.cpp
similarity index 99%
rename from src/citra_qt/debugger/graphics_surface.cpp
rename to src/citra_qt/debugger/graphics/graphics_surface.cpp
index 906daaa50..4efd95d3c 100644
--- a/src/citra_qt/debugger/graphics_surface.cpp
+++ b/src/citra_qt/debugger/graphics/graphics_surface.cpp
@@ -11,7 +11,7 @@
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSpinBox>
-#include "citra_qt/debugger/graphics_surface.h"
+#include "citra_qt/debugger/graphics/graphics_surface.h"
 #include "citra_qt/util/spinbox.h"
 #include "common/color.h"
 #include "core/hw/gpu.h"
diff --git a/src/citra_qt/debugger/graphics_surface.h b/src/citra_qt/debugger/graphics/graphics_surface.h
similarity index 97%
rename from src/citra_qt/debugger/graphics_surface.h
rename to src/citra_qt/debugger/graphics/graphics_surface.h
index 19ffb55fb..28f5650a7 100644
--- a/src/citra_qt/debugger/graphics_surface.h
+++ b/src/citra_qt/debugger/graphics/graphics_surface.h
@@ -6,7 +6,7 @@
 
 #include <QLabel>
 #include <QPushButton>
-#include "citra_qt/debugger/graphics_breakpoint_observer.h"
+#include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
 
 class QComboBox;
 class QSpinBox;
diff --git a/src/citra_qt/debugger/graphics_tracing.cpp b/src/citra_qt/debugger/graphics/graphics_tracing.cpp
similarity index 99%
rename from src/citra_qt/debugger/graphics_tracing.cpp
rename to src/citra_qt/debugger/graphics/graphics_tracing.cpp
index 5c6b74034..716ed50b8 100644
--- a/src/citra_qt/debugger/graphics_tracing.cpp
+++ b/src/citra_qt/debugger/graphics/graphics_tracing.cpp
@@ -12,7 +12,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <boost/range/algorithm/copy.hpp>
-#include "citra_qt/debugger/graphics_tracing.h"
+#include "citra_qt/debugger/graphics/graphics_tracing.h"
 #include "common/common_types.h"
 #include "core/hw/gpu.h"
 #include "core/hw/lcd.h"
diff --git a/src/citra_qt/debugger/graphics_tracing.h b/src/citra_qt/debugger/graphics/graphics_tracing.h
similarity index 92%
rename from src/citra_qt/debugger/graphics_tracing.h
rename to src/citra_qt/debugger/graphics/graphics_tracing.h
index 20acc91e7..3f73bcd2e 100644
--- a/src/citra_qt/debugger/graphics_tracing.h
+++ b/src/citra_qt/debugger/graphics/graphics_tracing.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "citra_qt/debugger/graphics_breakpoint_observer.h"
+#include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
 
 class EmuThread;
 
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp
similarity index 99%
rename from src/citra_qt/debugger/graphics_vertex_shader.cpp
rename to src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp
index 96b40db1e..b75b94ef8 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.cpp
+++ b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp
@@ -14,7 +14,7 @@
 #include <QSignalMapper>
 #include <QSpinBox>
 #include <QTreeView>
-#include "citra_qt/debugger/graphics_vertex_shader.h"
+#include "citra_qt/debugger/graphics/graphics_vertex_shader.h"
 #include "citra_qt/util/util.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.h b/src/citra_qt/debugger/graphics/graphics_vertex_shader.h
similarity index 97%
rename from src/citra_qt/debugger/graphics_vertex_shader.h
rename to src/citra_qt/debugger/graphics/graphics_vertex_shader.h
index 6e62fbb9b..bedea0bed 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.h
+++ b/src/citra_qt/debugger/graphics/graphics_vertex_shader.h
@@ -6,7 +6,7 @@
 
 #include <QAbstractTableModel>
 #include <QTreeView>
-#include "citra_qt/debugger/graphics_breakpoint_observer.h"
+#include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
 #include "nihstro/parser_shbin.h"
 #include "video_core/shader/shader.h"
 
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 4486f0870..e16d3196c 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -17,12 +17,12 @@
 #include "citra_qt/configure_dialog.h"
 #include "citra_qt/debugger/callstack.h"
 #include "citra_qt/debugger/disassembler.h"
-#include "citra_qt/debugger/graphics.h"
-#include "citra_qt/debugger/graphics_breakpoints.h"
-#include "citra_qt/debugger/graphics_cmdlists.h"
-#include "citra_qt/debugger/graphics_surface.h"
-#include "citra_qt/debugger/graphics_tracing.h"
-#include "citra_qt/debugger/graphics_vertex_shader.h"
+#include "citra_qt/debugger/graphics/graphics.h"
+#include "citra_qt/debugger/graphics/graphics_breakpoints.h"
+#include "citra_qt/debugger/graphics/graphics_cmdlists.h"
+#include "citra_qt/debugger/graphics/graphics_surface.h"
+#include "citra_qt/debugger/graphics/graphics_tracing.h"
+#include "citra_qt/debugger/graphics/graphics_vertex_shader.h"
 #include "citra_qt/debugger/profiler.h"
 #include "citra_qt/debugger/ramview.h"
 #include "citra_qt/debugger/registers.h"