diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 4dc484fcc6..0f10e57e95 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -134,32 +134,7 @@ if [ $SALAMANDER = "yes" ]; then
      vita-mksfoex -s TITLE_ID=RETROVITA "RetroArch" ../pkg/${platform}/retroarch.vpk/vpk/sce_sys/param.sfo
      cp ../pkg/${platform}/assets/ICON0.PNG ../pkg/${platform}/retroarch.vpk/vpk/sce_sys/icon0.png
      cp -R ../pkg/${platform}/assets/livearea ../pkg/${platform}/retroarch.vpk/vpk/sce_sys/
-     mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/assets
-      if [ -d ../media/assets/glui ]; then
-         cp -r ../media/assets/glui ../pkg/${platform}/retroarch.vpk/vpk/assets
-      fi
-      if [ -d ../media/assets/xmb ]; then
-         cp -r ../media/assets/xmb ../pkg/${platform}/retroarch.vpk/vpk/assets
-         # Strip source SVG files
-         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/flatui/src
-         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/monochrome/src
-         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/retroactive/src
-         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/retroactive_marked/src
-         rm -rf ../pkg/${platform}/retroarch.vpk/vpk/assets/xmb/dot-art/src
-      fi
-      if [ -d ../media/libretrodb/rdb ]; then
-         mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/rdb
-         cp -r ../media/libretrodb/rdb/* ../pkg/${platform}/retroarch.vpk/vpk/database/rdb
-      fi
-      if [ -d ../media/libretrodb/cursors ]; then
-         mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/cursors
-         cp -r ../media/libretrodb/cursors/* ../pkg/${platform}/retroarch.vpk/vpk/database/cursors
-      fi
-      if [ -d ../../dist/info ]; then
-         mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/info
-         cp -fv ../../dist/info/*.info ../pkg/${platform}/retroarch.vpk/vpk/info/
-      fi
-      make -C ../ -f Makefile.${platform}.salamander clean || exit 1
+     make -C ../ -f Makefile.${platform}.salamander clean || exit 1
    fi
    if [ $PLATFORM = "ctr" ] ; then
    mv -f ../retroarch_3ds_salamander.cia ../pkg/3ds/cia/retroarch_3ds.cia
@@ -260,17 +235,9 @@ for f in `ls -v *_${platform}.${EXT}`; do
       COUNTER=$((COUNTER + 1))
       COUNTER_ID=`printf  "%05d" ${COUNTER}`
       cp ../retroarch_${platform}.self ../pkg/${platform}/retroarch.vpk/vpk/${name}_libretro.self
-         if [ -d ../media/libretrodb/rdb ]; then
-            mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/rdb
-            cp -r ../media/libretrodb/rdb/* ../pkg/${platform}/${name}_libretro.vpk/vpk/database/rdb
-         fi
-         if [ -d ../media/libretrodb/cursors ]; then
-            mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/database/cursors
-            cp -r ../media/libretrodb/cursors/* ../pkg/${platform}/${name}_libretro.vpk/vpk/database/cursors
-         fi
          if [ -d ../../dist/info ]; then
             mkdir -p ../pkg/${platform}/retroarch.vpk/vpk/info
-            cp -fv ../../dist/info/"${name}_libretro.info" ../pkg/${platform}/${name}_libretro.vpk/vpk/info/"${name}_libretro.info"
+            cp -fv ../../dist/info/"${name}_libretro.info" ../pkg/${platform}/retroarch.vpk/vpk/info/"${name}_libretro.info"
          fi
    elif [ $PLATFORM = "ctr" ] ; then
       mv -f ../retroarch_3ds.cia ../pkg/3ds/cia/${name}_libretro.cia
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 0fc89fd463..6a08e8e1bb 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -115,15 +115,15 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    /* bundle data*/
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT],
          "", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], g_defaults.dirs[DEFAULT_DIR_PORT],
-         "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], g_defaults.dirs[DEFAULT_DIR_CORE],
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], g_defaults.dirs[DEFAULT_DIR_PORT],
          "info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], g_defaults.dirs[DEFAULT_DIR_PORT],
-         "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], g_defaults.dirs[DEFAULT_DIR_PORT],
-         "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    /* user data*/
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], user_path,
+         "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], user_path,
+         "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], user_path,
+         "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path,
          "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path,