diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 41d81019e6..01648c433c 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -158,7 +158,7 @@ for f in *_${platform}.${EXT} ; do
    # Move executable files
    if [ $platform = "ps3" ] ; then
       if [ $PLATFORM = "ode-ps3" ] ; then
-         mv -f ../CORE.SELF ../${platform}/iso/PS3_GAME/USRDIR/cores/"${name}_libretro_${platform}.SELF"
+         mv -f ../CORE.SELF ../pkg/${platform}_iso/PS3_GAME/USRDIR/cores/"${name}_libretro_${platform}.SELF"
       else
          mv -f ../CORE.SELF ../pkg/${platform}/USRDIR/cores/"${name}_libretro_${platform}.SELF"
       fi
@@ -227,8 +227,8 @@ elif [ $PLATFORM = "cex-ps3" ] ; then
    rm -rf ../retroarch-salamander_${platform}.elf
    python2 ../ps3/ps3py/pkg.py --contentid UP0001-SSNE10000_00-0000000000000001 ../pkg/${platform} retroarch-${platform}-cfw-$RARCH_VERSION.pkg
 elif [ $PLATFORM = "ode-ps3" ] ; then
-   $SCETOOL_PATH $SCETOOL_FLAGS --encrypt ../retroarch-salamander_${platform}.elf ../${platform}/iso/PS3_GAME/USRDIR/EBOOT.BIN
+   $SCETOOL_PATH $SCETOOL_FLAGS --encrypt ../retroarch-salamander_${platform}.elf ../pkg/${platform}_iso/PS3_GAME/USRDIR/EBOOT.BIN
    rm -rf ../retroarch-salamander_${platform}.elf
 
-   $GENPS3ISO_PATH ../${platform}/iso RetroArch-COBRA-ODE.iso
+   $GENPS3ISO_PATH ../pkg/${platform}_iso/RetroArch-COBRA-ODE.iso
 fi
diff --git a/ps3/iso/PS3_DISC.SFB b/pkg/ps3_iso/PS3_DISC.SFB
similarity index 100%
rename from ps3/iso/PS3_DISC.SFB
rename to pkg/ps3_iso/PS3_DISC.SFB
diff --git a/ps3/iso/PS3_GAME/ICON0.PNG b/pkg/ps3_iso/PS3_GAME/ICON0.PNG
similarity index 100%
rename from ps3/iso/PS3_GAME/ICON0.PNG
rename to pkg/ps3_iso/PS3_GAME/ICON0.PNG
diff --git a/ps3/iso/PS3_GAME/PARAM.SFO b/pkg/ps3_iso/PS3_GAME/PARAM.SFO
similarity index 100%
rename from ps3/iso/PS3_GAME/PARAM.SFO
rename to pkg/ps3_iso/PS3_GAME/PARAM.SFO
diff --git a/ps3/iso/PS3_GAME/PS3LOGO.DAT b/pkg/ps3_iso/PS3_GAME/PS3LOGO.DAT
similarity index 100%
rename from ps3/iso/PS3_GAME/PS3LOGO.DAT
rename to pkg/ps3_iso/PS3_GAME/PS3LOGO.DAT
diff --git a/ps3/iso/PS3_GAME/USRDIR/.empty b/pkg/ps3_iso/PS3_GAME/USRDIR/.empty
similarity index 100%
rename from ps3/iso/PS3_GAME/USRDIR/.empty
rename to pkg/ps3_iso/PS3_GAME/USRDIR/.empty
diff --git a/ps3/iso/PS3_GAME/USRDIR/cores/.empty b/pkg/ps3_iso/PS3_GAME/USRDIR/cores/.empty
similarity index 100%
rename from ps3/iso/PS3_GAME/USRDIR/cores/.empty
rename to pkg/ps3_iso/PS3_GAME/USRDIR/cores/.empty
diff --git a/ps3/iso/PS3_GAME/USRDIR/cores/presets/.empty b/pkg/ps3_iso/PS3_GAME/USRDIR/cores/presets/.empty
similarity index 100%
rename from ps3/iso/PS3_GAME/USRDIR/cores/presets/.empty
rename to pkg/ps3_iso/PS3_GAME/USRDIR/cores/presets/.empty
diff --git a/ps3/iso/PS3_GAME/USRDIR/cores/savestates/.empty b/pkg/ps3_iso/PS3_GAME/USRDIR/cores/savestates/.empty
similarity index 100%
rename from ps3/iso/PS3_GAME/USRDIR/cores/savestates/.empty
rename to pkg/ps3_iso/PS3_GAME/USRDIR/cores/savestates/.empty
diff --git a/ps3/iso/PS3_GAME/USRDIR/cores/sram/.empty b/pkg/ps3_iso/PS3_GAME/USRDIR/cores/sram/.empty
similarity index 100%
rename from ps3/iso/PS3_GAME/USRDIR/cores/sram/.empty
rename to pkg/ps3_iso/PS3_GAME/USRDIR/cores/sram/.empty
diff --git a/ps3/iso/PS3_GAME/USRDIR/cores/system/.empty b/pkg/ps3_iso/PS3_GAME/USRDIR/cores/system/.empty
similarity index 100%
rename from ps3/iso/PS3_GAME/USRDIR/cores/system/.empty
rename to pkg/ps3_iso/PS3_GAME/USRDIR/cores/system/.empty
diff --git a/ps3/iso/PS3_UPDATE/PS3UPDAT.PUP b/pkg/ps3_iso/PS3_UPDATE/PS3UPDAT.PUP
similarity index 100%
rename from ps3/iso/PS3_UPDATE/PS3UPDAT.PUP
rename to pkg/ps3_iso/PS3_UPDATE/PS3UPDAT.PUP