diff --git a/Makefile.common b/Makefile.common
index ec18336cb2..c1aa3eac29 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -346,7 +346,7 @@ ifeq ($(HAVE_WINXINPUT), 1)
 endif
 
 ifeq ($(HAVE_X11), 1)
-   OBJ += input/drivers/x11_input.o gfx/context/x11_common.o input/keyboard_event_x11.o
+   OBJ += input/drivers/x11_input.o gfx/drivers_context/x11_common.o input/keyboard_event_x11.o
    LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
    DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
 endif
@@ -375,7 +375,7 @@ ifeq ($(HAVE_OPENGL), 1)
    OBJ += gfx/drivers/gl.o \
 			 gfx/gl_common.o \
 			 gfx/video_context_driver.o \
-			 gfx/context/gfx_null_ctx.o \
+			 gfx/drivers_context/gfx_null_ctx.o \
 			 gfx/fonts/gl_font.o \
 			 gfx/fonts/gl_raster_font.o \
 			 libretro-sdk/gfx/math/matrix_4x4.o \
@@ -383,39 +383,39 @@ ifeq ($(HAVE_OPENGL), 1)
 			 libretro-sdk/glsym/rglgen.o
 
    ifeq ($(HAVE_KMS), 1)
-      OBJ += gfx/context/drm_egl_ctx.o
+      OBJ += gfx/drivers_context/drm_egl_ctx.o
       DEFINES += $(GBM_CFLAGS) $(DRM_CFLAGS) $(EGL_CFLAGS)
       LIBS += $(GBM_LIBS) $(DRM_LIBS) $(EGL_LIBS)
    endif
 
    ifeq ($(HAVE_VIDEOCORE), 1)
-      OBJ += gfx/context/vc_egl_ctx.o
+      OBJ += gfx/drivers_context/vc_egl_ctx.o
       DEFINES += $(EGL_CFLAGS)
       LIBS += $(EGL_LIBS)
    endif
 
    ifeq ($(HAVE_EMSCRIPTEN), 1)
-      OBJ += gfx/context/emscriptenegl_ctx.o
+      OBJ += gfx/drivers_context/emscriptenegl_ctx.o
    endif
 
    ifeq ($(HAVE_MALI_FBDEV), 1)
-      OBJ += gfx/context/mali_fbdev_ctx.o
+      OBJ += gfx/drivers_context/mali_fbdev_ctx.o
       DEFINES += $(EGL_CFLAGS)
       LIBS += $(EGL_LIBS)
    endif
 
    ifeq ($(HAVE_VIVANTE_FBDEV), 1)
-      OBJ += gfx/context/vivante_fbdev_ctx.o
+      OBJ += gfx/drivers_context/vivante_fbdev_ctx.o
       DEFINES += $(EGL_CFLAGS)
       LIBS += $(EGL_LIBS)
    endif
 
    ifeq ($(HAVE_X11), 1)
       ifeq ($(HAVE_GLES), 0)
-         OBJ += gfx/context/glx_ctx.o
+         OBJ += gfx/drivers_context/glx_ctx.o
       endif
       ifeq ($(HAVE_EGL), 1)
-         OBJ += gfx/context/xegl_ctx.o
+         OBJ += gfx/drivers_context/xegl_ctx.o
          DEFINES += $(EGL_CFLAGS)
          LIBS += $(EGL_LIBS)
       endif
@@ -423,7 +423,7 @@ ifeq ($(HAVE_OPENGL), 1)
 
    ifeq ($(HAVE_WAYLAND), 1)
 	   ifeq ($(HAVE_EGL), 1)
-	     OBJ += gfx/context/wayland_ctx.o
+	     OBJ += gfx/drivers_context/wayland_ctx.o
       endif
    endif
 	
@@ -441,7 +441,7 @@ ifeq ($(HAVE_OPENGL), 1)
          LIBS += -framework OpenGL
       else ifneq ($(findstring Win32,$(OS)),)
          LIBS += -lopengl32 -lgdi32 -lcomdlg32
-         OBJ += gfx/context/wgl_ctx.o
+         OBJ += gfx/drivers_context/wgl_ctx.o
       else
          LIBS += -lGL
       endif
@@ -459,7 +459,7 @@ ifeq ($(HAVE_SDL), 1)
    OBJ += gfx/drivers/sdl_gfx.o input/drivers/sdl_input.o input/drivers_joypad/sdl_joypad.o audio/drivers/sdl_audio.o
 
    ifeq ($(HAVE_OPENGL), 1)
-     OBJ += gfx/context/sdl_gl_ctx.o
+     OBJ += gfx/drivers_context/sdl_gl_ctx.o
    endif
 
    JOYCONFIG_LIBS += $(SDL_LIBS)
@@ -471,7 +471,7 @@ ifeq ($(HAVE_SDL2), 1)
    OBJ += gfx/drivers/sdl2_gfx.o input/drivers/sdl_input.o input/drivers_joypad/sdl_joypad.o audio/drivers/sdl_audio.o
 
    ifeq ($(HAVE_OPENGL), 1)
-     OBJ += gfx/context/sdl_gl_ctx.o
+     OBJ += gfx/drivers_context/sdl_gl_ctx.o
    endif
 
    JOYCONFIG_LIBS += $(SDL2_LIBS)
@@ -514,7 +514,7 @@ ifeq ($(HAVE_D3D9), 1)
 			 gfx/d3d/d3d_wrapper.o \
 			 gfx/fonts/d3d_font.o \
 			 gfx/fonts/d3d_w32_font.o \
-			 gfx/context/d3d_ctx.o
+			 gfx/drivers_context/d3d_ctx.o
    DEFINES += -DHAVE_WIN32_D3D9
    LIBS += -ld3d9 -ld3dx9 -ldxguid
 
diff --git a/Makefile.emscripten b/Makefile.emscripten
index b1835ceb9b..b489cf725e 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -76,7 +76,7 @@ clean:
 	rm -f gfx/scaler/*.o
 	rm -f gfx/*.o
 	rm -f gfx/d3d/*.o
-	rm -f gfx/context/*.o
+	rm -f gfx/drivers_context/*.o
 	rm -f gfx/math/*.o
 	rm -f gfx/fonts/*.o
 	rm -f gfx/py_state/*.o
diff --git a/Makefile.pandora b/Makefile.pandora
index 6ba39ef28e..9160791bde 100644
--- a/Makefile.pandora
+++ b/Makefile.pandora
@@ -41,7 +41,7 @@ clean:
 	rm -f conf/*.o
 	rm -f gfx/*.o
 	rm -f gfx/fonts/*.o
-	rm -f gfx/context/*.o
+	rm -f gfx/drivers_context/*.o
 	rm -f gfx/py_state/*.o
 	rm -f compat/*.o
 	rm -f record/*.o
diff --git a/driver.c b/driver.c
index 48a49d5211..6d0010d1bb 100644
--- a/driver.c
+++ b/driver.c
@@ -24,7 +24,7 @@
 #include "gfx/gfx_common.h"
 
 #ifdef HAVE_X11
-#include "gfx/context/x11_common.h"
+#include "gfx/drivers_context/x11_common.h"
 #endif
 
 #ifdef HAVE_MENU
diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 2869685be2..22d4a4f6a5 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -26,7 +26,7 @@
 #endif
 #include "../gfx_common.h"
 
-#include "../context/win32_common.h"
+#include "../drivers_context/win32_common.h"
 
 #ifndef _XBOX
 #define HAVE_MONITOR
diff --git a/gfx/d3d/d3d_wrapper.h b/gfx/d3d/d3d_wrapper.h
index e9b8ea451a..8479d61391 100644
--- a/gfx/d3d/d3d_wrapper.h
+++ b/gfx/d3d/d3d_wrapper.h
@@ -17,7 +17,7 @@
 #ifndef _D3D_WRAPPER_H
 #define _D3D_WRAPPER_H
 
-#include "../context/win32_common.h"
+#include "../drivers_context/win32_common.h"
 #include "d3d_defines.h"
 
 void d3d_swap(void *data, LPDIRECT3DDEVICE dev);
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 379b854146..da2cdeabcf 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -27,7 +27,7 @@
 #include "../fonts/fonts.h"
 
 #ifdef HAVE_X11
-#include "../context/x11_common.h"
+#include "../drivers_context/x11_common.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index 8e357145fd..4d30f2da6e 100644
--- a/gfx/drivers/sdl_gfx.c
+++ b/gfx/drivers/sdl_gfx.c
@@ -25,7 +25,7 @@
 #include "../fonts/fonts.h"
 
 #ifdef HAVE_X11
-#include "../context/x11_common.h"
+#include "../drivers_context/x11_common.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index 54dbffcee4..60930a8e0c 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -22,7 +22,7 @@
 #include "../gfx_common.h"
 #include "../fonts/fonts.h"
 
-#include "../context/x11_common.h"
+#include "../drivers_context/x11_common.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/gfx/context/androidegl_ctx.c b/gfx/drivers_context/androidegl_ctx.c
similarity index 100%
rename from gfx/context/androidegl_ctx.c
rename to gfx/drivers_context/androidegl_ctx.c
diff --git a/gfx/context/bbqnx_ctx.c b/gfx/drivers_context/bbqnx_ctx.c
similarity index 100%
rename from gfx/context/bbqnx_ctx.c
rename to gfx/drivers_context/bbqnx_ctx.c
diff --git a/gfx/context/d3d_ctx.cpp b/gfx/drivers_context/d3d_ctx.cpp
similarity index 100%
rename from gfx/context/d3d_ctx.cpp
rename to gfx/drivers_context/d3d_ctx.cpp
diff --git a/gfx/context/drm_egl_ctx.c b/gfx/drivers_context/drm_egl_ctx.c
similarity index 100%
rename from gfx/context/drm_egl_ctx.c
rename to gfx/drivers_context/drm_egl_ctx.c
diff --git a/gfx/context/emscriptenegl_ctx.c b/gfx/drivers_context/emscriptenegl_ctx.c
similarity index 100%
rename from gfx/context/emscriptenegl_ctx.c
rename to gfx/drivers_context/emscriptenegl_ctx.c
diff --git a/gfx/context/gfx_null_ctx.c b/gfx/drivers_context/gfx_null_ctx.c
similarity index 100%
rename from gfx/context/gfx_null_ctx.c
rename to gfx/drivers_context/gfx_null_ctx.c
diff --git a/gfx/context/glx_ctx.c b/gfx/drivers_context/glx_ctx.c
similarity index 100%
rename from gfx/context/glx_ctx.c
rename to gfx/drivers_context/glx_ctx.c
diff --git a/gfx/context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c
similarity index 100%
rename from gfx/context/mali_fbdev_ctx.c
rename to gfx/drivers_context/mali_fbdev_ctx.c
diff --git a/gfx/context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c
similarity index 100%
rename from gfx/context/ps3_ctx.c
rename to gfx/drivers_context/ps3_ctx.c
diff --git a/gfx/context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c
similarity index 100%
rename from gfx/context/sdl_gl_ctx.c
rename to gfx/drivers_context/sdl_gl_ctx.c
diff --git a/gfx/context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
similarity index 100%
rename from gfx/context/vc_egl_ctx.c
rename to gfx/drivers_context/vc_egl_ctx.c
diff --git a/gfx/context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c
similarity index 100%
rename from gfx/context/vivante_fbdev_ctx.c
rename to gfx/drivers_context/vivante_fbdev_ctx.c
diff --git a/gfx/context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
similarity index 100%
rename from gfx/context/wayland_ctx.c
rename to gfx/drivers_context/wayland_ctx.c
diff --git a/gfx/context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
similarity index 100%
rename from gfx/context/wgl_ctx.c
rename to gfx/drivers_context/wgl_ctx.c
diff --git a/gfx/context/win32_common.h b/gfx/drivers_context/win32_common.h
similarity index 100%
rename from gfx/context/win32_common.h
rename to gfx/drivers_context/win32_common.h
diff --git a/gfx/context/x11_common.c b/gfx/drivers_context/x11_common.c
similarity index 100%
rename from gfx/context/x11_common.c
rename to gfx/drivers_context/x11_common.c
diff --git a/gfx/context/x11_common.h b/gfx/drivers_context/x11_common.h
similarity index 100%
rename from gfx/context/x11_common.h
rename to gfx/drivers_context/x11_common.h
diff --git a/gfx/context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c
similarity index 100%
rename from gfx/context/xegl_ctx.c
rename to gfx/drivers_context/xegl_ctx.c
diff --git a/gfx/image/image.h b/gfx/image/image.h
index 63232cb5f6..a483d64923 100644
--- a/gfx/image/image.h
+++ b/gfx/image/image.h
@@ -21,7 +21,7 @@
 #include <boolean.h>
 
 #ifdef _WIN32
-#include "../context/win32_common.h"
+#include "../drivers_context/win32_common.h"
 #ifdef _XBOX1
 #include "../d3d/d3d_defines.h"
 #endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 961e31ce6a..8b31318ac2 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -87,45 +87,45 @@ VIDEO CONTEXT
 ============================================================ */
 
 #include "../gfx/video_context_driver.c"
-#include "../gfx/context/gfx_null_ctx.c"
+#include "../gfx/drivers_context/gfx_null_ctx.c"
 
 #if defined(__CELLOS_LV2__)
-#include "../gfx/context/ps3_ctx.c"
+#include "../gfx/drivers_context/ps3_ctx.c"
 #elif defined(_XBOX) || defined(HAVE_WIN32_D3D9)
-#include "../gfx/context/d3d_ctx.cpp"
+#include "../gfx/drivers_context/d3d_ctx.cpp"
 #elif defined(ANDROID)
-#include "../gfx/context/androidegl_ctx.c"
+#include "../gfx/drivers_context/androidegl_ctx.c"
 #elif defined(__QNX__)
-#include "../gfx/context/bbqnx_ctx.c"
+#include "../gfx/drivers_context/bbqnx_ctx.c"
 #elif defined(EMSCRIPTEN)
-#include "../gfx/context/emscriptenegl_ctx.c"
+#include "../gfx/drivers_context/emscriptenegl_ctx.c"
 #endif
 
 
 #if defined(HAVE_OPENGL)
 
 #if defined(HAVE_KMS)
-#include "../gfx/context/drm_egl_ctx.c"
+#include "../gfx/drivers_context/drm_egl_ctx.c"
 #endif
 #if defined(HAVE_VIDEOCORE)
-#include "../gfx/context/vc_egl_ctx.c"
+#include "../gfx/drivers_context/vc_egl_ctx.c"
 #endif
 #if defined(HAVE_X11) && !defined(HAVE_OPENGLES)
-#include "../gfx/context/glx_ctx.c"
+#include "../gfx/drivers_context/glx_ctx.c"
 #endif
 
 #if defined(HAVE_EGL)
-#include "../gfx/context/xegl_ctx.c"
+#include "../gfx/drivers_context/xegl_ctx.c"
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
-#include "../gfx/context/wgl_ctx.c"
+#include "../gfx/drivers_context/wgl_ctx.c"
 #endif
 
 #endif
 
 #ifdef HAVE_X11
-#include "../gfx/context/x11_common.c"
+#include "../gfx/drivers_context/x11_common.c"
 #endif
 
 
diff --git a/input/keyboard_event_win32.c b/input/keyboard_event_win32.c
index d8dfd72a99..f60573a20e 100644
--- a/input/keyboard_event_win32.c
+++ b/input/keyboard_event_win32.c
@@ -16,7 +16,7 @@
 
 #include "../general.h"
 #include "keyboard_line.h"
-#include "../gfx/context/win32_common.h"
+#include "../gfx/drivers_context/win32_common.h"
 #include "input_common.h"
 #include "input_keymaps.h"