diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp
index 566a986f5..302e22d7a 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.cpp
+++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp
@@ -8,7 +8,7 @@
 #include <QBoxLayout>
 #include <QTreeView>
 
-#include "video_core/shader_interpreter.h"
+#include "video_core/shader/shader_interpreter.h"
 
 #include "graphics_vertex_shader.h"
 
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index e06d368e5..22252ea1d 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -11,7 +11,7 @@ set(SRCS
             pica.cpp
             primitive_assembly.cpp
             rasterizer.cpp
-            shader_interpreter.cpp
+            shader/shader_interpreter.cpp
             utils.cpp
             video_core.cpp
             )
@@ -35,7 +35,7 @@ set(HEADERS
             primitive_assembly.h
             rasterizer.h
             renderer_base.h
-            shader_interpreter.h
+            shader/shader_interpreter.h
             utils.h
             video_core.h
             )
diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp
index e397ca2e8..bb6048cc0 100644
--- a/src/video_core/clipper.cpp
+++ b/src/video_core/clipper.cpp
@@ -7,7 +7,7 @@
 #include "clipper.h"
 #include "pica.h"
 #include "rasterizer.h"
-#include "shader_interpreter.h"
+#include "shader/shader_interpreter.h"
 
 namespace Pica {
 
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp
index e199424c3..8f8e9872d 100644
--- a/src/video_core/command_processor.cpp
+++ b/src/video_core/command_processor.cpp
@@ -18,7 +18,7 @@
 #include "pica.h"
 #include "primitive_assembly.h"
 #include "renderer_base.h"
-#include "shader_interpreter.h"
+#include "shader/shader_interpreter.h"
 #include "video_core.h"
 
 namespace Pica {
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp
index e15a1daba..e2b1df44c 100644
--- a/src/video_core/primitive_assembly.cpp
+++ b/src/video_core/primitive_assembly.cpp
@@ -4,7 +4,7 @@
 
 #include "pica.h"
 #include "primitive_assembly.h"
-#include "shader_interpreter.h"
+#include "shader/shader_interpreter.h"
 
 #include "common/logging/log.h"
 #include "video_core/debug_utils/debug_utils.h"
diff --git a/src/video_core/primitive_assembly.h b/src/video_core/primitive_assembly.h
index 0de0b8810..80432d68a 100644
--- a/src/video_core/primitive_assembly.h
+++ b/src/video_core/primitive_assembly.h
@@ -8,7 +8,7 @@
 
 #include "video_core/pica.h"
 
-#include "video_core/shader_interpreter.h"
+#include "video_core/shader/shader_interpreter.h"
 
 namespace Pica {
 
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index 4f94313df..b83798b0f 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -16,7 +16,7 @@
 #include "math.h"
 #include "pica.h"
 #include "rasterizer.h"
-#include "shader_interpreter.h"
+#include "shader/shader_interpreter.h"
 #include "video_core/utils.h"
 
 namespace Pica {
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 9018b5e88..a02d5c856 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -9,7 +9,7 @@
 #include "common/common_types.h"
 
 #include "video_core/hwrasterizer_base.h"
-#include "video_core/shader_interpreter.h"
+#include "video_core/shader/shader_interpreter.h"
 
 #include "gl_state.h"
 #include "gl_rasterizer_cache.h"
diff --git a/src/video_core/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp
similarity index 99%
rename from src/video_core/shader_interpreter.cpp
rename to src/video_core/shader/shader_interpreter.cpp
index 3cce26d36..369883225 100644
--- a/src/video_core/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -11,9 +11,9 @@
 
 #include "common/profiler.h"
 
-#include "pica.h"
-#include "shader_interpreter.h"
-#include "debug_utils/debug_utils.h"
+#include "video_core/pica.h"
+#include "video_core/shader/shader_interpreter.h"
+#include "video_core/debug_utils/debug_utils.h"
 
 using nihstro::OpCode;
 using nihstro::Instruction;
diff --git a/src/video_core/shader_interpreter.h b/src/video_core/shader/shader_interpreter.h
similarity index 98%
rename from src/video_core/shader_interpreter.h
rename to src/video_core/shader/shader_interpreter.h
index 942a30841..f2900bfc6 100644
--- a/src/video_core/shader_interpreter.h
+++ b/src/video_core/shader/shader_interpreter.h
@@ -8,7 +8,7 @@
 
 #include "common/vector_math.h"
 
-#include "pica.h"
+#include "video_core/pica.h"
 
 namespace Pica {