diff --git a/.gitmodules b/.gitmodules
index d38cabaf..9cb19541 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,13 +2,13 @@
 	path = 3rdparty/mainui
 	url = https://github.com/FWGS/mainui_cpp
 [submodule "ref_gl/nanogl"]
-	path = ref_gl/nanogl
+	path = ref/gl/nanogl
 	url = https://github.com/FWGS/nanogl
 [submodule "ref_gl/gl-wes-v2"]
-	path = ref_gl/gl-wes-v2
+	path = ref/gl/gl-wes-v2
 	url = https://github.com/FWGS/gl-wes-v2
 [submodule "ref_gl/gl4es"]
-	path = ref_gl/gl4es
+	path = ref/gl/gl4es
 	url = https://github.com/ptitSeb/gl4es
 [submodule "vgui_support"]
 	path = 3rdparty/vgui_support
diff --git a/ref_gl/exports.txt b/ref/gl/exports.txt
similarity index 100%
rename from ref_gl/exports.txt
rename to ref/gl/exports.txt
diff --git a/ref_gl/gl-wes-v2 b/ref/gl/gl-wes-v2
similarity index 100%
rename from ref_gl/gl-wes-v2
rename to ref/gl/gl-wes-v2
diff --git a/ref_gl/gl4es b/ref/gl/gl4es
similarity index 100%
rename from ref_gl/gl4es
rename to ref/gl/gl4es
diff --git a/ref_gl/gl_alias.c b/ref/gl/gl_alias.c
similarity index 100%
rename from ref_gl/gl_alias.c
rename to ref/gl/gl_alias.c
diff --git a/ref_gl/gl_backend.c b/ref/gl/gl_backend.c
similarity index 100%
rename from ref_gl/gl_backend.c
rename to ref/gl/gl_backend.c
diff --git a/ref_gl/gl_beams.c b/ref/gl/gl_beams.c
similarity index 100%
rename from ref_gl/gl_beams.c
rename to ref/gl/gl_beams.c
diff --git a/ref_gl/gl_context.c b/ref/gl/gl_context.c
similarity index 100%
rename from ref_gl/gl_context.c
rename to ref/gl/gl_context.c
diff --git a/ref_gl/gl_cull.c b/ref/gl/gl_cull.c
similarity index 100%
rename from ref_gl/gl_cull.c
rename to ref/gl/gl_cull.c
diff --git a/ref_gl/gl_dbghulls.c b/ref/gl/gl_dbghulls.c
similarity index 100%
rename from ref_gl/gl_dbghulls.c
rename to ref/gl/gl_dbghulls.c
diff --git a/ref_gl/gl_decals.c b/ref/gl/gl_decals.c
similarity index 100%
rename from ref_gl/gl_decals.c
rename to ref/gl/gl_decals.c
diff --git a/ref_gl/gl_draw.c b/ref/gl/gl_draw.c
similarity index 100%
rename from ref_gl/gl_draw.c
rename to ref/gl/gl_draw.c
diff --git a/ref_gl/gl_export.h b/ref/gl/gl_export.h
similarity index 100%
rename from ref_gl/gl_export.h
rename to ref/gl/gl_export.h
diff --git a/ref_gl/gl_frustum.c b/ref/gl/gl_frustum.c
similarity index 100%
rename from ref_gl/gl_frustum.c
rename to ref/gl/gl_frustum.c
diff --git a/ref_gl/gl_frustum.h b/ref/gl/gl_frustum.h
similarity index 100%
rename from ref_gl/gl_frustum.h
rename to ref/gl/gl_frustum.h
diff --git a/ref_gl/gl_image.c b/ref/gl/gl_image.c
similarity index 100%
rename from ref_gl/gl_image.c
rename to ref/gl/gl_image.c
diff --git a/ref_gl/gl_local.h b/ref/gl/gl_local.h
similarity index 100%
rename from ref_gl/gl_local.h
rename to ref/gl/gl_local.h
diff --git a/ref_gl/gl_opengl.c b/ref/gl/gl_opengl.c
similarity index 100%
rename from ref_gl/gl_opengl.c
rename to ref/gl/gl_opengl.c
diff --git a/ref_gl/gl_rlight.c b/ref/gl/gl_rlight.c
similarity index 100%
rename from ref_gl/gl_rlight.c
rename to ref/gl/gl_rlight.c
diff --git a/ref_gl/gl_rmain.c b/ref/gl/gl_rmain.c
similarity index 100%
rename from ref_gl/gl_rmain.c
rename to ref/gl/gl_rmain.c
diff --git a/ref_gl/gl_rmath.c b/ref/gl/gl_rmath.c
similarity index 100%
rename from ref_gl/gl_rmath.c
rename to ref/gl/gl_rmath.c
diff --git a/ref_gl/gl_rmisc.c b/ref/gl/gl_rmisc.c
similarity index 100%
rename from ref_gl/gl_rmisc.c
rename to ref/gl/gl_rmisc.c
diff --git a/ref_gl/gl_rpart.c b/ref/gl/gl_rpart.c
similarity index 100%
rename from ref_gl/gl_rpart.c
rename to ref/gl/gl_rpart.c
diff --git a/ref_gl/gl_rsurf.c b/ref/gl/gl_rsurf.c
similarity index 100%
rename from ref_gl/gl_rsurf.c
rename to ref/gl/gl_rsurf.c
diff --git a/ref_gl/gl_sprite.c b/ref/gl/gl_sprite.c
similarity index 100%
rename from ref_gl/gl_sprite.c
rename to ref/gl/gl_sprite.c
diff --git a/ref_gl/gl_studio.c b/ref/gl/gl_studio.c
similarity index 100%
rename from ref_gl/gl_studio.c
rename to ref/gl/gl_studio.c
diff --git a/ref_gl/gl_triapi.c b/ref/gl/gl_triapi.c
similarity index 100%
rename from ref_gl/gl_triapi.c
rename to ref/gl/gl_triapi.c
diff --git a/ref_gl/gl_vgui.c b/ref/gl/gl_vgui.c
similarity index 100%
rename from ref_gl/gl_vgui.c
rename to ref/gl/gl_vgui.c
diff --git a/ref_gl/gl_warp.c b/ref/gl/gl_warp.c
similarity index 100%
rename from ref_gl/gl_warp.c
rename to ref/gl/gl_warp.c
diff --git a/ref_gl/nanogl b/ref/gl/nanogl
similarity index 100%
rename from ref_gl/nanogl
rename to ref/gl/nanogl
diff --git a/ref_gl/wscript b/ref/gl/wscript
similarity index 100%
rename from ref_gl/wscript
rename to ref/gl/wscript
diff --git a/ref_soft/adivtab.h b/ref/soft/adivtab.h
similarity index 100%
rename from ref_soft/adivtab.h
rename to ref/soft/adivtab.h
diff --git a/ref_soft/r_aclip.c b/ref/soft/r_aclip.c
similarity index 100%
rename from ref_soft/r_aclip.c
rename to ref/soft/r_aclip.c
diff --git a/ref_soft/r_beams.c b/ref/soft/r_beams.c
similarity index 100%
rename from ref_soft/r_beams.c
rename to ref/soft/r_beams.c
diff --git a/ref_soft/r_bsp.c b/ref/soft/r_bsp.c
similarity index 100%
rename from ref_soft/r_bsp.c
rename to ref/soft/r_bsp.c
diff --git a/ref_soft/r_context.c b/ref/soft/r_context.c
similarity index 100%
rename from ref_soft/r_context.c
rename to ref/soft/r_context.c
diff --git a/ref_soft/r_decals.c b/ref/soft/r_decals.c
similarity index 100%
rename from ref_soft/r_decals.c
rename to ref/soft/r_decals.c
diff --git a/ref_soft/r_draw.c b/ref/soft/r_draw.c
similarity index 100%
rename from ref_soft/r_draw.c
rename to ref/soft/r_draw.c
diff --git a/ref_soft/r_edge.c b/ref/soft/r_edge.c
similarity index 100%
rename from ref_soft/r_edge.c
rename to ref/soft/r_edge.c
diff --git a/ref_soft/r_glblit.c b/ref/soft/r_glblit.c
similarity index 100%
rename from ref_soft/r_glblit.c
rename to ref/soft/r_glblit.c
diff --git a/ref_soft/r_image.c b/ref/soft/r_image.c
similarity index 100%
rename from ref_soft/r_image.c
rename to ref/soft/r_image.c
diff --git a/ref_soft/r_light.c b/ref/soft/r_light.c
similarity index 100%
rename from ref_soft/r_light.c
rename to ref/soft/r_light.c
diff --git a/ref_soft/r_local.h b/ref/soft/r_local.h
similarity index 100%
rename from ref_soft/r_local.h
rename to ref/soft/r_local.h
diff --git a/ref_soft/r_main.c b/ref/soft/r_main.c
similarity index 100%
rename from ref_soft/r_main.c
rename to ref/soft/r_main.c
diff --git a/ref_soft/r_math.c b/ref/soft/r_math.c
similarity index 100%
rename from ref_soft/r_math.c
rename to ref/soft/r_math.c
diff --git a/ref_soft/r_misc.c b/ref/soft/r_misc.c
similarity index 100%
rename from ref_soft/r_misc.c
rename to ref/soft/r_misc.c
diff --git a/ref_soft/r_part.c b/ref/soft/r_part.c
similarity index 100%
rename from ref_soft/r_part.c
rename to ref/soft/r_part.c
diff --git a/ref_soft/r_polyse.c b/ref/soft/r_polyse.c
similarity index 100%
rename from ref_soft/r_polyse.c
rename to ref/soft/r_polyse.c
diff --git a/ref_soft/r_rast.c b/ref/soft/r_rast.c
similarity index 100%
rename from ref_soft/r_rast.c
rename to ref/soft/r_rast.c
diff --git a/ref_soft/r_scan.c b/ref/soft/r_scan.c
similarity index 100%
rename from ref_soft/r_scan.c
rename to ref/soft/r_scan.c
diff --git a/ref_soft/r_sprite.c b/ref/soft/r_sprite.c
similarity index 100%
rename from ref_soft/r_sprite.c
rename to ref/soft/r_sprite.c
diff --git a/ref_soft/r_studio.c b/ref/soft/r_studio.c
similarity index 100%
rename from ref_soft/r_studio.c
rename to ref/soft/r_studio.c
diff --git a/ref_soft/r_surf.c b/ref/soft/r_surf.c
similarity index 100%
rename from ref_soft/r_surf.c
rename to ref/soft/r_surf.c
diff --git a/ref_soft/r_trialias.c b/ref/soft/r_trialias.c
similarity index 100%
rename from ref_soft/r_trialias.c
rename to ref/soft/r_trialias.c
diff --git a/ref_soft/r_triapi.c b/ref/soft/r_triapi.c
similarity index 100%
rename from ref_soft/r_triapi.c
rename to ref/soft/r_triapi.c
diff --git a/ref_soft/r_vgui.c b/ref/soft/r_vgui.c
similarity index 100%
rename from ref_soft/r_vgui.c
rename to ref/soft/r_vgui.c
diff --git a/ref_soft/wscript b/ref/soft/wscript
similarity index 100%
rename from ref_soft/wscript
rename to ref/soft/wscript