diff --git a/Config.in b/Config.in index 85bb6b429f6ac1adbe6fbe28c6b09adff846910c..1593357ef9ef3a313824316f7b96cc9378059abd 100644 --- a/Config.in +++ b/Config.in @@ -167,6 +167,7 @@ menu "Emulators" source "$BR2_EXTERNAL_RECALBOX_PATH/package/reicast-old/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/reicast/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/retroarch-assets/Config.in" + source "$BR2_EXTERNAL_RECALBOX_PATH/package/retroarch-slang-shaders/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/retroarch/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/scummvm/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/sdlpop/Config.in" diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_lcd3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_lcd3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_lcd3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_lcd3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_lcd3x_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_lcd3x_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_lcd3x_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_lcd3x_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_lcd3x_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_lcd3x_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_lcd3x_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_lcd3x_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_retro.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_retro.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_retro.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_retro.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_retro_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_retro_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_retro_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_retro_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_retro_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_retro_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_retro_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_retro_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_scanline_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_scanline_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_scanline_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_scanline_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_scanline_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_scanline_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/4xbr_scanline_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/4xbr_scanline_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_lcd3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_lcd3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_lcd3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_lcd3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_lcd3x_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_lcd3x_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_lcd3x_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_lcd3x_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_lcd3x_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_lcd3x_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_lcd3x_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_lcd3x_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_retro.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_retro.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_retro.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_retro.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_retro_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_retro_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_retro_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_retro_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_retro_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_retro_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_retro_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_retro_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_scanline_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_scanline_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_scanline_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_scanline_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_scanline_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_scanline_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/5xbr_scanline_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/5xbr_scanline_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-caligari.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-caligari.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-caligari.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-caligari.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-caligari_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-caligari_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-caligari_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-caligari_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-caligari_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-caligari_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-caligari_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-caligari_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-nes-mini.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-nes-mini.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-nes-mini.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-nes-mini.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-pi-barrel.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-pi-barrel.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-pi-barrel.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-pi-barrel.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-pi-mask.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-pi-mask.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/crt-pi-mask.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/crt-pi-mask.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/dot-green.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/dot-green.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/dot-green.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/dot-green.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/dot-green2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/dot-green2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/dot-green2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/dot-green2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/dot-green3.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/dot-green3.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/dot-green3.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/dot-green3.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/dot.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/dot.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/dot.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/dot.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/4xbr-v1.1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/4xbr-v1.1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/4xbr-v1.1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/4xbr-v1.1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/5xbr-v1.1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/5xbr-v1.1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/5xbr-v1.1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/5xbr-v1.1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/5xbr-v2.1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/5xbr-v2.1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/5xbr-v2.1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/5xbr-v2.1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/background.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/background.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/background.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/background.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/bsnes_gamma_ramp_115.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/bsnes_gamma_ramp_115.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/bsnes_gamma_ramp_115.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/bsnes_gamma_ramp_115.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/bsnes_gamma_ramp_125.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/bsnes_gamma_ramp_125.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/bsnes_gamma_ramp_125.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/bsnes_gamma_ramp_125.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/crt-caligari.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/crt-caligari.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/crt-caligari.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/crt-caligari.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/crt-nes-mini.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/crt-nes-mini.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/crt-nes-mini.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/crt-nes-mini.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/dot-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/dot-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/dot-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/dot-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/dot.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/dot.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/dot.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/dot.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/gb-pass-4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/gb-pass-4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/hq2x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/hq2x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/hq2x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/hq2x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/lcd3x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/lcd3x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/lcd3x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/lcd3x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/palette.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/palette.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/palette.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/palette.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/palette2.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/palette2.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/palette2.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/palette2.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/palette3.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/palette3.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/palette3.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/palette3.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/phosphor.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/phosphor.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/phosphor.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/phosphor.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/retro-v2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/retro-v2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/retro-v2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/retro-v2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/scanline.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/scanline.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/scanline.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/scanline.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/waterpaint-scanline.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/waterpaint-scanline.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/waterpaint-scanline.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/waterpaint-scanline.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/files/xbr-lv1-noblend.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/xbr-lv1-noblend.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/files/xbr-lv1-noblend.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/files/xbr-lv1-noblend.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_lcd3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_lcd3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_lcd3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_lcd3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_lcd3x_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_lcd3x_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_lcd3x_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_lcd3x_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_lcd3x_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_lcd3x_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_lcd3x_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_lcd3x_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_retro.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_retro.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_retro.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_retro.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_retro_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_retro_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_retro_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_retro_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_retro_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_retro_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_retro_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_retro_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_scanline_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_scanline_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_scanline_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_scanline_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_scanline_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_scanline_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/hq2x_scanline_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/hq2x_scanline_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lcd3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lcd3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lcd3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lcd3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lcd3x_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lcd3x_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lcd3x_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lcd3x_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lcd3x_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lcd3x_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lcd3x_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lcd3x_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/3dfx_pass_0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/3dfx_pass_0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/3dfx_pass_0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/3dfx_pass_0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/3dfx_pass_1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/3dfx_pass_1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/3dfx_pass_1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/3dfx_pass_1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/old/3dfx_4x1.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/old/3dfx_4x1.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/old/3dfx_4x1.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/old/3dfx_4x1.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/old/3dfx_pass_0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/old/3dfx_pass_0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/old/3dfx_pass_0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/old/3dfx_pass_0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/old/3dfx_pass_1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/old/3dfx_pass_1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/old/3dfx_pass_1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/old/3dfx_pass_1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/old/3dfx_pass_2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/old/3dfx_pass_2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/3dfx/shaders/old/3dfx_pass_2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/3dfx/shaders/old/3dfx_pass_2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/aa-shader-4.0-level2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/aa-shader-4.0-level2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/aa-shader-4.0-level2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/aa-shader-4.0-level2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/aa-shader-4.0.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/aa-shader-4.0.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/aa-shader-4.0.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/aa-shader-4.0.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/aa-shader-4.o.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/aa-shader-4.o.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/aa-shader-4.o.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/aa-shader-4.o.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/advanced-aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/advanced-aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/advanced-aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/advanced-aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/fx-aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/fx-aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/fx-aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/fx-aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/fxaa-edge-detect.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/fxaa-edge-detect.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/fxaa-edge-detect.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/fxaa-edge-detect.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/fxaa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/fxaa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/fxaa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/fxaa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/reverse-aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/reverse-aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/reverse-aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/reverse-aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1-noblend.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1-noblend.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1-noblend.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1-noblend.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.0-level2/aa-shader-4.0-level2-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.o.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.o.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/aa-shader-4.o.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/aa-shader-4.o.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/advanced-aa.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/advanced-aa.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/advanced-aa.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/advanced-aa.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/ewa_curvature.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/ewa_curvature.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/ewa_curvature.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/ewa_curvature.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/fx-aa.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/fx-aa.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/fx-aa.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/fx-aa.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/fxaa-edge-detect.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/fxaa-edge-detect.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/fxaa-edge-detect.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/fxaa-edge-detect.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/fxaa.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/fxaa.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/fxaa.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/fxaa.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/reverse-aa.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/reverse-aa.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/anti-aliasing/shaders/reverse-aa.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/anti-aliasing/shaders/reverse-aa.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/auto-box/box-center.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/auto-box/box-center.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/auto-box/box-center.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/auto-box/box-center.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/auto-box/box-max.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/auto-box/box-max.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/auto-box/box-max.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/auto-box/box-max.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/auto-box/box.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/auto-box/box.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/auto-box/box.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/auto-box/box.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/auto-box/sharpen-lighter-box.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/auto-box/sharpen-lighter-box.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/auto-box/sharpen-lighter-box.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/auto-box/sharpen-lighter-box.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/bicubic-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/bicubic-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/bicubic-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/bicubic-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/bicubic-normal.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/bicubic-normal.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/bicubic-normal.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/bicubic-normal.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/bicubic-sharp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/bicubic-sharp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/bicubic-sharp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/bicubic-sharp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/bicubic-sharper.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/bicubic-sharper.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/bicubic-sharper.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/bicubic-sharper.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/shaders/bicubic-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/shaders/bicubic-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/shaders/bicubic-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/shaders/bicubic-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/shaders/bicubic-normal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/shaders/bicubic-normal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/shaders/bicubic-normal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/shaders/bicubic-normal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/shaders/bicubic-sharp.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/shaders/bicubic-sharp.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/shaders/bicubic-sharp.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/shaders/bicubic-sharp.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/shaders/bicubic-sharper.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/shaders/bicubic-sharper.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bicubic/shaders/bicubic-sharper.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bicubic/shaders/bicubic-sharper.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bilinear.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bilinear.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/bilinear.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/bilinear.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/bilateral.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/bilateral.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/bilateral.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/bilateral.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur-gauss-h.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur-gauss-h.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur-gauss-h.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur-gauss-h.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur-gauss-v.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur-gauss-v.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur-gauss-v.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur-gauss-v.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11fast-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11fast-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur11resize-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur11resize-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3fast-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3fast-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3resize-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3resize-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3resize-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3resize-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3resize-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3resize-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3resize-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3resize-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3resize-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3resize-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3resize-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3resize-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3resize-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3resize-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3resize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3resize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur3x3resize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur3x3resize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5fast-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5fast-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5resize-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5resize-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5x5-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5x5-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5x5-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5x5-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5x5-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5x5-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5x5-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5x5-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5x5-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5x5-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5x5-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5x5-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5x5.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5x5.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur5x5.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur5x5.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7fast-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7fast-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7resize-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7resize-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7x7-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7x7-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7x7-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7x7-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7x7-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7x7-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7x7-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7x7-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7x7-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7x7-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7x7-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7x7-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7x7.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7x7.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur7x7.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur7x7.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9fast-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9fast-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-horizontal-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-horizontal-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-horizontal-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-horizontal-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-horizontal-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-horizontal-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-horizontal-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-horizontal-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-horizontal-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-horizontal-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-horizontal-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-horizontal-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-vertical-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-vertical-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-vertical-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-vertical-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9resize-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9resize-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9x9-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9x9-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9x9-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9x9-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9x9-last-pass-gamma-encode-every-fbo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9x9-last-pass-gamma-encode-every-fbo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9x9-last-pass-gamma-encode-every-fbo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9x9-last-pass-gamma-encode-every-fbo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9x9-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9x9-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9x9-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9x9-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9x9.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9x9.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/blur9x9.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/blur9x9.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/delinearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/delinearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/delinearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/delinearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase5.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase5.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase5.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase5.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase6.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase6.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase6.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase6.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase7.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase7.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/kawase7.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/kawase7.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/linearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/linearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/linearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/linearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/screen_combine.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/screen_combine.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase/screen_combine.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase/screen_combine.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase_blur_5pass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase_blur_5pass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase_blur_5pass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase_blur_5pass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase_blur_9pass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase_blur_9pass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase_blur_9pass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase_blur_9pass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase_glow.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase_glow.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/kawase_glow.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/kawase_glow.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/sharpsmoother.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/sharpsmoother.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/sharpsmoother.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/sharpsmoother.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/smart-blur.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/smart-blur.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/blurs/smart-blur.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/blurs/smart-blur.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/bigblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/bigblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/bigblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/bigblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/color-grid.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/color-grid.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/color-grid.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/color-grid.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/README.md b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/README.md similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/README.md rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/README.md diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-crt-easymode.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-crt-easymode.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-crt-easymode.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-crt-easymode.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-crt-geom-1x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-crt-geom-1x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-crt-geom-1x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-crt-geom-1x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-crt-royale.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-crt-royale.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-crt-royale.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-crt-royale.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-gba-color+crt-easymode.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-gba-color+crt-easymode.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-gba-color+crt-easymode.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-gba-color+crt-easymode.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-gba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-gba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player-gba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player-gba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/gameboy-player.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/gameboy-player.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpblack.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpblack.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpblack.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpblack.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpblocks.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpblocks.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpblocks.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpblocks.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpcamo.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpcamo.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpcamo.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpcamo.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpcube.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpcube.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpcube.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpcube.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpcube2.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpcube2.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpcube2.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpcube2.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpknit.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpknit.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpknit.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpknit.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpmachine.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpmachine.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpmachine.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpmachine.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpplanets.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpplanets.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpplanets.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpplanets.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbppokemon.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbppokemon.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbppokemon.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbppokemon.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpstone.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpstone.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpstone.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpstone.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpwood.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpwood.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/gameboy-player/sample-borders/gbpwood.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/gameboy-player/sample-borders/gbpwood.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/imgborder/border-1080p.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/imgborder/border-1080p.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/imgborder/border-1080p.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/imgborder/border-1080p.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/imgborder/imgborder-1080p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/imgborder/imgborder-1080p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/imgborder/imgborder-1080p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/imgborder/imgborder-1080p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/mudlord.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/mudlord.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/mudlord.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/mudlord.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/bigblur-horiz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/bigblur-horiz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/bigblur-horiz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/bigblur-horiz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/bigblur-vert.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/bigblur-vert.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/bigblur-vert.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/bigblur-vert.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/bigblur.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/bigblur.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/bigblur.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/bigblur.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid-1080p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid-1080p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid-1080p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid-1080p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid-1440p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid-1440p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid-1440p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid-1440p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid-2160p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid-2160p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid-2160p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid-2160p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid-2560x1600.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid-2560x1600.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid-2560x1600.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid-2560x1600.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/color-grid.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/color-grid.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-1080p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-1080p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-1080p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-1080p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-1440p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-1440p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-1440p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-1440p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-2160p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-2160p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-2160p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-2160p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-2560x1600.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-2560x1600.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-2560x1600.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-2560x1600.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-gameboy-player.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-gameboy-player.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-gameboy-player.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-gameboy-player.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-sgb.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-sgb.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-sgb.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-sgb.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-sgba.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-sgba.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/imgborder-sgba.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/imgborder-sgba.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord-1080p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord-1080p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord-1080p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord-1080p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord-1440p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord-1440p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord-1440p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord-1440p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord-2160p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord-2160p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord-2160p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord-2160p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord-2560x1600.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord-2560x1600.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord-2560x1600.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord-2560x1600.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/mudlord.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/mudlord.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations-1080p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations-1080p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations-1080p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations-1080p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations-1440p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations-1440p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations-1440p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations-1440p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations-2160p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations-2160p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations-2160p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations-2160p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations-2560x1600.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations-2560x1600.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations-2560x1600.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations-2560x1600.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/shiny-iterations.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/shiny-iterations.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow-1080p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow-1080p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow-1080p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow-1080p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow-1440p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow-1440p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow-1440p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow-1440p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow-2160p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow-2160p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow-2160p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow-2160p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow-2560x1600.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow-2560x1600.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow-2560x1600.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow-2560x1600.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/snow.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/snow.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi-1080p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi-1080p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi-1080p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi-1080p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi-1440p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi-1440p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi-1440p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi-1440p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi-2160p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi-2160p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi-2160p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi-2160p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi-2560x1600.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi-2560x1600.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi-2560x1600.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi-2560x1600.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/voronoi.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/voronoi.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water-1080p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water-1080p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water-1080p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water-1080p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water-1440p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water-1440p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water-1440p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water-1440p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water-2160p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water-2160p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water-2160p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water-2160p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water-2560x1600.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water-2560x1600.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water-2560x1600.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water-2560x1600.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/resources/water.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/resources/water.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/README.md b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/README.md similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/README.md rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/README.md diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-berry.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-berry.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-berry.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-berry.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-dandelion.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-dandelion.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-dandelion.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-dandelion.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-grape.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-grape.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-grape.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-grape.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-kiwi.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-kiwi.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-kiwi.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-kiwi.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-red.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-red.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-red.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-red.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-teal.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-teal.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/gbc-teal.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/gbc-teal.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/pokemon-crystal.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/pokemon-crystal.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/pokemon-crystal.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/pokemon-crystal.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/sgb-default.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/sgb-default.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/sgb-default.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/sgb-default.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/sgb2-circuitboard.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/sgb2-circuitboard.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/sgb2-circuitboard.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/sgb2-circuitboard.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/sgb2-default.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/sgb2-default.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sample-borders/sgb2-default.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sample-borders/sgb2-default.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-crt-easymode.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-crt-easymode.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-crt-easymode.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-crt-easymode.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-crt-geom-1x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-crt-geom-1x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-crt-geom-1x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-crt-geom-1x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-crt-royale.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-crt-royale.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-crt-royale.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-crt-royale.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-gbc-color-tvout+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-gbc-color-tvout+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-gbc-color-tvout+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-gbc-color-tvout+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-gbc-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-gbc-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-gbc-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-gbc-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-tvout+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-tvout+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb-tvout+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb-tvout+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgb/sgb.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgb/sgb.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/README.md b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/README.md similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/README.md rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/README.md diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sample-borders/sgba-black.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sample-borders/sgba-black.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sample-borders/sgba-black.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sample-borders/sgba-black.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sample-borders/sgba-indigo.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sample-borders/sgba-indigo.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sample-borders/sgba-indigo.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sample-borders/sgba-indigo.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sample-borders/sgba-platinum.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sample-borders/sgba-platinum.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sample-borders/sgba-platinum.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sample-borders/sgba-platinum.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sample-borders/sgba-spice.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sample-borders/sgba-spice.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sample-borders/sgba-spice.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sample-borders/sgba-spice.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba-gba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba-gba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba-gba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba-gba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba-tvout+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba-tvout+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba-tvout+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba-tvout+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba-tvout-gba-color+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba-tvout-gba-color+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba-tvout-gba-color+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba-tvout-gba-color+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/sgba/sgba.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/sgba/sgba.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/shiny-iterations.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/shiny-iterations.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/shiny-iterations.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/shiny-iterations.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/snow.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/snow.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/snow.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/snow.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/voronoi.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/voronoi.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/voronoi.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/voronoi.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/water.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/water.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/borders/water.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/borders/water.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/MMJ_Cel_Shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/MMJ_Cel_Shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/MMJ_Cel_Shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/MMJ_Cel_Shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/MMJ_Cel_Shader_MP.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/MMJ_Cel_Shader_MP.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/MMJ_Cel_Shader_MP.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/MMJ_Cel_Shader_MP.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/advcartoon.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/advcartoon.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/advcartoon.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/advcartoon.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_3dfx.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_3dfx.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_3dfx.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_3dfx.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_strong.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_strong.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_strong.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_strong.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_strong_extra.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_strong_extra.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_strong_extra.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_strong_extra.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_variant.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_variant.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_variant.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_variant.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_variant.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_variant.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_variant.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_variant.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_bayer.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_bayer.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_bayer.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_bayer.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_deposterize.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_deposterize.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_deposterize.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_deposterize.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_gendither.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_gendither.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_gendither.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_gendither.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_natural_colors.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_natural_colors.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_natural_colors.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_natural_colors.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_ntsc.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_ntsc.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_ntsc.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_Shader_vhs_variant_ntsc.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_shader_cmyk_halftone.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_shader_cmyk_halftone.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/MMJ_Cel_shader_cmyk_halftone.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/MMJ_Cel_shader_cmyk_halftone.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/vhs_variant.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/vhs_variant.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/presets/vhs_variant.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/presets/vhs_variant.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader_MP_Blur_H.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader_MP_Blur_H.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader_MP_Blur_H.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader_MP_Blur_H.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader_MP_Blur_V.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader_MP_Blur_V.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader_MP_Blur_V.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader_MP_Blur_V.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader_MP_Color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader_MP_Color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader_MP_Color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader_MP_Color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader_MP_Outline.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader_MP_Outline.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/MMJ_Cel_Shader_MP_Outline.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/MMJ_Cel_Shader_MP_Outline.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/advcartoon.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/advcartoon.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cel/shaders/advcartoon.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cel/shaders/advcartoon.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2x2xscalehq.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2x2xscalehq.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2x2xscalehq.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2x2xscalehq.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2xbr-crt-hyllian.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2xbr-crt-hyllian.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2xbr-crt-hyllian.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2xbr-crt-hyllian.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2xbr-hybrid-crt-hyllian.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2xbr-hybrid-crt-hyllian.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2xbr-hybrid-crt-hyllian.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2xbr-hybrid-crt-hyllian.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2xbr-jinc2-sharper-hybrid.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2xbr-jinc2-sharper-hybrid.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2xbr-jinc2-sharper-hybrid.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2xbr-jinc2-sharper-hybrid.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2xbr-reverse-aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2xbr-reverse-aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/2xbr-reverse-aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/2xbr-reverse-aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/crt-reverse-aa-ddt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/crt-reverse-aa-ddt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/crt-reverse-aa-ddt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/crt-reverse-aa-ddt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/gameboy-colors.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/gameboy-colors.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/gameboy-colors.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/gameboy-colors.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/gameboy-screen-grid+motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/gameboy-screen-grid+motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/gameboy-screen-grid+motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/gameboy-screen-grid+motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/gameboy-screen-grid.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/gameboy-screen-grid.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/gameboy-screen-grid.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/gameboy-screen-grid.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/lowquality-lcd+motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/lowquality-lcd+motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/lowquality-lcd+motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/lowquality-lcd+motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/lowquality-lcd.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/lowquality-lcd.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/lowquality-lcd.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/lowquality-lcd.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter-480i.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter-480i.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter-480i.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter-480i.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter-angrylion-force240p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter-angrylion-force240p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter-angrylion-force240p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter-angrylion-force240p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter-crt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter-crt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter-crt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter-crt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter-scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter-scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter-scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter-scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/n64-vifilter/vifilter.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/n64-vifilter/vifilter.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout-jinc-sharpen+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout-jinc-sharpen+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout+interlacing/tvout-jinc-sharpen+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout+interlacing/tvout-jinc-sharpen+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-256px-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-256px-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-256px-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-256px-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-256px-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-256px-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-256px-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-256px-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-2phase-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-2phase-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-2phase-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-2phase-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-2phase-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-2phase-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-2phase-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-2phase-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-320px-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-320px-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-320px-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-320px-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-320px-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-320px-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-320px-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-320px-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-3phase-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-3phase-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-3phase-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-3phase-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-3phase-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-3phase-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout+ntsc-3phase-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout+ntsc-3phase-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout-jinc-sharpen.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout-jinc-sharpen.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout-jinc-sharpen.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout-jinc-sharpen.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout-pixelsharp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout-pixelsharp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout-pixelsharp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout-pixelsharp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/tvout/tvout.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/tvout/tvout.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-dilation-smart-blur-4xsoft.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-dilation-smart-blur-4xsoft.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-dilation-smart-blur-4xsoft.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-dilation-smart-blur-4xsoft.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-dtt-dilation-soft2-aa-gamma.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-dtt-dilation-soft2-aa-gamma.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-dtt-dilation-soft2-aa-gamma.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-dtt-dilation-soft2-aa-gamma.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-hybrid-bicubic.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-hybrid-bicubic.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-hybrid-bicubic.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-hybrid-bicubic.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-hybrid-ddt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-hybrid-ddt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-hybrid-ddt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-hybrid-ddt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-hybrid-lanczos.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-hybrid-lanczos.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-hybrid-lanczos.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-hybrid-lanczos.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-hybrid-sharp-lanczos.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-hybrid-sharp-lanczos.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-hybrid-sharp-lanczos.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-hybrid-sharp-lanczos.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-smart-blur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-smart-blur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cgp/xbr-smart-blur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cgp/xbr-smart-blur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt-pi/crt-pi-barrel.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt-pi/crt-pi-barrel.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt-pi/crt-pi-barrel.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt-pi/crt-pi-barrel.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt-pi/crt-pi-mask.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt-pi/crt-pi-mask.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt-pi/crt-pi-mask.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt-pi/crt-pi-mask.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt-pi/crt-pi.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt-pi/crt-pi.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt-pi/crt-pi.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt-pi/crt-pi.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/4xbr-hybrid-crt-b.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/4xbr-hybrid-crt-b.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/4xbr-hybrid-crt-b.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/4xbr-hybrid-crt-b.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/4xbr-hybrid-crt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/4xbr-hybrid-crt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/4xbr-hybrid-crt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/4xbr-hybrid-crt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/GritsScanlines.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/GritsScanlines.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/GritsScanlines.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/GritsScanlines.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-aperture.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-aperture.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-aperture.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-aperture.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-caligari.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-caligari.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-caligari.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-caligari.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-cgwg-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-cgwg-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-cgwg-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-cgwg-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-easymode-halation.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-easymode-halation.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-easymode-halation.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-easymode-halation.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-easymode.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-easymode.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-easymode.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-easymode.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-geom.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-geom.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-geom.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-geom.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-guest-dr-venom-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-guest-dr-venom-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-guest-dr-venom-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-guest-dr-venom-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-guest-dr-venom.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-guest-dr-venom.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-guest-dr-venom.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-guest-dr-venom.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-guest-sm.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-guest-sm.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-guest-sm.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-guest-sm.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian-3d.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian-3d.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian-3d.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian-3d.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian-glow.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian-glow.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian-glow.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian-glow.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-hyllian.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-hyllian.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-interlaced-halation.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-interlaced-halation.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-interlaced-halation.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-interlaced-halation.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-lottes-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-lottes-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-lottes-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-lottes-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-lottes-halation.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-lottes-halation.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-lottes-halation.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-lottes-halation.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-lottes-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-lottes-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-lottes-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-lottes-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-lottes.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-lottes.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-lottes.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-lottes.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-mattias.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-mattias.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-mattias.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-mattias.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-nes-mini.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-nes-mini.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-nes-mini.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-nes-mini.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-pi-vertical.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-pi-vertical.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-pi-vertical.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-pi-vertical.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-pi.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-pi.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-pi.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-pi.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-potato-cool.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-potato-cool.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-potato-cool.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-potato-cool.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-potato-warm.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-potato-warm.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-potato-warm.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-potato-warm.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-reverse-aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-reverse-aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-reverse-aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-reverse-aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-fake-bloom-intel.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-fake-bloom-intel.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-fake-bloom-intel.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-fake-bloom-intel.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-fake-bloom.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-fake-bloom.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-fake-bloom.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-fake-bloom.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-intel.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-intel.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-intel.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-intel.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-ntsc-256px-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-ntsc-256px-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-ntsc-256px-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-ntsc-256px-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-ntsc-256px-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-ntsc-256px-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-ntsc-256px-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-ntsc-256px-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-ntsc-320px-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-ntsc-320px-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-ntsc-320px-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-ntsc-320px-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-ntsc-320px-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-ntsc-320px-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-ntsc-320px-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-ntsc-320px-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-pal-r57shell.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-pal-r57shell.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-pal-r57shell.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-pal-r57shell.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-tvout+image-adjustment.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-tvout+image-adjustment.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale-tvout+image-adjustment.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale-tvout+image-adjustment.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-royale.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-royale.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-torridgristle.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-torridgristle.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-torridgristle.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-torridgristle.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-yo6-KV-M1420B-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-yo6-KV-M1420B-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-yo6-KV-M1420B-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-yo6-KV-M1420B-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-yo6-KV-M1420B-sharp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-yo6-KV-M1420B-sharp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-yo6-KV-M1420B-sharp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-yo6-KV-M1420B-sharp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-yo6-KV-M1420B.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-yo6-KV-M1420B.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crt-yo6-KV-M1420B.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crt-yo6-KV-M1420B.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crtglow_gauss.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crtglow_gauss.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crtglow_gauss.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crtglow_gauss.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crtglow_gauss_ntsc_3phase.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crtglow_gauss_ntsc_3phase.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crtglow_gauss_ntsc_3phase.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crtglow_gauss_ntsc_3phase.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crtglow_lanczos.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crtglow_lanczos.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crtglow_lanczos.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crtglow_lanczos.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crtsim.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crtsim.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/crtsim.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/crtsim.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/dotmask.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/dotmask.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/dotmask.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/dotmask.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/fakelottes.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/fakelottes.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/fakelottes.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/fakelottes.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/gtuv50-radeon.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/gtuv50-radeon.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/gtuv50-radeon.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/gtuv50-radeon.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/gtuv50.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/gtuv50.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/gtuv50.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/gtuv50.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/mame_hlsl.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/mame_hlsl.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/mame_hlsl.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/mame_hlsl.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/metacrt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/metacrt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/metacrt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/metacrt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/ntsc-shadowmask-interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/ntsc-shadowmask-interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/ntsc-shadowmask-interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/ntsc-shadowmask-interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/ntsc-shadowmask-noblend.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/ntsc-shadowmask-noblend.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/ntsc-shadowmask-noblend.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/ntsc-shadowmask-noblend.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/ntsc-shadowmask.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/ntsc-shadowmask.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/ntsc-shadowmask.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/ntsc-shadowmask.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/phosphor-trails.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/phosphor-trails.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/phosphor-trails.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/phosphor-trails.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/phosphorlut-4k.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/phosphorlut-4k.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/phosphorlut-4k.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/phosphorlut-4k.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/phosphorlut-shadowmask.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/phosphorlut-shadowmask.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/phosphorlut-shadowmask.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/phosphorlut-shadowmask.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/phosphorlut.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/phosphorlut.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/phosphorlut.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/phosphorlut.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/4xbr-hybrid-crt-b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/4xbr-hybrid-crt-b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/4xbr-hybrid-crt-b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/4xbr-hybrid-crt-b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/4xbr-hybrid-crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/4xbr-hybrid-crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/4xbr-hybrid-crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/4xbr-hybrid-crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/GritsScanlines/Fake-Self-Illumination.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/GritsScanlines/Fake-Self-Illumination.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/GritsScanlines/Fake-Self-Illumination.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/GritsScanlines/Fake-Self-Illumination.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/GritsScanlines/GritsScanlines.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/GritsScanlines/GritsScanlines.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/GritsScanlines/GritsScanlines.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/GritsScanlines/GritsScanlines.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/GritsScanlines/Scanline-LUT-4px.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/GritsScanlines/Scanline-LUT-4px.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/GritsScanlines/Scanline-LUT-4px.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/GritsScanlines/Scanline-LUT-4px.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-aperture.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-aperture.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-aperture.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-aperture.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-caligari.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-caligari.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-caligari.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-caligari.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-cgwg-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-cgwg-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-cgwg-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-cgwg-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/blur_horiz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/blur_horiz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/blur_horiz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/blur_horiz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/blur_vert.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/blur_vert.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/blur_vert.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/blur_vert.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/crt-easymode-halation.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/crt-easymode-halation.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/crt-easymode-halation.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/crt-easymode-halation.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/linearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/linearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/linearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/linearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/threshold.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/threshold.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode-halation/threshold.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode-halation/threshold.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-easymode.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-easymode.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-geom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-geom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-geom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-geom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-3d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-3d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-3d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-3d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-glow/crt-hyllian.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-glow/crt-hyllian.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-glow/crt-hyllian.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-glow/crt-hyllian.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-glow/resolve2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-glow/resolve2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-glow/resolve2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-glow/resolve2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-multipass/crt-hyllian-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-multipass/crt-hyllian-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-multipass/crt-hyllian-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-multipass/crt-hyllian-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-multipass/crt-hyllian-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-multipass/crt-hyllian-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian-multipass/crt-hyllian-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian-multipass/crt-hyllian-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-hyllian.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-hyllian.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-interlaced-halation/crt-interlaced-halation-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes-halation.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes-halation.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes-halation.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes-halation.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes-multipass/bloompass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes-multipass/bloompass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes-multipass/bloompass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes-multipass/bloompass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes-multipass/scanpass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes-multipass/scanpass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes-multipass/scanpass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes-multipass/scanpass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-lottes.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-lottes.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-mattias.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-mattias.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-mattias.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-mattias.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-nes-mini.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-nes-mini.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-nes-mini.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-nes-mini.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-pi-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-pi-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-pi-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-pi-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-pi.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-pi.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-pi.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-pi.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-potato/resources/crt-potato-thick.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-potato/resources/crt-potato-thick.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-potato/resources/crt-potato-thick.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-potato/resources/crt-potato-thick.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-potato/resources/crt-potato-thin.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-potato/resources/crt-potato-thin.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-potato/resources/crt-potato-thin.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-potato/resources/crt-potato-thin.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-potato/shader-files/crt-potato.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-potato/shader-files/crt-potato.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-potato/shader-files/crt-potato.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-potato/shader-files/crt-potato.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-reverse-aa.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-reverse-aa.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-reverse-aa.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-reverse-aa.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/LICENSE.TXT b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/LICENSE.TXT similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/LICENSE.TXT rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/LICENSE.TXT diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/README.TXT b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/README.TXT similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/README.TXT rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/README.TXT diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/THANKS.TXT b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/THANKS.TXT similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/THANKS.TXT rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/THANKS.TXT diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5Spacing.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearShadowMask.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearShadowMask.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearShadowMask.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearShadowMask.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearShadowMaskEDP.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearShadowMaskEDPResizeTo64.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearShadowMaskResizeTo64.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearShadowMaskResizeTo64.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearShadowMaskResizeTo64.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearShadowMaskResizeTo64.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/bind-shader-params.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/bind-shader-params.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/bind-shader-params.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/bind-shader-params.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/bloom-functions.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/bloom-functions.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/bloom-functions.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/bloom-functions.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/blur-functions.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/blur-functions.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/blur-functions.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/blur-functions.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/derived-settings-and-constants.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/derived-settings-and-constants.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/derived-settings-and-constants.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/derived-settings-and-constants.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/gamma-management.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/gamma-management.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/gamma-management.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/gamma-management.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/geometry-functions.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/geometry-functions.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/geometry-functions.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/geometry-functions.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/phosphor-mask-resizing.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/phosphor-mask-resizing.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/phosphor-mask-resizing.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/phosphor-mask-resizing.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/quad-pixel-communication.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/quad-pixel-communication.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/quad-pixel-communication.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/quad-pixel-communication.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/royale-template.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/royale-template.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/royale-template.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/royale-template.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/scanline-functions.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/scanline-functions.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/scanline-functions.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/scanline-functions.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/special-functions.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/special-functions.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/special-functions.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/special-functions.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/tex2Dantialias.h b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/tex2Dantialias.h similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/port-helpers/tex2Dantialias.h rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/port-helpers/tex2Dantialias.h diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom-intel.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx-fake-bloom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-approx.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-brightpass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-brightpass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-brightpass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-brightpass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom-intel.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom-intel.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom-intel.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom-intel.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask-fake-bloom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-yo6/KV-M1420B.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-yo6/KV-M1420B.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-yo6/KV-M1420B.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-yo6/KV-M1420B.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-yo6/crt-yo6-native-resolution.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-yo6/crt-yo6-native-resolution.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-yo6/crt-yo6-native-resolution.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-yo6/crt-yo6-native-resolution.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-yo6/crt-yo6-warp.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-yo6/crt-yo6-warp.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crt-yo6/crt-yo6-warp.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crt-yo6/crt-yo6-warp.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/artifacts.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/artifacts.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/artifacts.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/artifacts.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/composite.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/composite.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/composite.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/composite.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/mask.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/mask.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/mask.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/mask.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/post-downsample.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/post-downsample.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/post-downsample.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/post-downsample.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/post-upsample.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/post-upsample.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/post-upsample.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/post-upsample.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/present.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/present.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/present.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/present.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/screen.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/screen.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/crtsim/screen.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/crtsim/screen.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/dotmask.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/dotmask.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/dotmask.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/dotmask.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/fakelottes.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/fakelottes.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/fakelottes.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/fakelottes.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/blur_horiz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/blur_horiz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/blur_horiz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/blur_horiz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/blur_vert.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/blur_vert.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/blur_vert.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/blur_vert.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/gauss_horiz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/gauss_horiz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/gauss_horiz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/gauss_horiz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/gauss_vert.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/gauss_vert.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/gauss_vert.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/gauss_vert.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/lanczos_horiz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/lanczos_horiz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/lanczos_horiz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/lanczos_horiz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/linearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/linearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/linearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/linearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/resolve.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/resolve.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/resolve.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/resolve.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/threshold.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/threshold.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/glow/threshold.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/glow/threshold.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass1-fallback.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass1-fallback.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass1-fallback.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass1-fallback.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass2-fallback.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass2-fallback.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass2-fallback.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass2-fallback.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass3-fallback.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass3-fallback.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass3-fallback.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass3-fallback.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/gtu-v050/pass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/gtu-v050/pass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/README b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/README similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/README rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/README diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/afterglow.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/afterglow.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/afterglow.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/afterglow.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/avg-lum.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/avg-lum.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/avg-lum.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/avg-lum.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/avg-lum0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/avg-lum0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/avg-lum0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/avg-lum0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/blur_horiz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/blur_horiz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/blur_horiz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/blur_horiz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/blur_vert.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/blur_vert.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/blur_vert.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/blur_vert.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/color-profiles.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/color-profiles.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/color-profiles.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/color-profiles.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/crt-guest-dr-venom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/crt-guest-dr-venom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/crt-guest-dr-venom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/crt-guest-dr-venom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/crt-guest-sm.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/crt-guest-sm.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/crt-guest-sm.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/crt-guest-sm.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/d65-d50.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/d65-d50.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/d65-d50.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/d65-d50.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/fast/crt-guest-dr-venom-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/fast/crt-guest-dr-venom-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/fast/crt-guest-dr-venom-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/fast/crt-guest-dr-venom-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/fast/crt-guest-dr-venom-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/fast/crt-guest-dr-venom-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/fast/crt-guest-dr-venom-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/fast/crt-guest-dr-venom-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/fast/linearize-multipass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/fast/linearize-multipass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/fast/linearize-multipass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/fast/linearize-multipass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/fast/smoothing.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/fast/smoothing.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/fast/smoothing.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/fast/smoothing.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/linearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/linearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/linearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/linearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/linearize_scanlines.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/linearize_scanlines.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/linearize_scanlines.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/linearize_scanlines.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/README b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/README similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/README rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/README diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/lut.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/lut.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/lut.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/lut.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/other1.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/other1.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/other1.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/other1.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/sony_trinitron1.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/sony_trinitron1.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/sony_trinitron1.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/sony_trinitron1.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/sony_trinitron2.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/sony_trinitron2.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/guest/lut/sony_trinitron2.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/guest/lut/sony_trinitron2.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/resources/aperture-grille.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/resources/aperture-grille.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/resources/aperture-grille.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/resources/aperture-grille.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/resources/shadow-mask.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/resources/shadow-mask.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/resources/shadow-mask.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/resources/shadow-mask.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/resources/slot-mask-aligned.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/resources/slot-mask-aligned.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/resources/slot-mask-aligned.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/resources/slot-mask-aligned.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/resources/slot-mask.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/resources/slot-mask.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/resources/slot-mask.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/resources/slot-mask.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_bloom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_bloom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_bloom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_bloom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_chroma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_chroma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_chroma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_chroma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_deconverge.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_deconverge.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_deconverge.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_deconverge.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_distortion.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_distortion.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_distortion.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_distortion.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_downsample.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_downsample.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_downsample.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_downsample.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_focus.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_focus.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_focus.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_focus.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_params.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_params.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_params.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_params.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_phosphor.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_phosphor.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_phosphor.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_phosphor.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_post.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_post.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_post.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_post.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_scanline.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_scanline.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/mame_hlsl/shaders/mame_scanline.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/mame_hlsl/shaders/mame_scanline.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/Image.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/Image.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/Image.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/Image.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/basilica.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/basilica.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/basilica.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/basilica.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/bufC.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/bufC.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/bufC.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/bufC.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/bufD.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/bufD.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/bufD.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/bufD.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/gradient.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/gradient.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/gradient.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/gradient.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/woodgrain.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/woodgrain.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/metacrt/woodgrain.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/metacrt/woodgrain.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphor-trails.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphor-trails.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphor-trails.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphor-trails.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphor.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphor.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphor.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphor.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphor.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphor.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphor.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphor.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/luts/aperture-grille.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/luts/aperture-grille.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/luts/aperture-grille.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/luts/aperture-grille.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/luts/shadowmask.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/luts/shadowmask.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/luts/shadowmask.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/luts/shadowmask.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/luts/slotmask.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/luts/slotmask.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/luts/slotmask.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/luts/slotmask.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/phosphorlut-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/phosphorlut-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/phosphorlut-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/phosphorlut-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/phosphorlut-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/phosphorlut-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/phosphorlut-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/phosphorlut-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/scanlines-interlace-linearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/scanlines-interlace-linearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/phosphorlut/scanlines-interlace-linearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/phosphorlut/scanlines-interlace-linearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/smuberstep-glow.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/smuberstep-glow.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/smuberstep-glow.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/smuberstep-glow.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/snes-hires-blend.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/snes-hires-blend.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/snes-hires-blend.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/snes-hires-blend.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/Brighten.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/Brighten.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/Brighten.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/Brighten.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/Candy-Bloom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/Candy-Bloom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/Candy-Bloom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/Candy-Bloom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/Scanline-Interpolation.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/Scanline-Interpolation.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/Scanline-Interpolation.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/Scanline-Interpolation.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/ScanlineSimple.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/ScanlineSimple.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/ScanlineSimple.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/ScanlineSimple.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/sunset-gaussian-horiz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/sunset-gaussian-horiz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/sunset-gaussian-horiz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/sunset-gaussian-horiz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/sunset-gaussian-vert.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/sunset-gaussian-vert.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/torridgristle/sunset-gaussian-vert.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/torridgristle/sunset-gaussian-vert.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tv-highcontrast-hd-1152x672.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tv-highcontrast-hd-1152x672.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tv-highcontrast-hd-1152x672.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tv-highcontrast-hd-1152x672.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tv-highcontrast-hd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tv-highcontrast-hd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tv-highcontrast-hd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tv-highcontrast-hd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tvout-tweaks-multipass/tvout-tweaks-pass-0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tvout-tweaks-multipass/tvout-tweaks-pass-0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tvout-tweaks-multipass/tvout-tweaks-pass-0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tvout-tweaks-multipass/tvout-tweaks-pass-0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tvout-tweaks-multipass/tvout-tweaks-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tvout-tweaks-multipass/tvout-tweaks-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tvout-tweaks-multipass/tvout-tweaks-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tvout-tweaks-multipass/tvout-tweaks-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tvout-tweaks.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tvout-tweaks.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/tvout-tweaks.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/tvout-tweaks.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/zfast_crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/zfast_crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/shaders/zfast_crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/shaders/zfast_crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/smuberstep-glow.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/smuberstep-glow.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/smuberstep-glow.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/smuberstep-glow.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/snes-hires-blend.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/snes-hires-blend.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/snes-hires-blend.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/snes-hires-blend.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/tv-highcontrast-hd-1152x672.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/tv-highcontrast-hd-1152x672.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/tv-highcontrast-hd-1152x672.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/tv-highcontrast-hd-1152x672.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/tv-highcontrast-hd.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/tv-highcontrast-hd.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/tv-highcontrast-hd.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/tv-highcontrast-hd.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/tvout-tweaks-linearized-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/tvout-tweaks-linearized-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/tvout-tweaks-linearized-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/tvout-tweaks-linearized-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/tvout-tweaks.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/tvout-tweaks.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/tvout-tweaks.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/tvout-tweaks.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/zfast-crt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/zfast-crt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/crt/zfast-crt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/crt/zfast-crt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/bicubic.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/bicubic.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/bicubic.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/bicubic.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/cubic-gamma-correct.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/cubic-gamma-correct.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/cubic-gamma-correct.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/cubic-gamma-correct.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/cubic.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/cubic.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/cubic.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/cubic.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/shaders/bicubic.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/shaders/bicubic.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/shaders/bicubic.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/shaders/bicubic.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/shaders/cubic-gamma-correct.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/shaders/cubic-gamma-correct.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/shaders/cubic-gamma-correct.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/shaders/cubic-gamma-correct.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/shaders/cubic.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/shaders/cubic.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/shaders/cubic.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/shaders/cubic.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/shaders/linearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/shaders/linearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/cubic/shaders/linearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/cubic/shaders/linearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/ddt-extended.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/ddt-extended.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/ddt-extended.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/ddt-extended.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/ddt-waterpaint.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/ddt-waterpaint.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/ddt-waterpaint.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/ddt-waterpaint.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/ddt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/ddt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/ddt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/ddt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/shaders/ddt-extended.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/shaders/ddt-extended.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/shaders/ddt-extended.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/shaders/ddt-extended.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/shaders/ddt-waterpaint.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/shaders/ddt-waterpaint.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/shaders/ddt-waterpaint.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/shaders/ddt-waterpaint.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/shaders/ddt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/shaders/ddt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ddt/shaders/ddt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ddt/shaders/ddt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/sedi.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/sedi.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/sedi.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/sedi.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/shaders/3d-2d-mixed.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/shaders/3d-2d-mixed.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/shaders/3d-2d-mixed.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/shaders/3d-2d-mixed.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/shaders/deblur.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/shaders/deblur.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/shaders/deblur.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/shaders/deblur.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/shaders/sedi-v1.0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/shaders/sedi-v1.0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/shaders/sedi-v1.0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/shaders/sedi-v1.0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/simoneT-3d-2d-mixed.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/simoneT-3d-2d-mixed.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/deblur/simoneT-3d-2d-mixed.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/deblur/simoneT-3d-2d-mixed.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/crt-fast-bilateral-super-xbr.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/crt-fast-bilateral-super-xbr.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/crt-fast-bilateral-super-xbr.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/crt-fast-bilateral-super-xbr.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-2xbr-3d-3p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-2xbr-3d-3p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-2xbr-3d-3p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-2xbr-3d-3p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-xbr-4p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-xbr-4p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-xbr-4p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-xbr-4p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-xbr-6p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-xbr-6p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-xbr-6p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-xbr-6p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-xbr-natural-vision.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-xbr-natural-vision.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-xbr-natural-vision.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-xbr-natural-vision.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-xbr.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-xbr.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral-super-xbr.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral-super-xbr.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/fast-bilateral.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/fast-bilateral.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/median_3x3.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/median_3x3.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/median_3x3.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/median_3x3.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/median_5x5.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/median_5x5.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/median_5x5.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/median_5x5.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/fast-bilateral-3d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/fast-bilateral-3d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/fast-bilateral-3d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/fast-bilateral-3d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/fast-bilateral.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/fast-bilateral.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/fast-bilateral.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/fast-bilateral.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/median_3x3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/median_3x3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/median_3x3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/median_3x3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/median_5x5.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/median_5x5.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/median_5x5.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/median_5x5.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/slow-bilateral.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/slow-bilateral.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/shaders/slow-bilateral.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/shaders/slow-bilateral.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/slow-bilateral.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/slow-bilateral.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/denoisers/slow-bilateral.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/denoisers/slow-bilateral.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/bayer-matrix-dithering.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/bayer-matrix-dithering.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/bayer-matrix-dithering.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/bayer-matrix-dithering.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/cbod_v1.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/cbod_v1.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/cbod_v1.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/cbod_v1.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/gdapt+xbr-hybrid+aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/gdapt+xbr-hybrid+aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/gdapt+xbr-hybrid+aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/gdapt+xbr-hybrid+aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/gdapt+xbr-hybrid+ddt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/gdapt+xbr-hybrid+ddt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/gdapt+xbr-hybrid+ddt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/gdapt+xbr-hybrid+ddt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/gdapt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/gdapt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/gdapt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/gdapt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/gendither.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/gendither.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/gendither.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/gendither.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/mdapt+xbr-hybrid+aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/mdapt+xbr-hybrid+aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/mdapt+xbr-hybrid+aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/mdapt+xbr-hybrid+aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/mdapt+xbr-hybrid+ddt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/mdapt+xbr-hybrid+ddt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/mdapt+xbr-hybrid+ddt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/mdapt+xbr-hybrid+ddt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/mdapt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/mdapt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/mdapt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/mdapt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/bayer-matrix-dithering.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/bayer-matrix-dithering.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/bayer-matrix-dithering.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/bayer-matrix-dithering.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/cbod-v1/cbod-v1-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/cbod-v1/cbod-v1-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/cbod-v1/cbod-v1-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/cbod-v1/cbod-v1-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/cbod-v1/cbod-v1-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/cbod-v1/cbod-v1-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/cbod-v1/cbod-v1-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/cbod-v1/cbod-v1-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gdapt/gdapt-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gdapt/gdapt-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gdapt/gdapt-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gdapt/gdapt-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gdapt/gdapt-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gdapt/gdapt-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gdapt/gdapt-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gdapt/gdapt-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gdapt/passes/gdapt-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gdapt/passes/gdapt-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gdapt/passes/gdapt-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gdapt/passes/gdapt-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gdapt/passes/gdapt-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gdapt/passes/gdapt-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gdapt/passes/gdapt-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gdapt/passes/gdapt-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gendither.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gendither.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/gendither.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/gendither.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/jinc2-dedither.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/jinc2-dedither.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/jinc2-dedither.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/jinc2-dedither.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/dithering/shaders/mdapt/passes/mdapt-pass4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/dithering/shaders/mdapt/passes/mdapt-pass4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/eagle/shaders/super-eagle.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/eagle/shaders/super-eagle.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/eagle/shaders/super-eagle.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/eagle/shaders/super-eagle.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/eagle/shaders/supereagle.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/eagle/shaders/supereagle.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/eagle/shaders/supereagle.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/eagle/shaders/supereagle.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/eagle/super-eagle.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/eagle/super-eagle.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/eagle/super-eagle.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/eagle/super-eagle.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/film/resources/film_noise1.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/film/resources/film_noise1.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/film/resources/film_noise1.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/film/resources/film_noise1.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/film/shaders/film_noise.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/film/shaders/film_noise.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/film/shaders/film_noise.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/film/shaders/film_noise.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/film/technicolor.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/film/technicolor.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/film/technicolor.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/film/technicolor.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/3dfx_4x1.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/3dfx_4x1.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/3dfx_4x1.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/3dfx_4x1.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/powervr2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/powervr2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/powervr2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/powervr2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/shaders/3dfx/3dfx_pass_0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/shaders/3dfx/3dfx_pass_0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/shaders/3dfx/3dfx_pass_0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/shaders/3dfx/3dfx_pass_0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/shaders/3dfx/3dfx_pass_1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/shaders/3dfx/3dfx_pass_1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/shaders/3dfx/3dfx_pass_1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/shaders/3dfx/3dfx_pass_1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/shaders/3dfx/3dfx_pass_2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/shaders/3dfx/3dfx_pass_2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/shaders/3dfx/3dfx_pass_2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/shaders/3dfx/3dfx_pass_2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/shaders/powervr2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/shaders/powervr2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/gpu/shaders/powervr2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/gpu/shaders/powervr2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/agb001-gba-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/agb001-gba-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/agb001-gba-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/agb001-gba-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/agb001.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/agb001.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/agb001.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/agb001.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/ags001-gba-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/ags001-gba-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/ags001-gba-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/ags001-gba-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/ags001.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/ags001.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/ags001.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/ags001.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/bevel.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/bevel.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/bevel.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/bevel.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/dmg-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/dmg-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-7x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-7x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-dmg-alt-7x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-dmg-alt-7x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-7x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-7x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-light-alt-7x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-light-alt-7x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-7x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-7x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gb-pocket-alt-7x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gb-pocket-alt-7x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-lcd-grid-v2-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-lcd-grid-v2-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gba-retro-v2-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gba-retro-v2-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-7x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-7x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-lcd-grid-v2-7x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-lcd-grid-v2-7x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-7x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-7x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gbc-retro-v2-7x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gbc-retro-v2-7x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/gg-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/gg-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/ngpc-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/ngpc-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-5x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-5x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-5x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-5x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-6x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-6x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/psp-6x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/psp-6x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/color-border-square-4x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/color-border-square-4x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/color-border-square-4x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/color-border-square-4x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/dmg-background.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/dmg-background.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/dmg-background.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/dmg-background.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/dmg-border-square-4x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/dmg-border-square-4x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/dmg-border-square-4x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/dmg-border-square-4x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/dmg-palette.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/dmg-palette.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/dmg-palette.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/dmg-palette.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/gba-border-square-4x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/gba-border-square-4x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/gba-border-square-4x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/gba-border-square-4x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/gg-border-square-4x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/gg-border-square-4x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/gg-border-square-4x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/gg-border-square-4x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/ngpc-border-square-4x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/ngpc-border-square-4x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/ngpc-border-square-4x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/ngpc-border-square-4x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/pocket-background.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/pocket-background.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/pocket-background.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/pocket-background.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/pocket-border-square-4x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/pocket-border-square-4x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/pocket-border-square-4x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/pocket-border-square-4x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/pocket-palette.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/pocket-palette.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/pocket-palette.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/pocket-palette.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/psp border.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/psp border.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/resources/psp border.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/resources/psp border.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/border.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/border.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/border.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/border.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-5.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-5.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass-5.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass-5.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/console-border/shader-files/gb-pass4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/console-border/shader-files/gb-pass4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/dot.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/dot.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/dot.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/dot.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/dot.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/dot.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/dot.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/dot.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/ds-hybrid-sabr.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/ds-hybrid-sabr.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/ds-hybrid-sabr.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/ds-hybrid-sabr.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/ds-hybrid-scalefx.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/ds-hybrid-scalefx.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/ds-hybrid-scalefx.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/ds-hybrid-scalefx.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy-light.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy-light.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy-light.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy-light.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy-pocket.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy-pocket.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy-pocket.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy-pocket.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/gb-light-shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/gb-light-shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/gb-light-shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/gb-light-shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/gb-pocket-shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/gb-pocket-shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/gb-pocket-shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/gb-pocket-shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/gb-shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/gb-shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/gb-shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/gb-shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gameboy/shader-files/gb-pass-4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gameboy/shader-files/gb-pass-4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gb-palette-dmg.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gb-palette-dmg.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gb-palette-dmg.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gb-palette-dmg.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gb-palette-light.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gb-palette-light.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gb-palette-light.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gb-palette-light.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gb-palette-pocket.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gb-palette-pocket.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gb-palette-pocket.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gb-palette-pocket.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gba-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gba-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gba-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gba-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gbc-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gbc-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gbc-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gbc-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gbc-gambatte-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gbc-gambatte-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/gbc-gambatte-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/gbc-gambatte-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-gba-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-gba-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-gba-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-gba-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-gba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-gba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-gba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-gba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-gbc-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-gbc-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-gbc-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-gbc-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-gbc-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-gbc-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-gbc-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-gbc-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-nds-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-nds-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-nds-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-nds-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-nds-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-nds-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-nds-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-nds-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-palm-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-palm-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-palm-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-palm-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-palm-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-palm-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-palm-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-palm-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-psp-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-psp-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-psp-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-psp-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-psp-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-psp-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-psp-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-psp-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-vba-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-vba-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-vba-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-vba-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-vba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-vba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2-vba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2-vba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid-v2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid-v2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-grid.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-grid.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-gba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-gba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-gba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-gba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-gbc-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-gbc-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-gbc-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-gbc-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-nds-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-nds-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-nds-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-nds-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-palm-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-palm-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-palm-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-palm-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-psp-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-psp-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-psp-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-psp-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-vba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-vba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader-vba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader-vba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-5.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-5.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-pass-5.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-pass-5.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-2/lcd-shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-2/lcd-shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-pass-0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-pass-0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-pass-0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-pass-0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-pass-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-pass-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-pass-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-pass-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-pass-3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-pass-3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-pass-3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-pass-3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup-3/lcd-shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup-3/lcd-shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-pass-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-pass-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-pass-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-pass-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-pass-3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-pass-3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-pass-3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-pass-3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-pass-4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-pass-4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-pass-4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-pass-4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-pass-5.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-pass-5.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-pass-5.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-pass-5.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/backup/lcd-shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/backup/lcd-shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-pass-0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-pass-0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-pass-0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-pass-0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-pass-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-pass-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-pass-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-pass-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-pass-3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-pass-3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-pass-3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-pass-3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-shader.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-shader.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd-shader/lcd-shader.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd-shader/lcd-shader.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd1x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd1x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd1x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd1x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd1x_nds.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd1x_nds.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd1x_nds.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd1x_nds.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd1x_psp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd1x_psp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd1x_psp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd1x_psp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd3x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd3x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd3x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd3x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd_cgwg/lcd-cgwg.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd_cgwg/lcd-cgwg.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd_cgwg/lcd-cgwg.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd_cgwg/lcd-cgwg.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd_cgwg/lcd-grid.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd_cgwg/lcd-grid.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/lcd_cgwg/lcd-grid.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/lcd_cgwg/lcd-grid.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/nds-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/nds-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/nds-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/nds-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/nds.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/nds.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/nds.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/nds.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/palm-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/palm-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/palm-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/palm-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/psp-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/psp-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/psp-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/psp-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/retro-v2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/retro-v2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/retro-v2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/retro-v2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-dmg-response-time.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-dmg-response-time.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-dmg-response-time.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-dmg-response-time.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-gbl-response-time.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-gbl-response-time.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-gbl-response-time.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-gbl-response-time.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-gbp-response-time.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-gbp-response-time.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-gbp-response-time.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-gbp-response-time.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-lcd-gbc-color-motionblur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-lcd-gbc-color-motionblur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-lcd-gbc-color-motionblur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-lcd-gbc-color-motionblur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-lcd.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-lcd.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/sameboy-lcd.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/sameboy-lcd.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/bevel.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/bevel.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/bevel.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/bevel.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/gba-color-old.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/gba-color-old.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/gba-color-old.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/gba-color-old.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/gba-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/gba-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/gba-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/gba-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/gbc-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/gbc-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/gbc-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/gbc-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/gbc-gambatte-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/gbc-gambatte-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/gbc-gambatte-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/gbc-gambatte-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/nds-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/nds-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/nds-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/nds-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/palm-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/palm-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/palm-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/palm-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/psp-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/psp-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/psp-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/psp-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/vba-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/vba-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/color/vba-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/color/vba-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/dot.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/dot.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/dot.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/dot.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/ds-hybrid-view.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/ds-hybrid-view.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/ds-hybrid-view.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/ds-hybrid-view.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/README.md b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/README.md similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/README.md rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/README.md diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/background.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/background.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/background.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/background.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/palette.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/palette.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/palette.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/palette.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-bgs/dmg-bg.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-bgs/dmg-bg.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-bgs/dmg-bg.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-bgs/dmg-bg.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-bgs/grainy-bg.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-bgs/grainy-bg.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-bgs/grainy-bg.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-bgs/grainy-bg.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-bgs/paper-bg.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-bgs/paper-bg.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-bgs/paper-bg.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-bgs/paper-bg.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/b-w-palette.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/b-w-palette.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/b-w-palette.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/b-w-palette.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-0.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-0.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-0.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-0.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-1.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-1.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-1.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-1.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-2.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-2.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-2.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/dmg-palette-2.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-1.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-1.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-1.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-1.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-2.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-2.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-2.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-2.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-3.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-3.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-3.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette-3.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gblight-palette.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gbp-palette.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gbp-palette.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/resources/sample-palettes/gbp-palette.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/resources/sample-palettes/gbp-palette.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gameboy/shader-files/gb-pass4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gameboy/shader-files/gb-pass4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gb-palette/gb-palette.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gb-palette/gb-palette.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gb-palette/gb-palette.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gb-palette/gb-palette.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gb-palette/resources/palette-dmg.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gb-palette/resources/palette-dmg.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gb-palette/resources/palette-dmg.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gb-palette/resources/palette-dmg.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gb-palette/resources/palette-light.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gb-palette/resources/palette-light.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gb-palette/resources/palette-light.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gb-palette/resources/palette-light.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gb-palette/resources/palette-pocket.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gb-palette/resources/palette-pocket.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/gb-palette/resources/palette-pocket.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/gb-palette/resources/palette-pocket.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-cgwg/lcd-grid-v2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-cgwg/lcd-grid-v2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-cgwg/lcd-grid-v2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-cgwg/lcd-grid-v2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-cgwg/lcd-grid.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-cgwg/lcd-grid.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-cgwg/lcd-grid.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-cgwg/lcd-grid.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/background.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/background.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/background.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/background.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/lcd-pass-0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/lcd-pass-0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/lcd-pass-0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/lcd-pass-0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/lcd-pass-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/lcd-pass-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/lcd-pass-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/lcd-pass-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/lcd-pass-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/lcd-pass-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/lcd-pass-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/lcd-pass-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/lcd-pass-3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/lcd-pass-3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd-shader/lcd-pass-3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd-shader/lcd-pass-3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd1x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd1x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd1x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd1x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd1x_nds.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd1x_nds.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd1x_nds.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd1x_nds.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd1x_psp.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd1x_psp.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd1x_psp.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd1x_psp.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd3x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd3x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/lcd3x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/lcd3x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/mgba/agb001.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/mgba/agb001.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/mgba/agb001.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/mgba/agb001.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/mgba/ags001-light.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/mgba/ags001-light.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/mgba/ags001-light.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/mgba/ags001-light.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/mgba/ags001.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/mgba/ags001.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/mgba/ags001.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/mgba/ags001.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/retro-v2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/retro-v2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/retro-v2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/retro-v2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-lcd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-lcd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-lcd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-lcd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/gb-palette.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/gb-palette.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/gb-palette.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/gb-palette.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/resources/DMG.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/resources/DMG.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/resources/DMG.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/resources/DMG.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/resources/GBL.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/resources/GBL.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/resources/GBL.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/resources/GBL.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/resources/GBP.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/resources/GBP.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/resources/GBP.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/resources/GBP.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/response-time.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/response-time.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/sameboy-palettes/response-time.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/sameboy-palettes/response-time.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/png/2k/textured_paper.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/png/2k/textured_paper.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/png/2k/textured_paper.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/png/2k/textured_paper.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/png/4k/textured_paper.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/png/4k/textured_paper.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/png/4k/textured_paper.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/png/4k/textured_paper.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/png/readme.txt b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/png/readme.txt similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/png/readme.txt rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/png/readme.txt diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color-4k.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color-4k.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color-4k.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color-4k.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gba-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color-4k.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color-4k.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color-4k.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color-4k.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd+gbc-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd-4k.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd-4k.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd-4k.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd-4k.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p+gba-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p+gba-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p+gba-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p+gba-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p+gbc-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p+gbc-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p+gbc-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p+gbc-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/simpletex_lcd/simpletex_lcd_720p.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/zfast_lcd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/zfast_lcd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/shaders/zfast_lcd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/shaders/zfast_lcd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd+gba-color-4k.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd+gba-color-4k.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd+gba-color-4k.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd+gba-color-4k.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd+gba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd+gba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd+gba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd+gba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd+gbc-color-4k.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd+gbc-color-4k.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd+gbc-color-4k.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd+gbc-color-4k.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd+gbc-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd+gbc-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd+gbc-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd+gbc-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd-4k.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd-4k.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd-4k.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd-4k.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd_720p+gba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd_720p+gba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd_720p+gba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd_720p+gba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd_720p+gbc-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd_720p+gbc-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd_720p+gbc-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd_720p+gbc-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd_720p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd_720p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/simpletex_lcd_720p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/simpletex_lcd_720p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/vba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/vba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/vba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/vba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/zfast-lcd.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/zfast-lcd.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/handheld/zfast-lcd.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/handheld/zfast-lcd.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/hq2x-halphon.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/hq2x-halphon.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/hq2x-halphon.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/hq2x-halphon.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/hq2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/hq2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/hq2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/hq2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/hq3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/hq3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/hq3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/hq3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/hq4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/hq4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/hq4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/hq4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/resources/hq2x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/resources/hq2x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/resources/hq2x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/resources/hq2x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/resources/hq3x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/resources/hq3x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/resources/hq3x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/resources/hq3x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/resources/hq4x.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/resources/hq4x.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/resources/hq4x.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/resources/hq4x.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hq2x-halphon.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hq2x-halphon.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hq2x-halphon.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hq2x-halphon.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hq2x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hq2x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hq2x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hq2x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hq3x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hq3x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hq3x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hq3x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hq4x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hq4x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hq4x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hq4x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hqx-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hqx-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hqx-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hqx-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hqx-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hqx-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/hqx-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/hqx-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/shader-files/pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/shader-files/pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/hq2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/hq2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/hq2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/hq2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/hq3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/hq3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/hq3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/hq3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/hq4x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/hq4x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/hq4x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/hq4x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/shader-files/hq2x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/shader-files/hq2x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/shader-files/hq2x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/shader-files/hq2x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/shader-files/hq3x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/shader-files/hq3x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/shader-files/hq3x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/shader-files/hq3x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/shader-files/hq4x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/shader-files/hq4x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/hqx/single-pass/shader-files/hq4x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/hqx/single-pass/shader-files/hq4x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/aann.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/aann.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/aann.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/aann.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/bandlimit-pixel.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/bandlimit-pixel.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/bandlimit-pixel.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/bandlimit-pixel.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/controlled_sharpness.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/controlled_sharpness.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/controlled_sharpness.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/controlled_sharpness.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/pixellate.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/pixellate.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/pixellate.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/pixellate.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/quilez.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/quilez.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/quilez.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/quilez.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/ControlledSharpness.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/ControlledSharpness.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/ControlledSharpness.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/ControlledSharpness.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/aann.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/aann.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/aann.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/aann.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/bandlimit-pixel.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/bandlimit-pixel.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/bandlimit-pixel.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/bandlimit-pixel.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/pixellate.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/pixellate.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/pixellate.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/pixellate.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/quilez.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/quilez.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/quilez.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/quilez.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/sharp-bilinear-scanlines.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/sharp-bilinear-scanlines.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/sharp-bilinear-scanlines.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/sharp-bilinear-scanlines.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/sharp-bilinear-simple.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/sharp-bilinear-simple.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/sharp-bilinear-simple.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/sharp-bilinear-simple.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/sharp-bilinear.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/sharp-bilinear.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/sharp-bilinear.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/sharp-bilinear.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/smootheststep.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/smootheststep.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/smootheststep.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/smootheststep.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/smuberstep.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/smuberstep.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/shaders/smuberstep.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/shaders/smuberstep.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/sharp-bilinear-2x-prescale.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/sharp-bilinear-2x-prescale.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/sharp-bilinear-2x-prescale.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/sharp-bilinear-2x-prescale.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/sharp-bilinear-scanlines.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/sharp-bilinear-scanlines.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/sharp-bilinear-scanlines.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/sharp-bilinear-scanlines.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/sharp-bilinear-simple.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/sharp-bilinear-simple.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/sharp-bilinear-simple.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/sharp-bilinear-simple.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/sharp-bilinear.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/sharp-bilinear.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/sharp-bilinear.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/sharp-bilinear.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/smootheststep.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/smootheststep.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/smootheststep.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/smootheststep.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/smuberstep.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/smuberstep.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/interpolation/smuberstep.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/interpolation/smuberstep.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/linear/linearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/linear/linearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/linear/linearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/linear/linearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/anti-flicker.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/anti-flicker.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/anti-flicker.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/anti-flicker.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/blinky.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/blinky.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/blinky.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/blinky.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/bob-and-ghost-deinterlace.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/bob-and-ghost-deinterlace.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/bob-and-ghost-deinterlace.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/bob-and-ghost-deinterlace.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/bob-and-ghost-deinterlacing.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/bob-and-ghost-deinterlacing.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/bob-and-ghost-deinterlacing.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/bob-and-ghost-deinterlacing.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/bob-deinterlace.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/bob-deinterlace.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/bob-deinterlace.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/bob-deinterlace.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/bob-deinterlacing.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/bob-deinterlacing.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/bob-deinterlacing.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/bob-deinterlacing.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/cmyk-halftone-dot.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/cmyk-halftone-dot.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/cmyk-halftone-dot.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/cmyk-halftone-dot.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/cocktail-cab-portrait.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/cocktail-cab-portrait.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/cocktail-cab-portrait.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/cocktail-cab-portrait.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/cocktail-cabinet.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/cocktail-cabinet.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/cocktail-cabinet.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/cocktail-cabinet.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/cocktail-table.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/cocktail-table.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/cocktail-table.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/cocktail-table.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/color-mangler.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/color-mangler.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/color-mangler.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/color-mangler.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/colorimetry.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/colorimetry.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/colorimetry.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/colorimetry.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/deband.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/deband.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/deband.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/deband.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/deposterize-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/deposterize-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/deposterize-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/deposterize-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/deposterize-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/deposterize-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/deposterize-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/deposterize-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/edge-detect.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/edge-detect.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/edge-detect.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/edge-detect.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/flicker.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/flicker.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/flicker.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/flicker.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/flip-horizontal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/flip-horizontal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/flip-horizontal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/flip-horizontal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/grade.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/grade.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/grade.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/grade.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/image-adjustment.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/image-adjustment.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/image-adjustment.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/image-adjustment.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/interlacing-phosphor.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/interlacing-phosphor.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/interlacing-phosphor.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/interlacing-phosphor.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/interlacing.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/interlacing.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/interlacing.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/interlacing.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/mcgreen.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/mcgreen.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/mcgreen.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/mcgreen.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/natural-vision.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/natural-vision.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/natural-vision.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/natural-vision.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/nohalo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/nohalo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/nohalo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/nohalo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/ntsc-colors.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/ntsc-colors.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/ntsc-colors.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/ntsc-colors.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/side-by-side.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/side-by-side.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/side-by-side.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/side-by-side.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/white_point.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/white_point.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/misc/white_point.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/misc/white_point.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/braid-rewind.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/braid-rewind.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/braid-rewind.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/braid-rewind.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/mix_frames.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/mix_frames.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/mix_frames.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/mix_frames.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/mix_frames_smart.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/mix_frames_smart.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/mix_frames_smart.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/mix_frames_smart.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/motionblur-blue.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/motionblur-blue.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/motionblur-blue.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/motionblur-blue.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/motionblur-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/motionblur-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/motionblur-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/motionblur-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/motionblur-simple.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/motionblur-simple.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/motionblur-simple.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/motionblur-simple.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/response-time.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/response-time.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/response-time.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/response-time.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/braid-rewind.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/braid-rewind.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/braid-rewind.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/braid-rewind.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/mix_frames.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/mix_frames.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/mix_frames.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/mix_frames.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/mix_frames_smart.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/mix_frames_smart.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/mix_frames_smart.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/mix_frames_smart.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/motionblur-blue.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/motionblur-blue.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/motionblur-blue.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/motionblur-blue.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/motionblur-color.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/motionblur-color.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/motionblur-color.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/motionblur-color.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/motionblur-simple.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/motionblur-simple.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/motionblur-simple.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/motionblur-simple.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/response-time.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/response-time.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/motionblur/shaders/response-time.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/motionblur/shaders/response-time.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/bloom.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/bloom.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/bloom.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/bloom.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/blur.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/blur.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/blur.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/blur.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/emboss.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/emboss.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/emboss.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/emboss.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/mud-mudlord.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/mud-mudlord.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/mud-mudlord.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/mud-mudlord.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/noise-mudlord.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/noise-mudlord.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/noise-mudlord.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/noise-mudlord.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/oldtv.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/oldtv.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/oldtv.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/oldtv.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/bloom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/bloom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/bloom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/bloom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/blur.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/blur.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/blur.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/blur.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/emboss.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/emboss.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/emboss.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/emboss.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/mud-mudlord.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/mud-mudlord.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/mud-mudlord.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/mud-mudlord.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/noise-mudlord.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/noise-mudlord.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/noise-mudlord.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/noise-mudlord.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/oldtv.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/oldtv.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/oldtv.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/oldtv.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/sharpen.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/sharpen.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/sharpen.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/sharpen.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/toon.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/toon.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/toon.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/toon.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/waterpaint-mudlord.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/waterpaint-mudlord.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/shaders/waterpaint-mudlord.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/shaders/waterpaint-mudlord.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/sharpen.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/sharpen.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/sharpen.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/sharpen.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/toon.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/toon.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/toon.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/toon.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/waterpaint-mudlord.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/waterpaint-mudlord.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/mudlord/waterpaint-mudlord.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/mudlord/waterpaint-mudlord.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nearest.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nearest.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nearest.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nearest.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/fast-bilateral-nedi.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/fast-bilateral-nedi.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/fast-bilateral-nedi.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/fast-bilateral-nedi.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/nedi.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/nedi.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/nedi.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/nedi.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-jinc-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-jinc-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-jinc-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-jinc-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-jinc.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-jinc.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-jinc.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-jinc.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nedi/shaders/nedi-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nedi/shaders/nedi-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/neon/neon-variation-1.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/neon/neon-variation-1.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/neon/neon-variation-1.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/neon/neon-variation-1.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/neon/shaders/neon-variation-1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/neon/shaders/neon-variation-1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/neon/shaders/neon-variation-1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/neon/shaders/neon-variation-1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/cgwg-famicom-geom.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/cgwg-famicom-geom.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/cgwg-famicom-geom.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/cgwg-famicom-geom.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/gtu-famicom.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/gtu-famicom.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/gtu-famicom.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/gtu-famicom.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/ntsc-nes.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/ntsc-nes.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/ntsc-nes.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/ntsc-nes.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/adaptive-comb-decode.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/adaptive-comb-decode.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/adaptive-comb-decode.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/adaptive-comb-decode.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/composite-encode.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/composite-encode.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/composite-encode.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/composite-encode.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/crt-geom-famicom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/crt-geom-famicom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/crt-geom-famicom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/crt-geom-famicom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-chroma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-chroma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-chroma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-chroma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-notch-decode-yiq.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-notch-decode-yiq.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-notch-decode-yiq.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/cgwg-famicom-geom/lowpass-notch-decode-yiq.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/DAC.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/DAC.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/DAC.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/DAC.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/DAC_LUT.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/DAC_LUT.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/DAC_LUT.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/DAC_LUT.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/DAC_combined.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/DAC_combined.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/DAC_combined.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/DAC_combined.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/NesTable.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/NesTable.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/NesTable.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/NesTable.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/combFilter.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/combFilter.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/combFilter.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/combFilter.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/lowPass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/lowPass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/lowPass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/lowPass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/scaleX.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/scaleX.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/scaleX.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/scaleX.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/scaleY.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/scaleY.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/gtu-famicom/scaleY.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/gtu-famicom/scaleY.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/nes-color-decoder.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/nes-color-decoder.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nes_raw_palette/shaders/nes-color-decoder.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nes_raw_palette/shaders/nes-color-decoder.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/LICENSE b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/LICENSE similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/LICENSE rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/LICENSE diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/README.md b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/README.md similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/README.md rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/README.md diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns16-2x-luma.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns16-2x-luma.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns16-2x-luma.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns16-2x-luma.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns16-2x-rgb.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns16-2x-rgb.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns16-2x-rgb.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns16-2x-rgb.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns16-4x-luma.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns16-4x-luma.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns16-4x-luma.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns16-4x-luma.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns32-4x-rgb.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns32-4x-rgb.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns32-4x-rgb.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns32-4x-rgb.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/jinc2-cshift-luma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/jinc2-cshift-luma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/jinc2-cshift-luma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/jinc2-cshift-luma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/jinc2-cshift-rgb.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/jinc2-cshift-rgb.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/jinc2-cshift-rgb.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/jinc2-cshift-rgb.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/jinc2-on-passoutput0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/jinc2-on-passoutput0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/jinc2-on-passoutput0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/jinc2-on-passoutput0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/jinc2-on-passoutput3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/jinc2-on-passoutput3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/jinc2-on-passoutput3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/jinc2-on-passoutput3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-rgb.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-rgb.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-rgb.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-rgb.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-rgb.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-rgb.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-rgb.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-rgb.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-luma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-luma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-luma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-luma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-rgb.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-rgb.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-rgb.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-rgb.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-luma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-luma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-luma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-luma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-rgb.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-rgb.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-rgb.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-rgb.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-luma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-luma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-luma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-luma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-rgb.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-rgb.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-rgb.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-rgb.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-luma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-luma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-luma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-luma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-rgb.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-rgb.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-rgb.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-rgb.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/rgb-to-yuv.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/rgb-to-yuv.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/rgb-to-yuv.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/rgb-to-yuv.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/yuv-to-rgb-2x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/yuv-to-rgb-2x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/yuv-to-rgb-2x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/yuv-to-rgb-2x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/yuv-to-rgb-4x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/yuv-to-rgb-4x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/nnedi3/shaders/yuv-to-rgb-4x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/nnedi3/shaders/yuv-to-rgb-4x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/artifact-colors.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/artifact-colors.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/artifact-colors.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/artifact-colors.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-256px-gauss-scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-256px-gauss-scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-256px-gauss-scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-256px-gauss-scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-256px-svideo-gauss-scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-256px-svideo-gauss-scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-256px-svideo-gauss-scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-256px-svideo-gauss-scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-256px-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-256px-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-256px-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-256px-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-256px.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-256px.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-256px.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-256px.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-320px-gauss-scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-320px-gauss-scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-320px-gauss-scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-320px-gauss-scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-320px-svideo-gauss-scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-320px-svideo-gauss-scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-320px-svideo-gauss-scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-320px-svideo-gauss-scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-320px-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-320px-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-320px-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-320px-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-320px.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-320px.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-320px.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-320px.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-xot.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-xot.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc-xot.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc-xot.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/ntsc.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/ntsc.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/artifact-colors/artifact-colors0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/artifact-colors/artifact-colors0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/artifact-colors/artifact-colors0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/artifact-colors/artifact-colors0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/artifact-colors/artifact-colors1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/artifact-colors/artifact-colors1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/artifact-colors/artifact-colors1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/artifact-colors/artifact-colors1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/artifact-colors/artifact-colors2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/artifact-colors/artifact-colors2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/artifact-colors/artifact-colors2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/artifact-colors/artifact-colors2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-gauss-pass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-gauss-pass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-gauss-pass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-gauss-pass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass1-composite-2phase.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass1-composite-2phase.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass1-composite-2phase.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass1-composite-2phase.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass1-composite-3phase.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass1-composite-3phase.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass1-composite-3phase.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass1-composite-3phase.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass1-svideo-2phase.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass1-svideo-2phase.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass1-svideo-2phase.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass1-svideo-2phase.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass1-svideo-3phase.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass1-svideo-3phase.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass1-svideo-3phase.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass1-svideo-3phase.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-2phase-gamma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-2phase-gamma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-2phase-gamma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-2phase-gamma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-2phase-linear.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-2phase-linear.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-2phase-linear.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-2phase-linear.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-2phase.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-2phase.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-2phase.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-2phase.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-3phase-gamma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-3phase-gamma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-3phase-gamma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-3phase-gamma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-3phase-linear.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-3phase-linear.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-3phase-linear.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-3phase-linear.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-3phase.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-3phase.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-pass2-3phase.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-pass2-3phase.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-stock.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-stock.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-stock.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-stock.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-xot.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-xot.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/ntsc/shaders/ntsc-xot.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/ntsc/shaders/ntsc-xot.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/omniscale/omniscale-legacy.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/omniscale/omniscale-legacy.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/omniscale/omniscale-legacy.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/omniscale/omniscale-legacy.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/omniscale/omniscale.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/omniscale/omniscale.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/omniscale/omniscale.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/omniscale/omniscale.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/omniscale/shaders/omniscale-legacy.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/omniscale/shaders/omniscale-legacy.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/omniscale/shaders/omniscale-legacy.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/omniscale/shaders/omniscale-legacy.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/omniscale/shaders/omniscale.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/omniscale/shaders/omniscale.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/omniscale/shaders/omniscale.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/omniscale/shaders/omniscale.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/pal-r57shell-moire-only.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/pal-r57shell-moire-only.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/pal-r57shell-moire-only.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/pal-r57shell-moire-only.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/pal-r57shell.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/pal-r57shell.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/pal-r57shell.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/pal-r57shell.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/pal.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/pal.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/pal.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/pal.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/resources/nes_lut.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/resources/nes_lut.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/resources/nes_lut.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/resources/nes_lut.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/shaders/pal-r57shell-moire-only.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/shaders/pal-r57shell-moire-only.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/shaders/pal-r57shell-moire-only.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/shaders/pal-r57shell-moire-only.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/shaders/pal-r57shell.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/shaders/pal-r57shell.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/shaders/pal-r57shell.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/shaders/pal-r57shell.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/shaders/pal-singlepass.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/shaders/pal-singlepass.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/pal/shaders/pal-singlepass.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/pal/shaders/pal-singlepass.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/c64-monitor.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/c64-monitor.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/c64-monitor.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/c64-monitor.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-faker/crt-faker-2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-faker/crt-faker-2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-faker/crt-faker-2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-faker/crt-faker-2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-faker/crt-faker-glow-2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-faker/crt-faker-glow-2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-faker/crt-faker-glow-2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-faker/crt-faker-glow-2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-faker/crt-faker-glow.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-faker/crt-faker-glow.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-faker/crt-faker-glow.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-faker/crt-faker-glow.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-faker/crt-faker.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-faker/crt-faker.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-faker/crt-faker.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-faker/crt-faker.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-guest-dr-venom-kurozumi.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-guest-dr-venom-kurozumi.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-guest-dr-venom-kurozumi.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-guest-dr-venom-kurozumi.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-guest-dr-venom-ntsc-composite-stock.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-guest-dr-venom-ntsc-composite-stock.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-guest-dr-venom-ntsc-composite-stock.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-guest-dr-venom-ntsc-composite-stock.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-guest-dr-venom-ntsc-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-guest-dr-venom-ntsc-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-guest-dr-venom-ntsc-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-guest-dr-venom-ntsc-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-guest-dr-venom-stock.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-guest-dr-venom-stock.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-guest-dr-venom-stock.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-guest-dr-venom-stock.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-royale-kurozumi.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-royale-kurozumi.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-royale-kurozumi.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-royale-kurozumi.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-royale-xm29plus.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-royale-xm29plus.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crt-royale-xm29plus.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crt-royale-xm29plus.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crtsim-grungy.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crtsim-grungy.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/crtsim-grungy.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/crtsim-grungy.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/nes-color-decoder+colorimetry+pixellate.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/nes-color-decoder+colorimetry+pixellate.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/nes-color-decoder+colorimetry+pixellate.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/nes-color-decoder+colorimetry+pixellate.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/nes-color-decoder+pixellate.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/nes-color-decoder+pixellate.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/nes-color-decoder+pixellate.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/nes-color-decoder+pixellate.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+gba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+gba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+gba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+gba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+gbc-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+gbc-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+gbc-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+gbc-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+image-adjustment.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+image-adjustment.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+image-adjustment.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+image-adjustment.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+nds-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+nds-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+nds-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+nds-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+psp-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+psp-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+psp-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+psp-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+vba-color.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+vba-color.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/retro-v2+vba-color.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/retro-v2+vba-color.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/scalefx+rAA+aa-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/scalefx+rAA+aa-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/scalefx+rAA+aa-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/scalefx+rAA+aa-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/scalefx+rAA+aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/scalefx+rAA+aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/scalefx+rAA+aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/scalefx+rAA+aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/scalefx-aa-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/scalefx-aa-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/scalefx-aa-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/scalefx-aa-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/scalefx-aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/scalefx-aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/scalefx-aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/scalefx-aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/gtu-famicom-240p+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/gtu-famicom-240p+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/gtu-famicom-240p+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/gtu-famicom-240p+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/gtuv50-240p+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/gtuv50-240p+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/gtuv50-240p+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/gtuv50-240p+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+cbod+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+cbod+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+cbod+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+cbod+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+gdapt+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+gdapt+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+gdapt+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+gdapt+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+mdapt+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+mdapt+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+mdapt+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+mdapt+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/gtu-famicom-240p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/gtu-famicom-240p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/gtu-famicom-240p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/gtu-famicom-240p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/gtuv50-240p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/gtuv50-240p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/gtuv50-240p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/gtuv50-240p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+cbod.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+cbod.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+cbod.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+cbod.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+gdapt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+gdapt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+gdapt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+gdapt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+mdapt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+mdapt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+mdapt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+mdapt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+nes-color-decoder.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+nes-color-decoder.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+nes-color-decoder.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+nes-color-decoder.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-256px-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-256px-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-256px-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-256px-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-256px-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-256px-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-256px-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-256px-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-2phase-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-2phase-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-2phase-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-2phase-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-2phase-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-2phase-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-2phase-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-2phase-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-320px-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-320px-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-320px-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-320px-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-320px-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-320px-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-320px-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-320px-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-3phase-composite.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-3phase-composite.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-3phase-composite.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-3phase-composite.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-3phase-svideo.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-3phase-svideo.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-3phase-svideo.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-3phase-svideo.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-nes.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-nes.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout+ntsc-nes.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout+ntsc-nes.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout-jinc-sharpen.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout-jinc-sharpen.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout-jinc-sharpen.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout-jinc-sharpen.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout-pixelsharp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout-pixelsharp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout-pixelsharp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout-pixelsharp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/tvout/tvout.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/tvout/tvout.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/vector-glow.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/vector-glow.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/vector-glow.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/vector-glow.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/xsoft+scalefx-hybrid+level2aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/xsoft+scalefx-hybrid+level2aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/xsoft+scalefx-hybrid+level2aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/xsoft+scalefx-hybrid+level2aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/xsoft+scalefx-level2aa+sharpsmoother.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/xsoft+scalefx-level2aa+sharpsmoother.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/xsoft+scalefx-level2aa+sharpsmoother.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/xsoft+scalefx-level2aa+sharpsmoother.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/xsoft+scalefx-level2aa.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/xsoft+scalefx-level2aa.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/presets/xsoft+scalefx-level2aa.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/presets/xsoft+scalefx-level2aa.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/2vs-pbr-test.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/2vs-pbr-test.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/2vs-pbr-test.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/2vs-pbr-test.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/bergi-cave-quest.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/bergi-cave-quest.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/bergi-cave-quest.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/bergi-cave-quest.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/bigwings-kelp-forest.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/bigwings-kelp-forest.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/bigwings-kelp-forest.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/bigwings-kelp-forest.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/bigwings-luminescence.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/bigwings-luminescence.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/bigwings-luminescence.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/bigwings-luminescence.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/ciberxtrem-portal-highquality.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/ciberxtrem-portal-highquality.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/ciberxtrem-portal-highquality.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/ciberxtrem-portal-highquality.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/ciberxtrem-portal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/ciberxtrem-portal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/ciberxtrem-portal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/ciberxtrem-portal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-frozen-wasteland.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-frozen-wasteland.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-frozen-wasteland.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-frozen-wasteland.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-galaxy-of-universes.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-galaxy-of-universes.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-galaxy-of-universes.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-galaxy-of-universes.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-ray-q-bert.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-ray-q-bert.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-ray-q-bert.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-ray-q-bert.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-ribbon-assault.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-ribbon-assault.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-ribbon-assault.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-ribbon-assault.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-rolling-hills.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-rolling-hills.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-rolling-hills.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-rolling-hills.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-skin-peeler.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-skin-peeler.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dave_hoskins-skin-peeler.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dave_hoskins-skin-peeler.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/davidbargo-sg15-midgar.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/davidbargo-sg15-midgar.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/davidbargo-sg15-midgar.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/davidbargo-sg15-midgar.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/devin-morning-city.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/devin-morning-city.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/devin-morning-city.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/devin-morning-city.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dila-cypher.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dila-cypher.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dila-cypher.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dila-cypher.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dila-frickinlasers.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dila-frickinlasers.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dila-frickinlasers.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dila-frickinlasers.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dila-yaraguishader.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dila-yaraguishader.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dila-yaraguishader.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dila-yaraguishader.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-blob-zoo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-blob-zoo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-blob-zoo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-blob-zoo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-ocean-structure.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-ocean-structure.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-ocean-structure.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-ocean-structure.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-rainbow-cavern.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-rainbow-cavern.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-rainbow-cavern.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-rainbow-cavern.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-river-flight.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-river-flight.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-river-flight.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-river-flight.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-seabirds-at-sunset.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-seabirds-at-sunset.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-seabirds-at-sunset.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-seabirds-at-sunset.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-stairway-to-the-stars.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-stairway-to-the-stars.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-stairway-to-the-stars.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-stairway-to-the-stars.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-temple-of-the-waves.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-temple-of-the-waves.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-temple-of-the-waves.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-temple-of-the-waves.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-wavescape.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-wavescape.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-wavescape.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-wavescape.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-white-folly.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-white-folly.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/dr2-white-folly.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/dr2-white-folly.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/fabriceneyret2-skyline-3d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/fabriceneyret2-skyline-3d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/fabriceneyret2-skyline-3d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/fabriceneyret2-skyline-3d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/fizzer-kirby-jump.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/fizzer-kirby-jump.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/fizzer-kirby-jump.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/fizzer-kirby-jump.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/fizzer-power-coils.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/fizzer-power-coils.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/fizzer-power-coils.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/fizzer-power-coils.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/fizzer-the-popular-shader.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/fizzer-the-popular-shader.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/fizzer-the-popular-shader.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/fizzer-the-popular-shader.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/geoff-nearest-neighbour-upsampling.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/geoff-nearest-neighbour-upsampling.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/geoff-nearest-neighbour-upsampling.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/geoff-nearest-neighbour-upsampling.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/greendestruction-ironicflux.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/greendestruction-ironicflux.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/greendestruction-ironicflux.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/greendestruction-ironicflux.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/guil-floral-perspective.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/guil-floral-perspective.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/guil-floral-perspective.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/guil-floral-perspective.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/guil-smoking.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/guil-smoking.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/guil-smoking.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/guil-smoking.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/hlorenzi-mariobros.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/hlorenzi-mariobros.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/hlorenzi-mariobros.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/hlorenzi-mariobros.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/hlorenzi-zelda.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/hlorenzi-zelda.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/hlorenzi-zelda.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/hlorenzi-zelda.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/hughsk-environmentmap.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/hughsk-environmentmap.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/hughsk-environmentmap.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/hughsk-environmentmap.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/ingagard-retro-gaming.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/ingagard-retro-gaming.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/ingagard-retro-gaming.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/ingagard-retro-gaming.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iocc-fan-bounce.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iocc-fan-bounce.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iocc-fan-bounce.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iocc-fan-bounce.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-analytical-normals-3d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-analytical-normals-3d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-analytical-normals-3d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-analytical-normals-3d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-apple.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-apple.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-apple.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-apple.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-batman.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-batman.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-batman.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-batman.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-clover.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-clover.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-clover.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-clover.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-fourier-interpolation.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-fourier-interpolation.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-fourier-interpolation.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-fourier-interpolation.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-image-audrey-hepburn.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-image-audrey-hepburn.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-image-audrey-hepburn.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-image-audrey-hepburn.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-input-time.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-input-time.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-input-time.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-input-time.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-julia-quaternion.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-julia-quaternion.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-julia-quaternion.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-julia-quaternion.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-mandelbulb-derivative.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-mandelbulb-derivative.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-mandelbulb-derivative.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-mandelbulb-derivative.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-oscilomushroom.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-oscilomushroom.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-oscilomushroom.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-oscilomushroom.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-raymarching-primitives.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-raymarching-primitives.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/iq-raymarching-primitives.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/iq-raymarching-primitives.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/jasminpatry-are-gee-be.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/jasminpatry-are-gee-be.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/jasminpatry-are-gee-be.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/jasminpatry-are-gee-be.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/kali-fractalorgy.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/kali-fractalorgy.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/kali-fractalorgy.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/kali-fractalorgy.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/kali-generators.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/kali-generators.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/kali-generators.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/kali-generators.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/kashey-distance-field-text-yandex.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/kashey-distance-field-text-yandex.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/kashey-distance-field-text-yandex.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/kashey-distance-field-text-yandex.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/kig-motion-blur-example.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/kig-motion-blur-example.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/kig-motion-blur-example.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/kig-motion-blur-example.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/knarkowicz-bokeh-parallax.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/knarkowicz-bokeh-parallax.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/knarkowicz-bokeh-parallax.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/knarkowicz-bokeh-parallax.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/knightcrawler25-a-ray-tracer.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/knightcrawler25-a-ray-tracer.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/knightcrawler25-a-ray-tracer.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/knightcrawler25-a-ray-tracer.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/leon-mam-stairs.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/leon-mam-stairs.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/leon-mam-stairs.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/leon-mam-stairs.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/leon-smoke-rings.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/leon-smoke-rings.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/leon-smoke-rings.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/leon-smoke-rings.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/leon-spell-demons-souls.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/leon-spell-demons-souls.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/leon-spell-demons-souls.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/leon-spell-demons-souls.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/leon-tribute-to-marc-antoine-mathieu.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/leon-tribute-to-marc-antoine-mathieu.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/leon-tribute-to-marc-antoine-mathieu.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/leon-tribute-to-marc-antoine-mathieu.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/mattz-gabor-to-the-power-of-2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/mattz-gabor-to-the-power-of-2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/mattz-gabor-to-the-power-of-2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/mattz-gabor-to-the-power-of-2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/movax13h-on-off-spikes.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/movax13h-on-off-spikes.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/movax13h-on-off-spikes.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/movax13h-on-off-spikes.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/mudlord-emeraldenvy4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/mudlord-emeraldenvy4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/mudlord-emeraldenvy4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/mudlord-emeraldenvy4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/mudlord-poc.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/mudlord-poc.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/mudlord-poc.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/mudlord-poc.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/mzadami-pi-train.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/mzadami-pi-train.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/mzadami-pi-train.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/mzadami-pi-train.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/nimitz-somewhere-in-1993.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/nimitz-somewhere-in-1993.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/nimitz-somewhere-in-1993.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/nimitz-somewhere-in-1993.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/nrx-voxel-pacman.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/nrx-voxel-pacman.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/nrx-voxel-pacman.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/nrx-voxel-pacman.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/otaviogood-alien-beacon.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/otaviogood-alien-beacon.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/otaviogood-alien-beacon.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/otaviogood-alien-beacon.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/otaviogood-iceberg.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/otaviogood-iceberg.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/otaviogood-iceberg.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/otaviogood-iceberg.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/otaviogood-skyline.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/otaviogood-skyline.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/otaviogood-skyline.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/otaviogood-skyline.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/pmalin-where-the-river-goes-textureless-hd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/pmalin-where-the-river-goes-textureless-hd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/pmalin-where-the-river-goes-textureless-hd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/pmalin-where-the-river-goes-textureless-hd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/pmalin-where-the-river-goes-textureless.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/pmalin-where-the-river-goes-textureless.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/pmalin-where-the-river-goes-textureless.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/pmalin-where-the-river-goes-textureless.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/reinder-alotofspheres.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/reinder-alotofspheres.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/reinder-alotofspheres.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/reinder-alotofspheres.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/reinder-doom2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/reinder-doom2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/reinder-doom2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/reinder-doom2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/reinder-tokyo.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/reinder-tokyo.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/reinder-tokyo.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/reinder-tokyo.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/reinder-wolfenstein3d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/reinder-wolfenstein3d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/reinder-wolfenstein3d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/reinder-wolfenstein3d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/romainguy-physically-based-sdf.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/romainguy-physically-based-sdf.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/romainguy-physically-based-sdf.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/romainguy-physically-based-sdf.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/sdf-platform.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/sdf-platform.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/sdf-platform.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/sdf-platform.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/shane-latticetutorial.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/shane-latticetutorial.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/shane-latticetutorial.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/shane-latticetutorial.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/shane-quasi-infinite-zoom-voronoi.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/shane-quasi-infinite-zoom-voronoi.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/shane-quasi-infinite-zoom-voronoi.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/shane-quasi-infinite-zoom-voronoi.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/shane-raymarched-reflections.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/shane-raymarched-reflections.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/shane-raymarched-reflections.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/shane-raymarched-reflections.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/shane-tunneltutorial.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/shane-tunneltutorial.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/shane-tunneltutorial.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/shane-tunneltutorial.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/sprash3-vt220-hq-font-rendering.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/sprash3-vt220-hq-font-rendering.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/sprash3-vt220-hq-font-rendering.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/sprash3-vt220-hq-font-rendering.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-industry.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-industry.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-industry.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-industry.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-relentless.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-relentless.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-relentless.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-relentless.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-sound-digital-ambience.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-sound-digital-ambience.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-sound-digital-ambience.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-sound-digital-ambience.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-star-swirl.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-star-swirl.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-star-swirl.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-star-swirl.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-the-eye.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-the-eye.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/srtuss-the-eye.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/srtuss-the-eye.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/stellabialek-moonlight-sillyness.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/stellabialek-moonlight-sillyness.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/stellabialek-moonlight-sillyness.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/stellabialek-moonlight-sillyness.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/sw-cloud-2d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/sw-cloud-2d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/sw-cloud-2d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/sw-cloud-2d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tdm-mountain-peak.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tdm-mountain-peak.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tdm-mountain-peak.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tdm-mountain-peak.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tdm-psx-rendering.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tdm-psx-rendering.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tdm-psx-rendering.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tdm-psx-rendering.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tdm-seascape.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tdm-seascape.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tdm-seascape.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tdm-seascape.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tdm-wet-stone.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tdm-wet-stone.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tdm-wet-stone.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tdm-wet-stone.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/timothylottes-resolution-vs-antialiasing.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/timothylottes-resolution-vs-antialiasing.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/timothylottes-resolution-vs-antialiasing.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/timothylottes-resolution-vs-antialiasing.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tomkel-retro-racetrack.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tomkel-retro-racetrack.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/tomkel-retro-racetrack.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/tomkel-retro-racetrack.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/xt9s-flame.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/xt9s-flame.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/xt9s-flame.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/xt9s-flame.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/zippycoder-atari-st-union-demo-intro.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/zippycoder-atari-st-union-demo-intro.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/zippycoder-atari-st-union-demo-intro.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/zippycoder-atari-st-union-demo-intro.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/ztri-shady-building.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/ztri-shady-building.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/procedural/ztri-shady-building.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/procedural/ztri-shady-building.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quad/biquad.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quad/biquad.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quad/biquad.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quad/biquad.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quad/quad_interp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quad/quad_interp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quad/quad_interp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quad/quad_interp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quad/shaders/biquad.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quad/shaders/biquad.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quad/shaders/biquad.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quad/shaders/biquad.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quad/shaders/quad_interp.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quad/shaders/quad_interp.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quad/shaders/quad_interp.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quad/shaders/quad_interp.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quilez.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quilez.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/quilez.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/quilez.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/blendoverlay.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/blendoverlay.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/blendoverlay.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/blendoverlay.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/bloom.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/bloom.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/bloom.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/bloom.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/bsnes-gamma-ramp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/bsnes-gamma-ramp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/bsnes-gamma-ramp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/bsnes-gamma-ramp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/gba.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/gba.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/gba.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/gba.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/halftone-print.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/halftone-print.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/halftone-print.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/halftone-print.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/lut.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/lut.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/lut.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/lut.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/nds.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/nds.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/nds.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/nds.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/16.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/16.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/16.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/16.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/32.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/32.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/32.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/32.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/64.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/64.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/64.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/64.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/GBA-Unaltered_Gamma.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/GBA-Unaltered_Gamma.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/GBA-Unaltered_Gamma.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/GBA-Unaltered_Gamma.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/GBA.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/GBA.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/GBA.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/GBA.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/Kurozumi_64_D65_EBU.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/Kurozumi_64_D65_EBU.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/Kurozumi_64_D65_EBU.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/Kurozumi_64_D65_EBU.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/Kurozumi_64_D65_Rec601.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/Kurozumi_64_D65_Rec601.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/Kurozumi_64_D65_Rec601.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/Kurozumi_64_D65_Rec601.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/Kurozumi_64_D93_Rec601.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/Kurozumi_64_D93_Rec601.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/Kurozumi_64_D93_Rec601.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/Kurozumi_64_D93_Rec601.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/LUT.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/LUT.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/LUT.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/LUT.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/NDS.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/NDS.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/NDS.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/NDS.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/NEC_XM29plus_capture.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/NEC_XM29plus_capture.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/NEC_XM29plus_capture.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/NEC_XM29plus_capture.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/VBA.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/VBA.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/VBA.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/VBA.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/bsnes.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/bsnes.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/bsnes.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/bsnes.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/cmyk-16.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/cmyk-16.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/cmyk-16.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/cmyk-16.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/jvc_tm.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/jvc_tm.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/jvc_tm.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/jvc_tm.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/multiLUT.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/multiLUT.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/multiLUT.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/multiLUT.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/schindlers-list-17.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/schindlers-list-17.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/schindlers-list-17.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/schindlers-list-17.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/sony_trinitron_std_50.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/sony_trinitron_std_50.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/LUT/sony_trinitron_std_50.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/LUT/sony_trinitron_std_50.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/blendoverlay.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/blendoverlay.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/blendoverlay.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/blendoverlay.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/blendoverlay.slang b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/blendoverlay.slang similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/blendoverlay.slang rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/blendoverlay.slang diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/grayscale_slotmask.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/grayscale_slotmask.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/grayscale_slotmask.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/grayscale_slotmask.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/monochrome-matrix-3px.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/monochrome-matrix-3px.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/monochrome-matrix-3px.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/monochrome-matrix-3px.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/phosphorlut-10x10.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/phosphorlut-10x10.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/phosphorlut-10x10.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/phosphorlut-10x10.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/phosphorlut-6x6.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/phosphorlut-6x6.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/phosphorlut-6x6.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/phosphorlut-6x6.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/phosphorlut-8x8.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/phosphorlut-8x8.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/phosphorlut-8x8.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/phosphorlut-8x8.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/shadowmask-4x4.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/shadowmask-4x4.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/shadowmask-4x4.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/shadowmask-4x4.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/shadowmask-6x3.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/shadowmask-6x3.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/shadowmask-6x3.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/shadowmask-6x3.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/shenlong-4x2.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/shenlong-4x2.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/shenlong-4x2.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/shenlong-4x2.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/shenlong-6x4.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/shenlong-6x4.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/blendoverlay/shenlong-6x4.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/blendoverlay/shenlong-6x4.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/BloomPass4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/BloomPass4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensDB.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensDB.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensDB.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensDB.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensFlarePass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensFlarePass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensFlarePass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensFlarePass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensFlarePass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensFlarePass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensFlarePass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensFlarePass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensFlarePass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensFlarePass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensFlarePass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensFlarePass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensSprite.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensSprite.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LensSprite.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LensSprite.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LightingCombine.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LightingCombine.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/shaders/bloom/LightingCombine.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/shaders/bloom/LightingCombine.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/vba.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/vba.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/reshade/vba.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/reshade/vba.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/5xbr-retro.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/5xbr-retro.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/5xbr-retro.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/5xbr-retro.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/aann.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/aann.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/aann.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/aann.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/bead.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/bead.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/bead.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/bead.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/bevel.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/bevel.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/bevel.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/bevel.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/pixellate.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/pixellate.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/pixellate.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/pixellate.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/retro-v2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/retro-v2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/retro-v2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/retro-v2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/5xbr-retro.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/5xbr-retro.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/5xbr-retro.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/5xbr-retro.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/aann.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/aann.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/aann.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/aann.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/bead.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/bead.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/bead.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/bead.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/bevel.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/bevel.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/bevel.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/bevel.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/pixellate.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/pixellate.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/pixellate.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/pixellate.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/retro-v2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/retro-v2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/retro-v2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/retro-v2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/sharp-bilinear.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/sharp-bilinear.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/shaders/sharp-bilinear.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/shaders/sharp-bilinear.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/sharp-bilinear.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/sharp-bilinear.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/retro/sharp-bilinear.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/retro/sharp-bilinear.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/sabr-hybrid-deposterize.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/sabr-hybrid-deposterize.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/sabr-hybrid-deposterize.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/sabr-hybrid-deposterize.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/sabr-v1.1.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/sabr-v1.1.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/sabr-v1.1.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/sabr-v1.1.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/sabr-v3.0.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/sabr-v3.0.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/sabr-v3.0.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/sabr-v3.0.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/sabr.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/sabr.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/sabr.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/sabr.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/shaders/sabr-hybrid-deposterize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/shaders/sabr-hybrid-deposterize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/shaders/sabr-hybrid-deposterize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/shaders/sabr-hybrid-deposterize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/shaders/sabr-v1.1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/shaders/sabr-v1.1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/shaders/sabr-v1.1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/shaders/sabr-v1.1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/shaders/sabr-v3.0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/shaders/sabr-v3.0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sabr/shaders/sabr-v3.0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sabr/shaders/sabr-v3.0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/scalefx+rAA.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/scalefx+rAA.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/scalefx+rAA.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/scalefx+rAA.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/scalefx-hybrid.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/scalefx-hybrid.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/scalefx-hybrid.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/scalefx-hybrid.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/scalefx.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/scalefx.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/scalefx.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/scalefx.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass4-hybrid.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass4-hybrid.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass4-hybrid.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass4-hybrid.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalefx/shaders/scalefx-pass4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalefx/shaders/scalefx-pass4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalehq/2xScaleHQ.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalehq/2xScaleHQ.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalehq/2xScaleHQ.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalehq/2xScaleHQ.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalehq/4xScaleHQ.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalehq/4xScaleHQ.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalehq/4xScaleHQ.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalehq/4xScaleHQ.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalehq/shaders/2xScaleHQ.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalehq/shaders/2xScaleHQ.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalehq/shaders/2xScaleHQ.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalehq/shaders/2xScaleHQ.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalehq/shaders/4xScaleHQ.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalehq/shaders/4xScaleHQ.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalehq/shaders/4xScaleHQ.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalehq/shaders/4xScaleHQ.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale2x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale2x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale2x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale2x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale2xSFX.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale2xSFX.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale2xSFX.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale2xSFX.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale2xplus.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale2xplus.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale2xplus.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale2xplus.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale3xSFX.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale3xSFX.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/scale3xSFX.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/scale3xSFX.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale2x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale2x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale2x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale2x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale2xSFX.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale2xSFX.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale2xSFX.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale2xSFX.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale2xplus.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale2xplus.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale2xplus.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale2xplus.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale3x.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale3x.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale3x.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale3x.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale3xSFX.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale3xSFX.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scalenx/shaders/scale3xSFX.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scalenx/shaders/scale3xSFX.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanline.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanline.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanline.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanline.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/lightguns-lumi-1.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/lightguns-lumi-1.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/lightguns-lumi-1.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/lightguns-lumi-1.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/lightguns-lumi-2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/lightguns-lumi-2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/lightguns-lumi-2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/lightguns-lumi-2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/lightguns-lumi-3.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/lightguns-lumi-3.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/lightguns-lumi-3.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/lightguns-lumi-3.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/res-independent-scanlines.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/res-independent-scanlines.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/res-independent-scanlines.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/res-independent-scanlines.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline-fract.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline-fract.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline-fract.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline-fract.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline-heavy.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline-heavy.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline-heavy.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline-heavy.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline-light.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline-light.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline-light.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline-light.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline-medium.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline-medium.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline-medium.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline-medium.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanline.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanline.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanlines-sine-abs.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanlines-sine-abs.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/scanlines/shaders/scanlines-sine-abs.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/scanlines/shaders/scanlines-sine-abs.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/adaptive-sharpen-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/adaptive-sharpen-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/adaptive-sharpen-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/adaptive-sharpen-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/adaptive-sharpen.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/adaptive-sharpen.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/adaptive-sharpen.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/adaptive-sharpen.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/adaptive-sharpen-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/adaptive-sharpen-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/adaptive-sharpen-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/adaptive-sharpen-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/adaptive-sharpen-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/adaptive-sharpen-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/adaptive-sharpen-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/adaptive-sharpen-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/adaptive-sharpen.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/adaptive-sharpen.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/adaptive-sharpen.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/adaptive-sharpen.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/diff.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/diff.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/diff.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/diff.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/fast-sharpen.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/fast-sharpen.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/fast-sharpen.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/fast-sharpen.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/super-res-ex.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/super-res-ex.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/shaders/super-res-ex.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/shaders/super-res-ex.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/super-xbr-super-res.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/super-xbr-super-res.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/sharpen/super-xbr-super-res.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/sharpen/super-xbr-super-res.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/slang-conversion-template.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/slang-conversion-template.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/slang-conversion-template.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/slang-conversion-template.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize-simulate-crt-on-lcd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize-simulate-crt-on-lcd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize-simulate-crt-on-lcd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize-simulate-crt-on-lcd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize-simulate-gba-on-crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize-simulate-gba-on-crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize-simulate-gba-on-crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize-simulate-gba-on-crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize-simulate-gba-on-lcd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize-simulate-gba-on-lcd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize-simulate-gba-on-lcd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize-simulate-gba-on-lcd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize-simulate-lcd-on-crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize-simulate-lcd-on-crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize-simulate-lcd-on-crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize-simulate-lcd-on-crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/first-pass-linearize.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/first-pass-linearize.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct-simulate-crt-on-lcd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct-simulate-crt-on-lcd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct-simulate-crt-on-lcd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct-simulate-crt-on-lcd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct-simulate-gba-on-crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct-simulate-gba-on-crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct-simulate-gba-on-crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct-simulate-gba-on-crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct-simulate-gba-on-lcd.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct-simulate-gba-on-lcd.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct-simulate-gba-on-lcd.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct-simulate-gba-on-lcd.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct-simulate-lcd-on-crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct-simulate-lcd-on-crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct-simulate-lcd-on-crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct-simulate-lcd-on-crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/srgb-helpers/last-pass-gamma-correct.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/srgb-helpers/last-pass-gamma-correct.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/anaglyph-to-side-by-side.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/anaglyph-to-side-by-side.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/anaglyph-to-side-by-side.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/anaglyph-to-side-by-side.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/shaders/anaglyph-to-side-by-side.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/shaders/anaglyph-to-side-by-side.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/shaders/anaglyph-to-side-by-side.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/shaders/anaglyph-to-side-by-side.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/shaders/shutter-3d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/shaders/shutter-3d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/shaders/shutter-3d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/shaders/shutter-3d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/shaders/side-by-side-simple.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/shaders/side-by-side-simple.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/shaders/side-by-side-simple.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/shaders/side-by-side-simple.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/shutter-to-side-by-side.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/shutter-to-side-by-side.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/shutter-to-side-by-side.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/shutter-to-side-by-side.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/side-by-side.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/side-by-side.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stereoscopic-3d/side-by-side.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stereoscopic-3d/side-by-side.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stock.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stock.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/stock.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/stock.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/mudlord-pal-vhs.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/mudlord-pal-vhs.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/mudlord-pal-vhs.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/mudlord-pal-vhs.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/ntsc-vcr.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/ntsc-vcr.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/ntsc-vcr.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/ntsc-vcr.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/resources/play.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/resources/play.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/resources/play.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/resources/play.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/resources/rew.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/resources/rew.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/resources/rew.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/resources/rew.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/shaders/mudlord-pal-vhs.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/shaders/mudlord-pal-vhs.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/shaders/mudlord-pal-vhs.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/shaders/mudlord-pal-vhs.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/shaders/rewind.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/shaders/rewind.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/shaders/rewind.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/shaders/rewind.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/shaders/static.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/shaders/static.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/shaders/static.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/shaders/static.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/shaders/vhs.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/shaders/vhs.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/shaders/vhs.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/shaders/vhs.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/vhs.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/vhs.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/vhs/vhs.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/vhs/vhs.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation-ATi.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation-ATi.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation-ATi.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation-ATi.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation-horizontal-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation-horizontal-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation-horizontal-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation-horizontal-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation-vertical-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation-vertical-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation-vertical-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation-vertical-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/dilation.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/dilation.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion-ATi.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion-ATi.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion-ATi.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion-ATi.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion-horizontal-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion-horizontal-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion-horizontal-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion-horizontal-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion-vertical-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion-vertical-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion-vertical-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion-vertical-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/erosion.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/erosion.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/smart-morph.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/smart-morph.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/warp/shaders/smart-morph.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/warp/shaders/smart-morph.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/shaders/water.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/shaders/water.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/shaders/water.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/shaders/water.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/shaders/waterpaint-hc.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/shaders/waterpaint-hc.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/shaders/waterpaint-hc.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/shaders/waterpaint-hc.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/shaders/waterpaint.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/shaders/waterpaint.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/shaders/waterpaint.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/shaders/waterpaint.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/water.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/water.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/water.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/water.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/waterpaint-hc.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/waterpaint-hc.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/waterpaint-hc.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/waterpaint-hc.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/waterpaint.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/waterpaint.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/waterpaint/waterpaint.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/waterpaint/waterpaint.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/jinc2-params.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/jinc2-params.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/jinc2-params.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/jinc2-params.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/jinc2-sharp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/jinc2-sharp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/jinc2-sharp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/jinc2-sharp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/jinc2-sharper.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/jinc2-sharper.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/jinc2-sharper.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/jinc2-sharper.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/jinc2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/jinc2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/jinc2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/jinc2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos12.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos12.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos12.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos12.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos16.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos16.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos16.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos16.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos2-sharp.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos2-sharp.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos2-sharp.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos2-sharp.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos4.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos4.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos4.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos4.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos6.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos6.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/lanczos6.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/lanczos6.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/jinc2-params.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/jinc2-params.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/jinc2-params.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/jinc2-params.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/jinc2-sharp.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/jinc2-sharp.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/jinc2-sharp.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/jinc2-sharp.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/jinc2-sharper.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/jinc2-sharper.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/jinc2-sharper.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/jinc2-sharper.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/jinc2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/jinc2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/jinc2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/jinc2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos12.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos12.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos12.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos12.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos16.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos16.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos16.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos16.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos2-sharp.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos2-sharp.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos2-sharp.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos2-sharp.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos6.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos6.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/windowed/shaders/lanczos6.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/windowed/shaders/lanczos6.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/2xBR-lv1-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/2xBR-lv1-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/2xBR-lv1-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/2xBR-lv1-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/2xBR-multipass/2xbr-lv1-c-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/2xBR-multipass/2xbr-lv1-c-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/2xBR-multipass/2xbr-lv1-c-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/2xBR-multipass/2xbr-lv1-c-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/2xBR-multipass/2xbr-lv1-c-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/2xBR-multipass/2xbr-lv1-c-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/2xBR-multipass/2xbr-lv1-c-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/2xBR-multipass/2xbr-lv1-c-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/hlsl/5xbr-v3.7a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/hlsl/5xbr-v3.7a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/hlsl/5xbr-v3.7a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/hlsl/5xbr-v3.7a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v2.1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v2.1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v2.1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v2.1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v2.2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v2.2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v2.2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v2.2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.5a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.5a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.5a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.5a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.7c-dark.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.7c-dark.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.7c-dark.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.7c-dark.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.7c-light.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.7c-light.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.7c-light.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.7c-light.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.7c.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.7c.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.7c.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.7c.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.8a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.8a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.8a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.8a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.8b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.8b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.8b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.8b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.8c.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.8c.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.8c.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.8c.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.8d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.8d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr-v3.8d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr-v3.8d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/2xbr.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/2xbr.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v3.8a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v3.8a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v3.8a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v3.8a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v3.8b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v3.8b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v3.8b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v3.8b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v3.8c.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v3.8c.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v3.8c.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v3.8c.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v3.8d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v3.8d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr-v3.8d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr-v3.8d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/3xbr.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/3xbr.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v1.1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v1.1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v1.1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v1.1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.5-plus-crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.5-plus-crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.5-plus-crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.5-plus-crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.8a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.8a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.8a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.8a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.8b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.8b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.8b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.8b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.8c.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.8c.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.8c.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.8c.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.8d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.8d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.8d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.8d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.9c.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.9c.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v3.9c.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v3.9c.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v4.0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v4.0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr-v4.0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr-v4.0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/4xbr.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/4xbr.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v1.1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v1.1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v1.1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v1.1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v2.1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v2.1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v2.1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v2.1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.5-plus-crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.5-plus-crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.5-plus-crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.5-plus-crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.5.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.5.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.5.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.5.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.5a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.5a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.5a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.5a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.6a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.6a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.6a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.6a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.6b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.6b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.6b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.6b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.6c.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.6c.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.6c.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.6c.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7c-lq.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7c-lq.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7c-lq.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7c-lq.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7c-plus-crt.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7c-plus-crt.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7c-plus-crt.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7c-plus-crt.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7c.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7c.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7c.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7c.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.7d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.7d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.8a.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.8a.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.8a.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.8a.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.8b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.8b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.8b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.8b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.8c.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.8c.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.8c.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.8c.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.8d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.8d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v3.8d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v3.8d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v4.0-noblend.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v4.0-noblend.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr-v4.0-noblend.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr-v4.0-noblend.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/5xbr.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/5xbr.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/xbr-dilation.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/xbr-dilation.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/xbr-dilation.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/xbr-dilation.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/xbr-v3.8a-gamma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/xbr-v3.8a-gamma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/xbr-v3.8a-gamma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/xbr-v3.8a-gamma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/xbr-v3.8b-gamma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/xbr-v3.8b-gamma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/xbr-v3.8b-gamma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/xbr-v3.8b-gamma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/xbr-v3.8c-gamma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/xbr-v3.8c-gamma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/legacy/xbr-v3.8c-gamma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/legacy/xbr-v3.8c-gamma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/custom-jinc2-sharper.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/custom-jinc2-sharper.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/custom-jinc2-sharper.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/custom-jinc2-sharper.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-2xbr-3d-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass1f.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass1f.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass1f.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass1f.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass3f.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass3f.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass3f.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-4xbr-3d-pass3f.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass5.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass5.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass5.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-8xbr-3d-pass5.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-fast-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-fast-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-fast-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-fast-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-fast-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-fast-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-fast-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-fast-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-fast-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-fast-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-fast-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-fast-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-pass0b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-pass0b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-pass0b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-pass0b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/super-xbr/super-xbr-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/super-xbr/super-xbr-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-sharp.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-sharp.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-sharp.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-sharp.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v2-gamma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v2-gamma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v2-gamma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v2-gamma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4-gamma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4-gamma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4-gamma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4-gamma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4b.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4b.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4b.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v4b.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-hybrid/2xbr-hybrid.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv1-noblend.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv1-noblend.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv1-noblend.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv1-noblend.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-3d.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-3d.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-3d.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-3d.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-fast.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-fast.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-fast.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-fast.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-a-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-a-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-a-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-a-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-a.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-a.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-a.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-a.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-b-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-b-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-b-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-b-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-b.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-b.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-b.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-b.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-c-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-c-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-c-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-c-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-c.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-c.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-c.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-c.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-d-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-d-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-d-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-d-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-d.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-d.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-d.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-d.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-a.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-a.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-a.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-a.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-b.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-b.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-b.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-b.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-c.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-c.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-c.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-c.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-d.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-d.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-d.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-dilation-d.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-noblend-dilation-c.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-noblend-dilation-c.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-noblend-dilation-c.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-noblend-dilation-c.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-noblend-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-noblend-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-noblend-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-noblend-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-noblend.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-noblend.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2-noblend.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2-noblend.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv3-noblend.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv3-noblend.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv3-noblend.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv3-noblend.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-lv3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-lv3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-2xbr-3d-2p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-2xbr-3d-2p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-2xbr-3d-2p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-2xbr-3d-2p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-2xbr-3d-3p-smoother.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-2xbr-3d-3p-smoother.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-2xbr-3d-3p-smoother.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-2xbr-3d-3p-smoother.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-4xbr-3d-4p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-4xbr-3d-4p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-4xbr-3d-4p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-4xbr-3d-4p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-4xbr-3d-6p-smoother.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-4xbr-3d-6p-smoother.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-4xbr-3d-6p-smoother.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-4xbr-3d-6p-smoother.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-8xbr-3d-6p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-8xbr-3d-6p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-8xbr-3d-6p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-8xbr-3d-6p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-2p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-2p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-2p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-2p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-3p-smoother.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-3p-smoother.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-3p-smoother.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-3p-smoother.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-6p-adaptive.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-6p-adaptive.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-6p-adaptive.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-6p-adaptive.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-6p-small-details.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-6p-small-details.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-6p-small-details.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-6p-small-details.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-6p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-6p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-6p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-6p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-deposterize.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-deposterize.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-deposterize.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-deposterize.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-fast-3p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-fast-3p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-fast-3p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-fast-3p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-fast-6p.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-fast-6p.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/super-xbr-fast-6p.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/super-xbr-fast-6p.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-hybrid.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-hybrid.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-hybrid.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-hybrid.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv1-noblend.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv1-noblend.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv1-noblend.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv1-noblend.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2-3d.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2-3d.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2-3d.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2-3d.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2-fast.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2-fast.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2-fast.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2-fast.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2-noblend.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2-noblend.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2-noblend.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2-noblend.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv3-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv3-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv3-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv3-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv3-noblend.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv3-noblend.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv3-noblend.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv3-noblend.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv3.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv3.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-lv3.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-lv3.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-mlv4-dilation.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-mlv4-dilation.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-mlv4-dilation.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-mlv4-dilation.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-mlv4-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-mlv4-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbr/xbr-mlv4-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbr/xbr-mlv4-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/4xbrz-linear.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/4xbrz-linear.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/4xbrz-linear.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/4xbrz-linear.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/5xbrz-linear.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/5xbrz-linear.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/5xbrz-linear.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/5xbrz-linear.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/6xbrz-linear.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/6xbrz-linear.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/6xbrz-linear.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/6xbrz-linear.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/4xbrz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/4xbrz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/4xbrz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/4xbrz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/5xbrz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/5xbrz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/5xbrz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/5xbrz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/6xbrz.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/6xbrz.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/6xbrz.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/6xbrz.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/xbrz-freescale.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/xbrz-freescale.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/shaders/xbrz-freescale.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/shaders/xbrz-freescale.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/xbrz-freescale-multipass.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/xbrz-freescale-multipass.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/xbrz-freescale-multipass.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/xbrz-freescale-multipass.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/xbrz-freescale.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/xbrz-freescale.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xbrz/xbrz-freescale.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xbrz/xbrz-freescale.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsai/shaders/super-2xsai.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsai/shaders/super-2xsai.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsai/shaders/super-2xsai.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsai/shaders/super-2xsai.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsai/super-2xsai.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsai/super-2xsai.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsai/super-2xsai.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsai/super-2xsai.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/2xsal-level2-crt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/2xsal-level2-crt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/2xsal-level2-crt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/2xsal-level2-crt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/2xsal.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/2xsal.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/2xsal.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/2xsal.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/4xsal-level2-crt.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/4xsal-level2-crt.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/4xsal-level2-crt.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/4xsal-level2-crt.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/4xsal-level2-hq.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/4xsal-level2-hq.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/4xsal-level2-hq.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/4xsal-level2-hq.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/4xsal-level2.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/4xsal-level2.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/4xsal-level2.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/4xsal-level2.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/shaders/2xsal-level2-hq.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/shaders/2xsal-level2-hq.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/shaders/2xsal-level2-hq.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/shaders/2xsal-level2-hq.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/shaders/2xsal-level2-pass2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/shaders/2xsal-level2-pass2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/shaders/2xsal-level2-pass2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/shaders/2xsal-level2-pass2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/shaders/2xsal-level2.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/shaders/2xsal-level2.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/shaders/2xsal-level2.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/shaders/2xsal-level2.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/shaders/2xsal.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/shaders/2xsal.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsal/shaders/2xsal.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsal/shaders/2xsal.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsoft/4xsoft.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsoft/4xsoft.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsoft/4xsoft.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsoft/4xsoft.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsoft/4xsoftSdB.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsoft/4xsoftSdB.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsoft/4xsoftSdB.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsoft/4xsoftSdB.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsoft/shaders/4xsoft.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsoft/shaders/4xsoft.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsoft/shaders/4xsoft.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsoft/shaders/4xsoft.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsoft/shaders/4xsoftSdB.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsoft/shaders/4xsoftSdB.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/xsoft/shaders/4xsoftSdB.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/xsoft/shaders/4xsoftSdB.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_crt_curve.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_crt_curve.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_crt_curve.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_crt_curve.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_crt_curve_vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_crt_curve_vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_crt_curve_vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_crt_curve_vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_crt_standard.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_crt_standard.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_crt_standard.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_crt_standard.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_crt_standard_vertical.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_crt_standard_vertical.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_crt_standard_vertical.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_crt_standard_vertical.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_lcd_standard.glsl b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_lcd_standard.glsl similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_lcd_standard.glsl rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_lcd_standard.glsl diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_resources/zfast_iqlut.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_resources/zfast_iqlut.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_resources/zfast_iqlut.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_resources/zfast_iqlut.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_resources/zfast_scanlut.png b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_resources/zfast_scanlut.png similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/lr/zfast/zfast_resources/zfast_scanlut.png rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/lr/zfast/zfast_resources/zfast_scanlut.png diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/phosphor.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/phosphor.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/phosphor.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/phosphor.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/retro.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/retro.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/retro.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/retro.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/retro_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/retro_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/retro_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/retro_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/retro_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/retro_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/retro_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/retro_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/rrgbd-scanlines-heavy.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/rrgbd-scanlines-heavy.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/rrgbd-scanlines-heavy.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/rrgbd-scanlines-heavy.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/rrgbd-scanlines-light.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/rrgbd-scanlines-light.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/rrgbd-scanlines-light.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/rrgbd-scanlines-light.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/rrgbd-scanlines-medium.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/rrgbd-scanlines-medium.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/rrgbd-scanlines-medium.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/rrgbd-scanlines-medium.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/scanline_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/scanline_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/scanline_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/scanline_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/scanline_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/scanline_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/scanline_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/scanline_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/waterpaint-scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/waterpaint-scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/waterpaint-scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/waterpaint-scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_lcd3x.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_lcd3x.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_lcd3x.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_lcd3x.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_lcd3x_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_lcd3x_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_lcd3x_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_lcd3x_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_lcd3x_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_lcd3x_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_lcd3x_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_lcd3x_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_retro.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_retro.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_retro.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_retro.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_retro_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_retro_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_retro_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_retro_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_retro_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_retro_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_retro_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_retro_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_scanline.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_scanline.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_scanline.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_scanline.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_scanline_gamma_115.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_scanline_gamma_115.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_scanline_gamma_115.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_scanline_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_scanline_gamma_125.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_scanline_gamma_125.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/xbr-lvl1_scanline_gamma_125.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/xbr-lvl1_scanline_gamma_125.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_crt_curve.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_crt_curve.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_crt_curve.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_crt_curve.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_crt_curve_vertical.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_crt_curve_vertical.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_crt_curve_vertical.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_crt_curve_vertical.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_crt_standard.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_crt_standard.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_crt_standard.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_crt_standard.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_crt_standard_vertical.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_crt_standard_vertical.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_crt_standard_vertical.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_crt_standard_vertical.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_lcd_standard.glslp b/board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_lcd_standard.glslp similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/shaders/zfast_lcd_standard.glslp rename to board/recalbox/fsoverlay/recalbox/share_init/shaders/glsl/zfast_lcd_standard.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/crtcurved.cfg b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/glsl/crtcurved.cfg similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/crtcurved.cfg rename to board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/glsl/crtcurved.cfg diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/retro.cfg b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/glsl/retro.cfg similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/retro.cfg rename to board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/glsl/retro.cfg diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/scanlines.cfg b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/glsl/scanlines.cfg similarity index 100% rename from board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/scanlines.cfg rename to board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/glsl/scanlines.cfg diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/crtcurved.cfg b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/crtcurved.cfg new file mode 100644 index 0000000000000000000000000000000000000000..5b0ebfc46ad8928aeca481f8d58d6fca420fac78 --- /dev/null +++ b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/crtcurved.cfg @@ -0,0 +1 @@ +all=/recalbox/share/shaders/slang/crt/crt-simple.slangp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/retro.cfg b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/retro.cfg new file mode 100644 index 0000000000000000000000000000000000000000..c5283370c70990cd0bfba2530cb664cf193b865e --- /dev/null +++ b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/retro.cfg @@ -0,0 +1,83 @@ +# Nintendo +snes=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +nes=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +n64=/recalbox/share/shaders/scanline.glslp +gba=/recalbox/share/shaders/lcd3x_gamma_115.glslp +gb=/recalbox/share/shaders/dot-green2.glslp +gbc=/recalbox/share/shaders/lcd3x_gamma_115.glslp +fds=/recalbox/share/shaders/scanline.glslp +virtualboy=/recalbox/share/shaders/scanline.glslp +nds=/recalbox/share/shaders/lcd3x.glslp +pokemini=/recalbox/share/shaders/lcd3x.glslp +satellaview=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +sufami=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +# Sega +sg1000=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +mastersystem=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +megadrive=/recalbox/share/shaders/crt-caligari.glslp +gamegear=/recalbox/share/shaders/scanline_gamma_115.glslp +sega32x=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +segacd=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +dreamcast=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +saturn=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +# Arcade +atomiswave=/recalbox/share/shaders/crt-caligari_gamma_125.glslp +naomi=/recalbox/share/shaders/crt-caligari_gamma_125.glslp +naomigd=/recalbox/share/shaders/crt-caligari_gamma_125.glslp +neogeo=/recalbox/share/shaders/crt-caligari_gamma_125.glslp +neogeocd=/recalbox/share/shaders/crt-caligari_gamma_125.glslp +mame=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +fba=scanlines +fbneo=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +# +ngp=/recalbox/share/shaders/lcd3x.glslp +ngpc=/recalbox/share/shaders/lcd3x.glslp +gw=/recalbox/share/shaders/scanline.glslp +vectrex= +lynx=/recalbox/share/shaders/lcd3x_gamma_125.glslp +lutro=/recalbox/share/shaders/scanline.glslp +wswan=/recalbox/share/shaders/lcd3x_gamma_115.glslp +wswanc=/recalbox/share/shaders/lcd3x_gamma_115.glslp +pcengine=/recalbox/share/shaders/crt-caligari.glslp +pcenginecd=/recalbox/share/shaders/crt-caligari.glslp +pcfx=/recalbox/share/shaders/crt-caligari.glslp +supergrafx=/recalbox/share/shaders/crt-caligari.glslp +atari2600=/recalbox/share/shaders/scanline.glslp +atari5200=/recalbox/share/shaders/crt-caligari.glslp +atari7800=/recalbox/share/shaders/scanline.glslp +jaguar=/recalbox/share/shaders/scanline.glslp +doom=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +psx=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +colecovision=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +3do=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +intellivision=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +channelf=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +gx4000=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +uzebox=/recalbox/share/shaders/crt-caligari.glslp +palm=/recalbox/share/shaders/lcd3x_gamma_125.glslp +multivision=/recalbox/share/shaders/scanline.glslp +quake=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +# Computers +msx1=/recalbox/share/shaders/scanline.glslp +msx2=/recalbox/share/shaders/scanline.glslp +msxturbor=/recalbox/share/shaders/scanline.glslp +spectravideo=/recalbox/share/shaders/scanline.glslp +amiga500=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +amiga600=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +amiga1200=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +amigacd32=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +amigacdtv=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +amstradcpc=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +atarist=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +zxspectrum=/recalbox/share/shaders/scanline.glslp +odyssey2=/recalbox/share/shaders/scanline.glslp +zx81=/recalbox/share/shaders/scanline.glslp +c64=/recalbox/share/shaders/crt-caligari_gamma_125.glslp +x1=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +x68000=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +thomson=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +atari800=/recalbox/share/shaders/crt-caligari.glslp +pc88=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +pc98=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +macintosh=/recalbox/share/shaders/crt-caligari_gamma_115.glslp +tic80=/recalbox/share/shaders/crt-caligari_gamma_115.glslp diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/scanlines.cfg b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/scanlines.cfg new file mode 100644 index 0000000000000000000000000000000000000000..08456aaaef8dc3faad3b9cacb3fa0b3d53b5e8f1 --- /dev/null +++ b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/shadersets/slang/scanlines.cfg @@ -0,0 +1,83 @@ +# Nintendo +snes=/recalbox/share/shaders/slang/scanlines/scanline.slangp +nes=/recalbox/share/shaders/slang/scanlines/scanline.slangp +n64=/recalbox/share/shaders/slang/scanlines/scanline.slangp +gba=/recalbox/share/shaders/slang/scanlines/scanline.slangp +gb=/recalbox/share/shaders/slang/scanlines/scanline.slangp +gbc=/recalbox/share/shaders/slang/scanlines/scanline.slangp +fds=/recalbox/share/shaders/slang/scanlines/scanline.slangp +virtualboy=/recalbox/share/shaders/slang/scanlines/scanline.slangp +nds=/recalbox/share/shaders/crt-caligari.glslp +pokemini=/recalbox/share/shaders/slang/scanlines/scanline.slangp +satellaview=/recalbox/share/shaders/slang/scanlines/scanline.slangp +sufami=/recalbox/share/shaders/slang/scanlines/scanline.slangp +# Sega +sg1000=/recalbox/share/shaders/slang/scanlines/scanline.slangp +mastersystem=/recalbox/share/shaders/slang/scanlines/scanline.slangp +megadrive=/recalbox/share/shaders/slang/scanlines/scanline.slangp +gamegear=/recalbox/share/shaders/slang/scanlines/scanline.slangp +sega32x=/recalbox/share/shaders/slang/scanlines/scanline.slangp +segacd=/recalbox/share/shaders/slang/scanlines/scanline.slangp +dreamcast=/recalbox/share/shaders/slang/scanlines/scanline.slangp +saturn=/recalbox/share/shaders/slang/scanlines/scanline.slangp +# Arcade +atomiswave=/recalbox/share/shaders/slang/scanlines/scanline.slangp +naomi=/recalbox/share/shaders/slang/scanlines/scanline.slangp +naomigd=/recalbox/share/shaders/slang/scanlines/scanline.slangp +neogeo=/recalbox/share/shaders/slang/scanlines/scanline.slangp +neogeocd=/recalbox/share/shaders/slang/scanlines/scanline.slangp +mame=/recalbox/share/shaders/slang/scanlines/scanline.slangp +fba=scanlines +fbneo=/recalbox/share/shaders/slang/scanlines/scanline.slangp +# +ngp=/recalbox/share/shaders/slang/scanlines/scanline.slangp +ngpc=/recalbox/share/shaders/slang/scanlines/scanline.slangp +gw=/recalbox/share/shaders/slang/scanlines/scanline.slangp +vectrex= +lynx=/recalbox/share/shaders/slang/scanlines/scanline.slangp +lutro=/recalbox/share/shaders/slang/scanlines/scanline.slangp +wswan=/recalbox/share/shaders/slang/scanlines/scanline.slangp +wswanc=/recalbox/share/shaders/slang/scanlines/scanline.slangp +pcengine=/recalbox/share/shaders/slang/scanlines/scanline.slangp +pcenginecd=/recalbox/share/shaders/slang/scanlines/scanline.slangp +pcfx=/recalbox/share/shaders/slang/scanlines/scanline.slangp +supergrafx=/recalbox/share/shaders/slang/scanlines/scanline.slangp +atari2600=/recalbox/share/shaders/slang/scanlines/scanline.slangp +atari5200=/recalbox/share/shaders/slang/scanlines/scanline.slangp +atari7800=/recalbox/share/shaders/slang/scanlines/scanline.slangp +jaguar=/recalbox/share/shaders/slang/scanlines/scanline.slangp +doom=/recalbox/share/shaders/slang/scanlines/scanline.slangp +psx=/recalbox/share/shaders/slang/scanlines/scanline.slangp +colecovision=/recalbox/share/shaders/slang/scanlines/scanline.slangp +3do=/recalbox/share/shaders/slang/scanlines/scanline.slangp +intellivision=/recalbox/share/shaders/slang/scanlines/scanline.slangp +channelf=/recalbox/share/shaders/slang/scanlines/scanline.slangp +gx4000=/recalbox/share/shaders/slang/scanlines/scanline.slangp +uzebox=/recalbox/share/shaders/slang/scanlines/scanline.slangp +palm=/recalbox/share/shaders/slang/scanlines/scanline.slangp +multivision=/recalbox/share/shaders/slang/scanlines/scanline.slangp +quake=/recalbox/share/shaders/slang/scanlines/scanline.slangp +# Computers +msx1=/recalbox/share/shaders/slang/scanlines/scanline.slangp +msx2=/recalbox/share/shaders/slang/scanlines/scanline.slangp +msxturbor=/recalbox/share/shaders/slang/scanlines/scanline.slangp +spectravideo=/recalbox/share/shaders/slang/scanlines/scanline.slangp +amiga500=/recalbox/share/shaders/slang/scanlines/scanline.slangp +amiga600=/recalbox/share/shaders/slang/scanlines/scanline.slangp +amiga1200=/recalbox/share/shaders/slang/scanlines/scanline.slangp +amigacd32=/recalbox/share/shaders/slang/scanlines/scanline.slangp +amigacdtv=/recalbox/share/shaders/slang/scanlines/scanline.slangp +amstradcpc=/recalbox/share/shaders/slang/scanlines/scanline.slangp +atarist=/recalbox/share/shaders/slang/scanlines/scanline.slangp +zxspectrum=/recalbox/share/shaders/slang/scanlines/scanline.slangp +odyssey2=/recalbox/share/shaders/slang/scanlines/scanline.slangp +zx81=/recalbox/share/shaders/slang/scanlines/scanline.slangp +c64=/recalbox/share/shaders/slang/scanlines/scanline.slangp +x1=/recalbox/share/shaders/slang/scanlines/scanline.slangp +x68000=/recalbox/share/shaders/slang/scanlines/scanline.slangp +thomson=/recalbox/share/shaders/slang/scanlines/scanline.slangp +atari800=/recalbox/share/shaders/slang/scanlines/scanline.slangp +pc88=/recalbox/share/shaders/slang/scanlines/scanline.slangp +pc98=/recalbox/share/shaders/slang/scanlines/scanline.slangp +macintosh=/recalbox/share/shaders/slang/scanlines/scanline.slangp +tic80=/recalbox/share/shaders/slang/scanlines/scanline.slangp diff --git a/package/recalbox-romfs2/scripts/systemholder.py b/package/recalbox-romfs2/scripts/systemholder.py index feb799862368071fd6a9c08a16d3f228c169d77a..4461a8f4004d3c68dc620fa7677ebac640ad62d8 100644 --- a/package/recalbox-romfs2/scripts/systemholder.py +++ b/package/recalbox-romfs2/scripts/systemholder.py @@ -147,7 +147,7 @@ class SystemHolder: } def __init__(self, package: str, priority: int, emulator: str, core: str, extensions: str, netplay: bool, softpatching: bool, compatibility: str, speed: str, crtavailable: bool, - arcadefile: str, arcadeignore: str, subfolder: str, video_backend: str): + arcadefile: str, arcadeignore: str, subfolder: str, video_backend: str, glcoreavailable: bool): self.__package: str = package self.__priority: int = priority self.__emulator: str = emulator @@ -160,6 +160,7 @@ class SystemHolder: self.__compatibility: str = compatibility self.__speed: str = speed self.__crtavailable: bool = crtavailable + self.__glcoreavailable: bool = glcoreavailable self.__arcade = SystemHolder.Core.ArcadeProperties(arcadefile, arcadeignore) self.__subfolder = subfolder if len(video_backend) == 0: video_backend="default" @@ -211,6 +212,10 @@ class SystemHolder: def crtavailable(self) -> bool: return self.__crtavailable + @property + def glcoreavailable(self) -> bool: + return self.__glcoreavailable + @property def subfolder(self) -> str: return self.__subfolder @@ -229,6 +234,7 @@ class SystemHolder: "compatibility": self.__compatibility, "speed": self.__speed, "crt.available": '1' if self.__crtavailable else '0', + "glcore.available": '1' if self.__glcoreavailable else '0', "video.backend": self.__video_backend, } @@ -392,6 +398,7 @@ class SystemHolder: compatibility=self.__get(desc, coreSection, "compatibility", "", True), speed=self.__get(desc, coreSection, "speed", "", True), crtavailable=(self.__get(desc, coreSection, "crt.available", "", False) == '1'), + glcoreavailable=(self.__get(desc, coreSection, "glcore.available", "", True) == '1'), arcadefile=self.__get(desc, coreSection, "arcade.file", "", False), arcadeignore=self.__get(desc, coreSection, "arcade.ignore", "", False), subfolder=self.__get(desc, coreSection, "roms.subfolder", "", False), diff --git a/package/retroarch-slang-shaders/Config.in b/package/retroarch-slang-shaders/Config.in new file mode 100644 index 0000000000000000000000000000000000000000..d34fdb80ebbfca1a6c73d6505511af32b62a44e8 --- /dev/null +++ b/package/retroarch-slang-shaders/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_RETROARCH_SLANG_SHADERS + bool "retroarch-slang-shaders" + depends on BR2_PACKAGE_RETROARCH + + help + RetroArch assets. + http://www.libretro.com diff --git a/package/retroarch-slang-shaders/retroarch-slang-shaders.mk b/package/retroarch-slang-shaders/retroarch-slang-shaders.mk new file mode 100644 index 0000000000000000000000000000000000000000..2ea1a8c3c773390b0abae4619790c32298f768b7 --- /dev/null +++ b/package/retroarch-slang-shaders/retroarch-slang-shaders.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# retroarch-slang-shaders +# +################################################################################ + +RETROARCH_SLANG_SHADERS_VERSION = 82d91f7daf81a41ece49644d2a26b2a40228be61 +RETROARCH_SLANG_SHADERS_SITE = $(call github,libretro,slang-shaders,$(RETROARCH_SLANG_SHADERS_VERSION)) +RETROARCH_SLANG_SHADERS_LICENSE = GPL + +define RETROARCH_SLANG_SHADERS_BUILD_CMDS + CFLAGS="$(TARGET_CFLAGS)" \ + CXXFLAGS="$(TARGET_CXXFLAGS)" \ + $(MAKE) CXX="$(TARGET_CXX)" \ + CC="$(TARGET_CC)" -C $(@D)/ -f Makefile +endef + +define RETROARCH_SLANG_SHADERS_INSTALL_TARGET_CMDS + mkdir -p $(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/fsoverlay/recalbox/share_init/shaders/slang + $(MAKE) CXX="$(TARGET_CXX)" -C $(@D) \ + INSTALLDIR=$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/fsoverlay/recalbox/share_init/shaders/slang install +endef + +$(eval $(generic-package)) diff --git a/projects/configgen/configgen/Emulator.py b/projects/configgen/configgen/Emulator.py index 104daa671377cb1d180d586182b524598d5343ec..ee034baae7f824e27510b31de29a1913533b660c 100644 --- a/projects/configgen/configgen/Emulator.py +++ b/projects/configgen/configgen/Emulator.py @@ -37,6 +37,7 @@ class ExtraArguments: jammalayoutp1: str = "" jammalayoutp2: str = "" lightgunluminosity: int = 0 + glcore: bool = True class Emulator: @@ -97,6 +98,7 @@ class Emulator: self._rotatecontrols: bool = False self._verticalgame: bool = False self._lightgunluminosity: int = 0 + self._glcore: bool = True # CRT arguments @@ -139,6 +141,7 @@ class Emulator: self._videoMode: str = self.__guessBestStringValue(recalboxOptions, "videomode", self._videoMode) self._shaderFile: str = self.__guessBestStringValue(recalboxOptions, "shaders", self._shaderFile) self._shaderSet: str = self.__guessBestStringValue(recalboxOptions, "shaderset", self._shaderSet) + self._glcore: bool = self.__guessBestBoolValue (recalboxOptions, "glcore", arguments.glcore) self._configFile: str = self.__guessBestStringValue(recalboxOptions, "configfile", self._configFile) self._showFPS: bool = self.__guessBestBoolValue (recalboxOptions, "showfps", self._showFPS) self._smooth: bool = self.__guessBestBoolValue (recalboxOptions, "smooth", self._smooth) @@ -188,7 +191,7 @@ class Emulator: self._rotation: Rotation = Rotation.fromInt(arguments.rotation) self._rotatecontrols: bool = arguments.rotatecontrols self._verticalgame: bool = arguments.verticalgame - self._lightgunluminosity = arguments.lightgunluminosity + self._lightgunluminosity = arguments.lightgunluminosity # CRT arguments self._crtvideostandard: CRTVideoStandard = CRTVideoStandard.fromString(arguments.crtvideostandard) @@ -232,7 +235,10 @@ class Emulator: # Shaders if len(self._shaderSet) != 0 and self._shaderSet != 'none': import configgen.recalboxFiles as recalboxFiles - shaderFile = recalboxFiles.shaderPresetRoot + '/' + self._shaderSet + '.cfg' + shaderMotor = "slang" + if not self._glcore: + shaderMotor = "glsl" + shaderFile = recalboxFiles.shaderPresetRoot + shaderMotor + '/' + self._shaderSet + '.cfg' shaderContent = keyValueSettings(shaderFile, False) shaderContent.loadFile(True) systemShader = shaderContent.getString(self._name, "") @@ -467,5 +473,5 @@ class Emulator: @property def JammaLayoutP2(self) -> JammaLayout: return JammaLayout.fromString(self._jammalayoutp2) - - + @property + def GlCore(self) -> bool: return self._glcore diff --git a/projects/configgen/configgen/emulatorlauncher.py b/projects/configgen/configgen/emulatorlauncher.py index 9be1933ab62d356c6723621b3890b61a7cdf244a..3f9ca022eaa15d2a869bd6529d18f40a6e9aadda 100644 --- a/projects/configgen/configgen/emulatorlauncher.py +++ b/projects/configgen/configgen/emulatorlauncher.py @@ -323,6 +323,7 @@ if __name__ == '__main__': parser.AddString(command="rom", chelp="rom absolute path", required=True) parser.AddString(command="emulator", chelp="force emulator", required=True) parser.AddString(command="core", chelp="force emulator core", required=True) + parser.AddString(command="glcore", chelp="force glcore", required=False) parser.AddString(command="ratio", chelp="force game ratio", required=False) parser.AddBool(command="demo", chelp="mode demo", required=False) parser.AddString(command="videobackend", chelp="video backend", required=False) diff --git a/projects/configgen/configgen/generators/libretro/crtswitchres/LibretroConfigCRTSwitchres.py b/projects/configgen/configgen/generators/libretro/crtswitchres/LibretroConfigCRTSwitchres.py index d1ea18622b7855843a06818fc543b163e7de4d4e..b0634513511450d033879a8f97ae37c1134b3ff7 100644 --- a/projects/configgen/configgen/generators/libretro/crtswitchres/LibretroConfigCRTSwitchres.py +++ b/projects/configgen/configgen/generators/libretro/crtswitchres/LibretroConfigCRTSwitchres.py @@ -16,15 +16,17 @@ class LibretroConfigCRTSwitchres: if (system.CRTScreenType == CRTScreenType.kHz31 and (system.CRTResolutionType == CRTResolutionType.Force480 or system.CRTResolutionType == CRTResolutionType.Auto)) \ or (system.CRTScreenType == CRTScreenType.kHzTriFreq or system.CRTScreenType == CRTScreenType.kHzMulti1531) and system.CRTResolutionType == CRTResolutionType.Force480: if (system.Rotation.isTate() and system.VerticalGame) or (not system.Rotation.isTate() and not system.VerticalGame): + config.update({"video_driver": '"gl"'}) config.update({"video_shader_enable": '"true"'}) config.update({"video_shader_dir": '"/recalbox/share/shaders/"'}) config.update({"video_shader": '/recalbox/share/shaders/rrgbd-scanlines-{}.glslp'.format(system.CRTScanlines)}) def manage_lightgun_luminosity(self, system: Emulator, config:typing.Dict[str, str]): if system.CRTScreenType != CRTScreenType.kHz31 and system.LighgunLuminosity > 0: - config.update({"video_shader_enable": '"true"'}) - config.update({"video_shader_dir": '"/recalbox/share/shaders/"'}) - config.update({"video_shader": '"/recalbox/share/shaders/lightguns-lumi-{}.glslp"'.format(system.LighgunLuminosity)}) + config.update({"video_driver": '"gl"'}) + config.update({"video_shader_enable": '"true"'}) + config.update({"video_shader_dir": '"/recalbox/share/shaders/"'}) + config.update({"video_shader": '"/recalbox/share/shaders/lightguns-lumi-{}.glslp"'.format(system.LighgunLuminosity)}) def createConfigFor(self, system: Emulator, rom: str) -> (typing.Dict[str, any], typing.Dict[str, any], [any], [any]): config: typing.Dict[str, any] = {"aspect_ratio_index": "22", @@ -60,7 +62,6 @@ class LibretroConfigCRTSwitchres: "video_smooth": '"false"', "video_allow_rotate": '"true"', "video_rotation": 0, - "video_driver": '"gl"', "video_scale_integer_overscale": '', "menu_enable_widgets": '"false"', "video_message_color": '"ffffff"', diff --git a/projects/configgen/configgen/generators/libretro/libretroGenerator.py b/projects/configgen/configgen/generators/libretro/libretroGenerator.py index 76c5963204d47488122f3a9434d750e26d1c13ba..b9aa257e57d321f9da633d95b164d2e5c45922d8 100644 --- a/projects/configgen/configgen/generators/libretro/libretroGenerator.py +++ b/projects/configgen/configgen/generators/libretro/libretroGenerator.py @@ -383,15 +383,15 @@ class LibretroGenerator(Generator): @staticmethod def createVideoDriverConfiguration(system: Emulator, retroarchConfig: keyValueSettings): + glCores = [] vulkanCores = ["flycast-next", "ppsspp"] naomi2OnPi5 = system.Name == "naomi2" and Architecture().isPi5 - if Vulkan.vulkanAvailable() and system.Core in vulkanCores and system.VulkanDriver and not naomi2OnPi5: + if system.Core in glCores or system.HasShaderFile: + retroarchConfig.setString("video_driver", "gl") + elif Vulkan.vulkanAvailable() and system.Core in vulkanCores and system.VulkanDriver and not naomi2OnPi5: retroarchConfig.setString("video_driver", "vulkan") else: - retroarchConfig.removeOption("video_driver") - if system.Core == "scummvm" and system.HasShaderFile: - retroarchConfig.setString("video_threaded", "false") - retroarchConfig.setString("video_shader_enable", system.HasShaderFile) + retroarchConfig.setString("video_driver", "glcore") retroarchConfig.saveFile() @staticmethod diff --git a/projects/frontend/es-app/src/emulators/EmulatorDescriptor.h b/projects/frontend/es-app/src/emulators/EmulatorDescriptor.h index 8768d7209113f9198cd3ff969b404c65c86f239f..eb3c874099bd58de1282e659f6a5241473c4cc72 100644 --- a/projects/frontend/es-app/src/emulators/EmulatorDescriptor.h +++ b/projects/frontend/es-app/src/emulators/EmulatorDescriptor.h @@ -44,6 +44,7 @@ class EmulatorDescriptor const String& speed, bool softpatching, bool crtAvailable, + bool glcoreAvailable, const String& flatBaseFile, const String& ignoreDrivers, const String& splitDrivers, @@ -62,6 +63,7 @@ class EmulatorDescriptor , mNetplay(netplay) , mSoftpatching(softpatching) , mCRTAvailable(crtAvailable) + , mGlcoreAvailable(glcoreAvailable) {} /* @@ -83,6 +85,7 @@ class EmulatorDescriptor [[nodiscard]] bool Netplay() const { return mNetplay; } //!< Netplay compatible? [[nodiscard]] bool Softpatching() const { return mSoftpatching; } //!< Softpathing compatible? [[nodiscard]] bool CRTAvailable() const { return mCRTAvailable; } //!< Available on CRT? + [[nodiscard]] bool GlcoreAvailable() const { return mGlcoreAvailable; } //!< Available on CRT? private: // Arcade properties @@ -100,6 +103,7 @@ class EmulatorDescriptor bool mNetplay; //!< Netplay compatible? bool mSoftpatching; //!< Softpathing compatible? bool mCRTAvailable; //!< Available on CRT? + bool mGlcoreAvailable; //!< Glcore Available? }; //! Default constructor @@ -173,13 +177,14 @@ class EmulatorDescriptor const String& speed, bool softpatching, bool crtAvailable, + bool glcoreAvailable, const String& flatBaseFile, const String& ignoreDrivers, const String& splitDrivers, int limit, const String& video_backend) { - mCores.push_back(CoreData(name, priority, extensions, netplay, compatibility, speed, softpatching, crtAvailable, flatBaseFile, ignoreDrivers, splitDrivers, limit, video_backend)); + mCores.push_back(CoreData(name, priority, extensions, netplay, compatibility, speed, softpatching, crtAvailable, glcoreAvailable flatBaseFile, ignoreDrivers, splitDrivers, limit, video_backend)); } //! Empty/null core diff --git a/projects/frontend/es-app/src/emulators/run/GameRunner.cpp b/projects/frontend/es-app/src/emulators/run/GameRunner.cpp index b56cbc7f49bf687d5983153c8ee0c57e7dc63285..f81aa7154e1bd434c3eca12a886470f93edb441a 100644 --- a/projects/frontend/es-app/src/emulators/run/GameRunner.cpp +++ b/projects/frontend/es-app/src/emulators/run/GameRunner.cpp @@ -125,6 +125,11 @@ String GameRunner::CreateCommandLine(const FileData& game, const EmulatorData& e if (debug) command.Append(" -verbose"); + + bool glcoreAvailable = emulator_descriptor.Core(coreIndex).GlcoreAvailable(); + if(emulator.Emulator() == "libretro") & (RecalboxConf::Instance().GetGlcoreAvailable()) + command.Append(" -glcore ").Append(glcoreAvailable); + command.Append(" -rotation ").Append((int)RotationManager::ShouldRotateGame(game)); if(RotationManager::ShouldRotateGameControls(game)) command.Append(" -rotatecontrols "); if(RotationManager::IsVerticalGame(game)) command.Append(" -verticalgame ");