diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 24741c43..a0ce865b 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -59,9 +59,9 @@ set(SOURCES
 	decoders/yuv420.c
 	renderers/opengl.c
 	renderers/egl.c
-	renderers/egl_shader.c
-	renderers/egl_texture.c
-	renderers/egl_model.c	
+	renderers/egl/shader.c
+	renderers/egl/texture.c
+	renderers/egl/model.c	
 	fonts/sdl.c
 )
 
diff --git a/client/renderers/egl.c b/client/renderers/egl.c
index 604aea72..6967a2ae 100644
--- a/client/renderers/egl.c
+++ b/client/renderers/egl.c
@@ -26,9 +26,9 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <SDL2/SDL_syswm.h>
 #include <SDL2/SDL_egl.h>
 
-#include "egl_model.h"
-#include "egl_shader.h"
-#include "egl_shader_progs.h"
+#include "egl/model.h"
+#include "egl/shader.h"
+#include "egl/progs.h"
 
 struct Options
 {
diff --git a/client/renderers/egl_model.c b/client/renderers/egl/model.c
similarity index 98%
rename from client/renderers/egl_model.c
rename to client/renderers/egl/model.c
index f97ed4c8..e55ee7f8 100644
--- a/client/renderers/egl_model.c
+++ b/client/renderers/egl/model.c
@@ -17,9 +17,9 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "egl_model.h"
-#include "egl_shader.h"
-#include "egl_texture.h"
+#include "model.h"
+#include "shader.h"
+#include "texture.h"
 
 #include "debug.h"
 #include "utils.h"
diff --git a/client/renderers/egl_model.h b/client/renderers/egl/model.h
similarity index 96%
rename from client/renderers/egl_model.h
rename to client/renderers/egl/model.h
index 1034d11f..b42ad0c6 100644
--- a/client/renderers/egl_model.h
+++ b/client/renderers/egl/model.h
@@ -20,8 +20,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #pragma once
 
 #include <stdbool.h>
-#include "egl_shader.h"
-#include "egl_texture.h"
+#include "shader.h"
+#include "texture.h"
 
 #define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
diff --git a/client/renderers/egl_shader_progs.h b/client/renderers/egl/progs.h
similarity index 98%
rename from client/renderers/egl_shader_progs.h
rename to client/renderers/egl/progs.h
index 3e38d92f..a433ad3a 100644
--- a/client/renderers/egl_shader_progs.h
+++ b/client/renderers/egl/progs.h
@@ -17,8 +17,8 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef _EGL_SHADER_PROGS_H
-#define _EGL_SHADER_PROGS_H
+#ifndef _EGL_PROGS_H
+#define _EGL_PROGS_H
 
 static const char egl_vertex_shader_desktop[] = "\
 #version 300 es\n\
diff --git a/client/renderers/egl_shader.c b/client/renderers/egl/shader.c
similarity index 99%
rename from client/renderers/egl_shader.c
rename to client/renderers/egl/shader.c
index 34bf2789..bd3f6ebe 100644
--- a/client/renderers/egl_shader.c
+++ b/client/renderers/egl/shader.c
@@ -17,7 +17,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "egl_shader.h"
+#include "shader.h"
 #include "debug.h"
 #include "utils.h"
 
diff --git a/client/renderers/egl_shader.h b/client/renderers/egl/shader.h
similarity index 100%
rename from client/renderers/egl_shader.h
rename to client/renderers/egl/shader.h
diff --git a/client/renderers/egl_texture.c b/client/renderers/egl/texture.c
similarity index 99%
rename from client/renderers/egl_texture.c
rename to client/renderers/egl/texture.c
index a75266e3..a51f34a6 100644
--- a/client/renderers/egl_texture.c
+++ b/client/renderers/egl/texture.c
@@ -17,7 +17,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "egl_texture.h"
+#include "texture.h"
 #include "debug.h"
 #include "utils.h"
 
diff --git a/client/renderers/egl_texture.h b/client/renderers/egl/texture.h
similarity index 98%
rename from client/renderers/egl_texture.h
rename to client/renderers/egl/texture.h
index 8871b8df..ff743381 100644
--- a/client/renderers/egl_texture.h
+++ b/client/renderers/egl/texture.h
@@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #pragma once
 
 #include <stdbool.h>
-#include "egl_shader.h"
+#include "shader.h"
 
 #define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>