diff --git a/emu-configs/retroarch-core-overrides/PPSSPP/PPSSPP.cfg b/emu-configs/retroarch/core-overrides/PPSSPP/PPSSPP.cfg
similarity index 100%
rename from emu-configs/retroarch-core-overrides/PPSSPP/PPSSPP.cfg
rename to emu-configs/retroarch/core-overrides/PPSSPP/PPSSPP.cfg
diff --git a/emu-configs/retroarch-core-options.cfg b/emu-configs/retroarch/retroarch-core-options.cfg
similarity index 100%
rename from emu-configs/retroarch-core-options.cfg
rename to emu-configs/retroarch/retroarch-core-options.cfg
diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch/retroarch.cfg
similarity index 100%
rename from emu-configs/retroarch.cfg
rename to emu-configs/retroarch/retroarch.cfg
diff --git a/functions.sh b/functions.sh
index ca70d297..c19d2e3e 100644
--- a/functions.sh
+++ b/functions.sh
@@ -799,9 +799,9 @@ ra_init() {
   dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders"
   mkdir -pv /var/config/retroarch/cores/
   cp -f /app/share/libretro/cores/* /var/config/retroarch/cores/
-  cp -fv $emuconfigs/retroarch.cfg /var/config/retroarch/
-  cp -fv $emuconfigs/retroarch-core-options.cfg /var/config/retroarch/
-  cp -rfv $emuconfigs/retroarch-core-overrides/* /var/config/retroarch/config
+  cp -fv $emuconfigs/retroarch/retroarch.cfg /var/config/retroarch/
+  cp -fv $emuconfigs/retroarch/retroarch-core-options.cfg /var/config/retroarch/
+  cp -rfv $emuconfigs/retroarch/core-overrides/* /var/config/retroarch/config
   #rm -rf $rdhome/bios/bios # in some situations a double bios symlink is created
   sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/retroarch/retroarch.cfg