diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini
index ba358450..32b0c443 100644
--- a/emu-configs/PCSX2/PCSX2.ini
+++ b/emu-configs/PCSX2/PCSX2.ini
@@ -298,8 +298,8 @@ Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2
 [Folders]
 Bios = ~/retrodeck/bios
 Snapshots = ~/retrodeck/screenshots
-SaveStates = ~/retrodeck/states
-MemoryCards = ~/retrodeck/saves/ps2
+SaveStates = ~/retrodeck/states/ps2/pcsx2
+MemoryCards = ~/retrodeck/saves/ps2/pcsx2/memcards
 Logs = logs
 Cheats = cheats
 CheatsWS = cheats_ws
diff --git a/emu-configs/PCSX2/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini
index 72e94628..14214053 100644
--- a/emu-configs/PCSX2/PCSX2_ui.ini
+++ b/emu-configs/PCSX2/PCSX2_ui.ini
@@ -41,10 +41,10 @@ UseDefaultCheats=enabled
 UseDefaultCheatsWS=enabled
 UseDefaultTextures=enabled
 Bios=~/retrodeck/roms/bios
-Snapshots=/var/config/PCSX2/snaps
-Savestates=/var/config/PCSX2/sstates
-MemoryCards=/var/config/PCSX2/memcards
-Logs=/var/config/PCSX2/logs
+Snapshots=~/retrodeck/screenshots
+Savestates=~/retrodeck/states/ps2/pcsx2
+MemoryCards=~/retrodeck/saves/ps2/memcards
+Logs=~/retrodeck/.logs
 Langs=/app/share/PCSX2/resources/locale
 Cheats=/var/config/PCSX2/cheats
 CheatsWS=/var/config/PCSX2/cheats_ws
diff --git a/emu-configs/citra-qt-config.ini b/emu-configs/citra-qt-config.ini
index a6a37549..3cd0a0cb 100644
--- a/emu-configs/citra-qt-config.ini
+++ b/emu-configs/citra-qt-config.ini
@@ -106,9 +106,9 @@ use_cpu_jit=true
 use_cpu_jit\default=true
 
 [Data%20Storage]
-nand_directory=~/retrodeck/saves/Citra/nand/
+nand_directory=~/retrodeck/saves/n3ds/citra/nand/
 nand_directory\default=false
-sdmc_directory=~/retrodeck/saves/Citra/sdmc/
+sdmc_directory=~/retrodeck/saves/n3ds/citra/sdmc/
 sdmc_directory\default=false
 use_virtual_sd=true
 use_virtual_sd\default=true
diff --git a/emu-configs/dolphin/Dolphin.ini b/emu-configs/dolphin/Dolphin.ini
index 26926c3f..59737d0f 100644
--- a/emu-configs/dolphin/Dolphin.ini
+++ b/emu-configs/dolphin/Dolphin.ini
@@ -36,7 +36,7 @@ Threads = True
 ISOPath0 = ~/retrodeck/roms/wii
 ISOPath1 = ~/retrodeck/roms/gc
 ISOPaths = 2
-WiiSDCardPath = ~/retrodeck/saves/sd.raw
+WiiSDCardPath = ~/retrodeck/saves/wii/dolphin/sd.raw
 WirelessMac = 00:17:ab:83:9b:d4
 HotkeysRequireFocus = True
 RecursiveISOPaths = True
diff --git a/emu-configs/melonDS.ini b/emu-configs/melonDS.ini
index d64acf91..b1443132 100644
--- a/emu-configs/melonDS.ini
+++ b/emu-configs/melonDS.ini
@@ -123,8 +123,8 @@ RecentROM_6=
 RecentROM_7=
 RecentROM_8=
 RecentROM_9=
-SaveFilePath=~/retrodeck/saves
-SavestatePath=~/retrodeck/states
+SaveFilePath=~/retrodeck/saves/nds/melonds
+SavestatePath=~/retrodeck/states/nds/melonds
 CheatFilePath=
 EnableCheats=0
 MouseHide=0
diff --git a/emu-configs/xemu.toml b/emu-configs/xemu.toml
index 7e804f0e..1c119bd3 100644
--- a/emu-configs/xemu.toml
+++ b/emu-configs/xemu.toml
@@ -25,6 +25,6 @@ mem_limit = '128'
 [sys.files]
 bootrom_path = '/home/deck/retrodeck/bios/mcpx_1.0.bin'
 flashrom_path = '/home/deck/retrodeck/bios/Complex.bin'
-eeprom_path = '/home/deck/retrodeck/saves/xbox-eeprom.bin'
+eeprom_path = '/home/deck/retrodeck/saves/xbox/xemu/xbox-eeprom.bin'
 hdd_path = '/home/deck/retrodeck/bios/xbox_hdd.qcow2'