diff --git a/Makefile.common b/Makefile.common
index c834ee9689..339af1decb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -910,9 +910,9 @@ ifeq ($(HAVE_CG), 1)
 endif
 
 ifeq ($(HAVE_D3D9), 1)
-   OBJ += gfx/d3d/d3d.o \
-          gfx/d3d/render_chain_null.o \
-          gfx/d3d/render_chain_driver.o \
+   OBJ += gfx/drivers/d3d.o \
+          gfx/drivers/d3d_renderchains/render_chain_null.o \
+          gfx/drivers/d3d_renderchains/render_chain_driver.o \
           gfx/common/d3d_common.o \
           gfx/drivers_font/d3d_w32_font.o \
           gfx/drivers_context/d3d_ctx.o
@@ -926,7 +926,7 @@ ifeq ($(HAVE_D3D9), 1)
 
    ifeq ($(HAVE_CG), 1)
       LIBS += -lcgD3D9
-      OBJ  += gfx/d3d/render_chain_cg.o
+      OBJ  += gfx/drivers/d3d_renderchains/render_chain_cg.o
    endif
 endif
 
diff --git a/gfx/d3d/d3d.cpp b/gfx/drivers/d3d.cpp
similarity index 100%
rename from gfx/d3d/d3d.cpp
rename to gfx/drivers/d3d.cpp
diff --git a/gfx/d3d/d3d.h b/gfx/drivers/d3d.h
similarity index 100%
rename from gfx/d3d/d3d.h
rename to gfx/drivers/d3d.h
diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/drivers/d3d_renderchains/render_chain_cg.cpp
similarity index 99%
rename from gfx/d3d/render_chain_cg.cpp
rename to gfx/drivers/d3d_renderchains/render_chain_cg.cpp
index 01743eb225..457f948906 100644
--- a/gfx/d3d/render_chain_cg.cpp
+++ b/gfx/drivers/d3d_renderchains/render_chain_cg.cpp
@@ -20,19 +20,21 @@
 #include <string>
 #include <vector>
 
-#include "../include/Cg/cg.h"
-#include "../include/Cg/cgD3D9.h"
+#include "../../include/Cg/cg.h"
+#include "../../include/Cg/cgD3D9.h"
 
 #include <retro_inline.h>
 #include <compat/strl.h>
 #include <string/stdstring.h>
 
 #include "render_chain_driver.h"
-#include "../video_driver.h"
-#include "../../general.h"
-#include "../../performance_counters.h"
-#include "../../verbosity.h"
-#include "d3d.h"
+#include "../../video_driver.h"
+#include "../../../general.h"
+#include "../../../performance_counters.h"
+#include "../../../verbosity.h"
+#include "../d3d.h"
+
+#include "../d3d_shaders/opaque.cg.d3d9.h"
 
 #define cg_d3d9_set_param_1f(param, x) if (param) cgD3D9SetUniform(param, x)
 namespace {
@@ -86,7 +88,6 @@ typedef struct cg_renderchain
    CGcontext cgCtx;
 } cg_renderchain_t;
 
-#include "../drivers/d3d_shaders/opaque.cg.d3d9.h"
 
 static INLINE bool validate_param_name(const char *name)
 {
diff --git a/gfx/d3d/render_chain_driver.c b/gfx/drivers/d3d_renderchains/render_chain_driver.c
similarity index 100%
rename from gfx/d3d/render_chain_driver.c
rename to gfx/drivers/d3d_renderchains/render_chain_driver.c
diff --git a/gfx/d3d/render_chain_driver.h b/gfx/drivers/d3d_renderchains/render_chain_driver.h
similarity index 94%
rename from gfx/d3d/render_chain_driver.h
rename to gfx/drivers/d3d_renderchains/render_chain_driver.h
index ea571f0937..8a94a542aa 100644
--- a/gfx/d3d/render_chain_driver.h
+++ b/gfx/drivers/d3d_renderchains/render_chain_driver.h
@@ -20,10 +20,10 @@
 #include <retro_common_api.h>
 #include <libretro.h>
 
-#include "../video_driver.h"
-#include "../video_shader_parse.h"
-#include "../video_state_tracker.h"
-#include "../../defines/d3d_defines.h"
+#include "../../video_driver.h"
+#include "../../video_shader_parse.h"
+#include "../../video_state_tracker.h"
+#include "../../../defines/d3d_defines.h"
 
 RETRO_BEGIN_DECLS
 
diff --git a/gfx/d3d/render_chain_null.c b/gfx/drivers/d3d_renderchains/render_chain_null.c
similarity index 100%
rename from gfx/d3d/render_chain_null.c
rename to gfx/drivers/d3d_renderchains/render_chain_null.c
diff --git a/gfx/d3d/render_chain_xdk.cpp b/gfx/drivers/d3d_renderchains/render_chain_xdk.cpp
similarity index 99%
rename from gfx/d3d/render_chain_xdk.cpp
rename to gfx/drivers/d3d_renderchains/render_chain_xdk.cpp
index ac4c7d494d..767dc06e16 100644
--- a/gfx/d3d/render_chain_xdk.cpp
+++ b/gfx/drivers/d3d_renderchains/render_chain_xdk.cpp
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <retro_inline.h>
 #include "render_chain_driver.h"
-#include "../../verbosity.h"
+#include "../../../verbosity.h"
 
 typedef struct xdk_renderchain
 {
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d5767b725b..92e3385c11 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -305,8 +305,8 @@ VIDEO DRIVER
 #endif
 
 #if defined(HAVE_D3D)
-#include "../gfx/d3d/render_chain_driver.c"
-#include "../gfx/d3d/render_chain_null.c"
+#include "../gfx/drivers/d3d_renderchains/render_chain_driver.c"
+#include "../gfx/drivers/d3d_renderchains/render_chain_null.c"
 #endif
 
 #if defined(GEKKO)
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index c9eefca3a5..80621c44a7 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -161,12 +161,12 @@ VIDEO DRIVER
 
 #if defined(HAVE_D3D)
 #include "../gfx/common/d3d_common.cpp"
-#include "../gfx/d3d/d3d.cpp"
+#include "../gfx/drivers/d3d.cpp"
 #ifdef _XBOX
-#include "../gfx/d3d/render_chain_xdk.cpp"
+#include "../gfx/drivers/d3d_renderchains/render_chain_xdk.cpp"
 #endif
 #ifdef HAVE_CG
-#include "../gfx/d3d/render_chain_cg.cpp"
+#include "../gfx/drivers/d3d_renderchains/render_chain_cg.cpp"
 #endif
 #endif