diff --git a/retrodeck.sh b/retrodeck.sh
index daa5827a..6f695616 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -114,15 +114,16 @@ standalones_init() {
     echo "----------------------"
     echo "Initializing PCSX2"
     echo "----------------------"
-    mkdir -pv /var/config/PCSX2/inis/
+    mkdir -pv "/var/config/PCSX2/inis"
     mkdir -pv "$rdhome/saves/ps2/pcsx2/memcards"
+    mkdir -pv "$rdhome/states/ps2/pcsx2"
     cp -fvr $emuconfigs/PCSX2/* /var/config/PCSX2/inis/
     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini
     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2.ini
-    dir_prep "$rdhome/states/ps2/pcsx2" "/var/config/PCSX2/sstates"
-    dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps"
-    dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs"
-    dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2"
+    #dir_prep "$rdhome/states/ps2/pcsx2" "/var/config/PCSX2/sstates"
+    #dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps"
+    #dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs"
+    #dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2"
 
     # MelonDS
     echo "----------------------"
@@ -287,6 +288,10 @@ post_update() {
     # 0.4 -> 0.5
     # Perform save and state migration if needed
 
+    # Moving PCSX2 Saves
+    mv -fv /var/config/PCSX2/sstates/* $rdhome/states/ps2/pcsx2
+    mv -fv /var/config/PCSX2/memcards/* $rdhome/saves/ps2/memcards
+
     versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves
 
     if [[ $(sed -e "s/\.//g" <<< $hard_version) > $(sed -e "s/\.//g" <<< $versionwheresaveschanged) ]] && [[ ! $(sed -e "s/\.//g" <<< $hard_version) == $(sed -e "s/\.//g" <<< $version) ]]; then # Check if user is upgrading from the version where save organization was changed. Try not to reuse this, it things 0.4.5b is newer than 0.4.5