diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 66deb6811..775fa1d99 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -33,10 +33,8 @@
             <!-- Portable installation -->
             <entry>%ESPATH%\Emulators\RetroArch-Win64\retroarch.exe</entry>
             <entry>%ESPATH%\Emulators\RetroArch\retroarch.exe</entry>
-            <entry>%ESPATH%\RetroArch-Win64\retroarch.exe</entry>
-            <entry>%ESPATH%\RetroArch\retroarch.exe</entry>
-            <entry>%ESPATH%\..\RetroArch-Win64\retroarch.exe</entry>
-            <entry>%ESPATH%\..\RetroArch\retroarch.exe</entry>
+            <entry>%ESPATH%\..\Emulators\RetroArch-Win64\retroarch.exe</entry>
+            <entry>%ESPATH%\..\Emulators\RetroArch\retroarch.exe</entry>
         </rule>
     </emulator>
     <core name="RETROARCH">
@@ -51,8 +49,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\AppleWin\AppleWin.exe</entry>
-            <entry>%ESPATH%\AppleWin\AppleWin.exe</entry>
-            <entry>%ESPATH%\..\AppleWin\AppleWin.exe</entry>
+            <entry>%ESPATH%\..\Emulators\AppleWin\AppleWin.exe</entry>
         </rule>
     </emulator>
     <emulator name="ARCADEFLASHWEB">
@@ -62,8 +59,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
-            <entry>%ESPATH%\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
-            <entry>%ESPATH%\..\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
         </rule>
     </emulator>
     <emulator name="ARES">
@@ -73,8 +69,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ares\ares.exe</entry>
-            <entry>%ESPATH%\ares\ares.exe</entry>
-            <entry>%ESPATH%\..\ares\ares.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ares\ares.exe</entry>
         </rule>
     </emulator>
     <emulator name="ATARI800">
@@ -84,8 +79,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\atari800\atari800.exe</entry>
-            <entry>%ESPATH%\atari800\atari800.exe</entry>
-            <entry>%ESPATH%\..\atari800\atari800.exe</entry>
+            <entry>%ESPATH%\..\Emulators\atari800\atari800.exe</entry>
         </rule>
     </emulator>
     <emulator name="BASILISKII">
@@ -95,8 +89,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\BasiliskII\BasiliskII.exe</entry>
-            <entry>%ESPATH%\BasiliskII\BasiliskII.exe</entry>
-            <entry>%ESPATH%\..\BasiliskII\BasiliskII.exe</entry>
+            <entry>%ESPATH%\..\Emulators\BasiliskII\BasiliskII.exe</entry>
         </rule>
     </emulator>
     <emulator name="BIGPEMU">
@@ -106,8 +99,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\BigPEmu\BigPEmu.exe</entry>
-            <entry>%ESPATH%\BigPEmu\BigPEmu.exe</entry>
-            <entry>%ESPATH%\..\BigPEmu\BigPEmu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\BigPEmu\BigPEmu.exe</entry>
         </rule>
     </emulator>
     <emulator name="BSNES">
@@ -117,8 +109,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\bsnes\bsnes.exe</entry>
-            <entry>%ESPATH%\bsnes\bsnes.exe</entry>
-            <entry>%ESPATH%\..\bsnes\bsnes.exe</entry>
+            <entry>%ESPATH%\..\Emulators\bsnes\bsnes.exe</entry>
         </rule>
     </emulator>
     <emulator name="CEMU">
@@ -128,8 +119,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\cemu\Cemu.exe</entry>
-            <entry>%ESPATH%\cemu\Cemu.exe</entry>
-            <entry>%ESPATH%\..\cemu\Cemu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\cemu\Cemu.exe</entry>
         </rule>
     </emulator>
     <emulator name="CITRA">
@@ -142,10 +132,8 @@
             <entry>~\AppData\Local\Citra\canary-mingw\citra-qt.exe</entry>
             <entry>%ESPATH%\Emulators\Citra\nightly-mingw\citra-qt.exe</entry>
             <entry>%ESPATH%\Emulators\Citra\canary-mingw\citra-qt.exe</entry>
-            <entry>%ESPATH%\Citra\nightly-mingw\citra-qt.exe</entry>
-            <entry>%ESPATH%\Citra\canary-mingw\citra-qt.exe</entry>
-            <entry>%ESPATH%\..\Citra\nightly-mingw\citra-qt.exe</entry>
-            <entry>%ESPATH%\..\Citra\canary-mingw\citra-qt.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Citra\nightly-mingw\citra-qt.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Citra\canary-mingw\citra-qt.exe</entry>
         </rule>
     </emulator>
     <emulator name="CPCEMU">
@@ -158,8 +146,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\cpcemu\cpcemu.exe</entry>
-            <entry>%ESPATH%\cpcemu\cpcemu.exe</entry>
-            <entry>%ESPATH%\..\cpcemu\cpcemu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\cpcemu\cpcemu.exe</entry>
         </rule>
     </emulator>
     <emulator name="CSPECT">
@@ -169,8 +156,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\CSpect\CSpect.exe</entry>
-            <entry>%ESPATH%\CSpect\CSpect.exe</entry>
-            <entry>%ESPATH%\..\CSpect\CSpect.exe</entry>
+            <entry>%ESPATH%\..\Emulators\CSpect\CSpect.exe</entry>
         </rule>
     </emulator>
     <emulator name="CXBX-RELOADED">
@@ -180,8 +166,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Cxbx-Reloaded\cxbx.exe</entry>
-            <entry>%ESPATH%\Cxbx-Reloaded\cxbx.exe</entry>
-            <entry>%ESPATH%\..\Cxbx-Reloaded\cxbx.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Cxbx-Reloaded\cxbx.exe</entry>
         </rule>
     </emulator>
     <emulator name="DOLPHIN">
@@ -191,8 +176,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Dolphin-x64\Dolphin.exe</entry>
-            <entry>%ESPATH%\Dolphin-x64\Dolphin.exe</entry>
-            <entry>%ESPATH%\..\Dolphin-x64\Dolphin.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Dolphin-x64\Dolphin.exe</entry>
         </rule>
     </emulator>
     <emulator name="DOSBOX-STAGING">
@@ -202,8 +186,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\dosbox-staging\dosbox.exe</entry>
-            <entry>%ESPATH%\dosbox-staging\dosbox.exe</entry>
-            <entry>%ESPATH%\..\dosbox-staging\dosbox.exe</entry>
+            <entry>%ESPATH%\..\Emulators\dosbox-staging\dosbox.exe</entry>
         </rule>
     </emulator>
     <emulator name="DOSBOX-X">
@@ -216,8 +199,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\DOSBox-X\dosbox-x.exe</entry>
-            <entry>%ESPATH%\DOSBox-X\dosbox-x.exe</entry>
-            <entry>%ESPATH%\..\DOSBox-X\dosbox-x.exe</entry>
+            <entry>%ESPATH%\..\Emulators\DOSBox-X\dosbox-x.exe</entry>
         </rule>
     </emulator>
     <emulator name="DUCKSTATION">
@@ -229,10 +211,8 @@
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
             <entry>%ESPATH%\Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
-            <entry>%ESPATH%\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
-            <entry>%ESPATH%\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
-            <entry>%ESPATH%\..\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
-            <entry>%ESPATH%\..\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
+            <entry>%ESPATH%\..\Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
+            <entry>%ESPATH%\..\Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
         </rule>
     </emulator>
     <emulator name="EASYRPG">
@@ -242,8 +222,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\EasyRPG\Player.exe</entry>
-            <entry>%ESPATH%\EasyRPG\Player.exe</entry>
-            <entry>%ESPATH%\..\EasyRPG\Player.exe</entry>
+            <entry>%ESPATH%\..\Emulators\EasyRPG\Player.exe</entry>
         </rule>
     </emulator>
     <emulator name="FINALBURN-NEO">
@@ -254,11 +233,9 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\fbneo\fbneo64.exe</entry>
-            <entry>%ESPATH%\fbneo\fbneo64.exe</entry>
-            <entry>%ESPATH%\..\fbneo\fbneo64.exe</entry>
             <entry>%ESPATH%\Emulators\fbneo\fbneo.exe</entry>
-            <entry>%ESPATH%\fbneo\fbneo.exe</entry>
-            <entry>%ESPATH%\..\fbneo\fbneo.exe</entry>
+            <entry>%ESPATH%\..\Emulators\fbneo\fbneo64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\fbneo\fbneo.exe</entry>
         </rule>
     </emulator>
     <emulator name="FLYCAST">
@@ -268,8 +245,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\flycast\flycast.exe</entry>
-            <entry>%ESPATH%\flycast\flycast.exe</entry>
-            <entry>%ESPATH%\..\flycast\flycast.exe</entry>
+            <entry>%ESPATH%\..\Emulators\flycast\flycast.exe</entry>
         </rule>
     </emulator>
     <emulator name="FS-UAE">
@@ -279,8 +255,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
-            <entry>%ESPATH%\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
-            <entry>%ESPATH%\..\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
+            <entry>%ESPATH%\..\Emulators\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
         </rule>
     </emulator>
     <emulator name="FUSE">
@@ -290,8 +265,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Fuse\fuse.exe</entry>
-            <entry>%ESPATH%\Fuse\fuse.exe</entry>
-            <entry>%ESPATH%\..\Fuse\fuse.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Fuse\fuse.exe</entry>
         </rule>
     </emulator>
     <emulator name="GARGOYLE">
@@ -301,8 +275,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\gargoyle\gargoyle.exe</entry>
-            <entry>%ESPATH%\gargoyle\gargoyle.exe</entry>
-            <entry>%ESPATH%\..\gargoyle\gargoyle.exe</entry>
+            <entry>%ESPATH%\..\Emulators\gargoyle\gargoyle.exe</entry>
         </rule>
     </emulator>
     <emulator name="GEARBOY">
@@ -312,8 +285,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Gearboy\Gearboy.exe</entry>
-            <entry>%ESPATH%\Gearboy\Gearboy.exe</entry>
-            <entry>%ESPATH%\..\Gearboy\Gearboy.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Gearboy\Gearboy.exe</entry>
         </rule>
     </emulator>
     <emulator name="GOPHER2600">
@@ -323,8 +295,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\gopher2600\gopher2600_windows_amd64.exe</entry>
-            <entry>%ESPATH%\gopher2600\gopher2600_windows_amd64.exe</entry>
-            <entry>%ESPATH%\..\gopher2600\gopher2600_windows_amd64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\gopher2600\gopher2600_windows_amd64.exe</entry>
         </rule>
     </emulator>
     <emulator name="HATARI">
@@ -334,8 +305,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\hatari\hatari.exe</entry>
-            <entry>%ESPATH%\hatari\hatari.exe</entry>
-            <entry>%ESPATH%\..\hatari\hatari.exe</entry>
+            <entry>%ESPATH%\..\Emulators\hatari\hatari.exe</entry>
         </rule>
     </emulator>
     <emulator name="HYPSEUS-SINGE">
@@ -345,8 +315,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Hypseus Singe\hypseus.exe</entry>
-            <entry>%ESPATH%\Hypseus Singe\hypseus.exe</entry>
-            <entry>%ESPATH%\..\Hypseus Singe\hypseus.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Hypseus Singe\hypseus.exe</entry>
         </rule>
     </emulator>
     <emulator name="KEMULATOR">
@@ -356,8 +325,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\KEmulator\KEmulator.exe</entry>
-            <entry>%ESPATH%\KEmulator\KEmulator.exe</entry>
-            <entry>%ESPATH%\..\KEmulator\KEmulator.exe</entry>
+            <entry>%ESPATH%\..\Emulators\KEmulator\KEmulator.exe</entry>
         </rule>
     </emulator>
     <emulator name="M2EMULATOR">
@@ -367,8 +335,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\m2emulator\EMULATOR.EXE</entry>
-            <entry>%ESPATH%\m2emulator\EMULATOR.EXE</entry>
-            <entry>%ESPATH%\..\m2emulator\EMULATOR.EXE</entry>
+            <entry>%ESPATH%\..\Emulators\m2emulator\EMULATOR.EXE</entry>
         </rule>
     </emulator>
     <emulator name="MAME">
@@ -378,8 +345,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\mame\mame.exe</entry>
-            <entry>%ESPATH%\mame\mame.exe</entry>
-            <entry>%ESPATH%\..\mame\mame.exe</entry>
+            <entry>%ESPATH%\..\Emulators\mame\mame.exe</entry>
         </rule>
     </emulator>
     <emulator name="MEDNAFEN">
@@ -389,8 +355,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\mednafen\mednafen.exe</entry>
-            <entry>%ESPATH%\mednafen\mednafen.exe</entry>
-            <entry>%ESPATH%\..\mednafen\mednafen.exe</entry>
+            <entry>%ESPATH%\..\Emulators\mednafen\mednafen.exe</entry>
         </rule>
     </emulator>
     <emulator name="MELONDS">
@@ -400,8 +365,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\melonDS\melonDS.exe</entry>
-            <entry>%ESPATH%\melonDS\melonDS.exe</entry>
-            <entry>%ESPATH%\..\melonDS\melonDS.exe</entry>
+            <entry>%ESPATH%\..\Emulators\melonDS\melonDS.exe</entry>
         </rule>
     </emulator>
     <emulator name="MGBA">
@@ -416,8 +380,7 @@
             <entry>C:\Program Files\mGBA\mGBA.exe</entry>
             <entry>D:\Program Files\mGBA\mGBA.exe</entry>
             <entry>%ESPATH%\Emulators\mGBA\mGBA.exe</entry>
-            <entry>%ESPATH%\mGBA\mGBA.exe</entry>
-            <entry>%ESPATH%\..\mGBA\mGBA.exe</entry>
+            <entry>%ESPATH%\..\Emulators\mGBA\mGBA.exe</entry>
         </rule>
     </emulator>
     <emulator name="MUPEN64PLUS">
@@ -427,8 +390,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\mupen64plus\mupen64plus-ui-console.exe</entry>
-            <entry>%ESPATH%\mupen64plus\mupen64plus-ui-console.exe</entry>
-            <entry>%ESPATH%\..\mupen64plus\mupen64plus-ui-console.exe</entry>
+            <entry>%ESPATH%\..\Emulators\mupen64plus\mupen64plus-ui-console.exe</entry>
         </rule>
     </emulator>
     <emulator name="OPENMSX">
@@ -438,8 +400,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\openMSX\openmsx.exe</entry>
-            <entry>%ESPATH%\openMSX\openmsx.exe</entry>
-            <entry>%ESPATH%\..\openMSX\openmsx.exe</entry>
+            <entry>%ESPATH%\..\Emulators\openMSX\openmsx.exe</entry>
         </rule>
     </emulator>
     <emulator name="ORICUTRON">
@@ -449,8 +410,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Oricutron\oricutron.exe</entry>
-            <entry>%ESPATH%\Oricutron\oricutron.exe</entry>
-            <entry>%ESPATH%\..\Oricutron\oricutron.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Oricutron\oricutron.exe</entry>
         </rule>
     </emulator>
     <emulator name="PCSX2">
@@ -462,8 +422,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qt*.exe</entry>
-            <entry>%ESPATH%\PCSX2-Qt\pcsx2-qt*.exe</entry>
-            <entry>%ESPATH%\..\PCSX2-Qt\pcsx2-qt*.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PCSX2-Qt\pcsx2-qt*.exe</entry>
         </rule>
     </emulator>
     <emulator name="PCSX2-LEGACY">
@@ -478,8 +437,7 @@
             <entry>C:\Program Files (x86)\PCSX2\pcsx2.exe</entry>
             <entry>D:\Program Files (x86)\PCSX2\pcsx2.exe</entry>
             <entry>%ESPATH%\Emulators\PCSX2\pcsx2.exe</entry>
-            <entry>%ESPATH%\PCSX2\pcsx2.exe</entry>
-            <entry>%ESPATH%\..\PCSX2\pcsx2.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PCSX2\pcsx2.exe</entry>
         </rule>
     </emulator>
     <emulator name="PICO-8">
@@ -491,8 +449,7 @@
             <entry>C:\Program Files (x86)\PICO-8\pico8.exe</entry>
             <entry>D:\Program Files (x86)\PICO-8\pico8.exe</entry>
             <entry>%ESPATH%\Emulators\PICO-8\pico8.exe</entry>
-            <entry>%ESPATH%\PICO-8\pico8.exe</entry>
-            <entry>%ESPATH%\..\PICO-8\pico8.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PICO-8\pico8.exe</entry>
         </rule>
     </emulator>
     <emulator name="PLAY!">
@@ -504,8 +461,7 @@
             <entry>C:\Program Files\Play\Play.exe</entry>
             <entry>D:\Program Files\Play\Play.exe</entry>
             <entry>%ESPATH%\Emulators\Play\Play.exe</entry>
-            <entry>%ESPATH%\Play\Play.exe</entry>
-            <entry>%ESPATH%\..\Play\Play.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Play\Play.exe</entry>
         </rule>
     </emulator>
     <emulator name="PPSSPP">
@@ -520,8 +476,7 @@
             <entry>C:\Program Files\PPSSPP\PPSSPPWindows64.exe</entry>
             <entry>D:\Program Files\PPSSPP\PPSSPPWindows64.exe</entry>
             <entry>%ESPATH%\Emulators\PPSSPP\PPSSPPWindows64.exe</entry>
-            <entry>%ESPATH%\PPSSPP\PPSSPPWindows64.exe</entry>
-            <entry>%ESPATH%\..\PPSSPP\PPSSPPWindows64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PPSSPP\PPSSPPWindows64.exe</entry>
         </rule>
     </emulator>
     <emulator name="PRBOOM-PLUS">
@@ -531,8 +486,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\prboom-plus\prboom-plus.exe</entry>
-            <entry>%ESPATH%\prboom-plus\prboom-plus.exe</entry>
-            <entry>%ESPATH%\..\prboom-plus\prboom-plus.exe</entry>
+            <entry>%ESPATH%\..\Emulators\prboom-plus\prboom-plus.exe</entry>
         </rule>
     </emulator>
     <emulator name="PRIMEHACK">
@@ -543,8 +497,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\PrimeHack\Dolphin.exe</entry>
-            <entry>%ESPATH%\PrimeHack\Dolphin.exe</entry>
-            <entry>%ESPATH%\..\PrimeHack\Dolphin.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PrimeHack\Dolphin.exe</entry>
         </rule>
     </emulator>
     <emulator name="PROJECT64">
@@ -554,8 +507,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Project64\Project64.exe</entry>
-            <entry>%ESPATH%\Project64\Project64.exe</entry>
-            <entry>%ESPATH%\..\Project64\Project64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Project64\Project64.exe</entry>
         </rule>
     </emulator>
     <emulator name="PUNES">
@@ -565,8 +517,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\punes\punes64.exe</entry>
-            <entry>%ESPATH%\punes\punes64.exe</entry>
-            <entry>%ESPATH%\..\punes\punes64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\punes\punes64.exe</entry>
         </rule>
     </emulator>
     <emulator name="REDREAM">
@@ -576,8 +527,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\redream\redream.exe</entry>
-            <entry>%ESPATH%\redream\redream.exe</entry>
-            <entry>%ESPATH%\..\redream\redream.exe</entry>
+            <entry>%ESPATH%\..\Emulators\redream\redream.exe</entry>
         </rule>
     </emulator>
     <emulator name="ROSALIES-MUPEN-GUI">
@@ -588,8 +538,7 @@
         <rule type="staticpath">
             <entry>~\AppData\Local\Programs\Rosalie's Mupen GUI\RMG.exe</entry>
             <entry>%ESPATH%\Emulators\RMG\RMG.exe</entry>
-            <entry>%ESPATH%\RMG\RMG.exe</entry>
-            <entry>%ESPATH%\..\RMG\RMG.exe</entry>
+            <entry>%ESPATH%\..\Emulators\RMG\RMG.exe</entry>
         </rule>
     </emulator>
     <emulator name="RPCS3">
@@ -599,8 +548,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\RPCS3\rpcs3.exe</entry>
-            <entry>%ESPATH%\RPCS3\rpcs3.exe</entry>
-            <entry>%ESPATH%\..\RPCS3\rpcs3.exe</entry>
+            <entry>%ESPATH%\..\Emulators\RPCS3\rpcs3.exe</entry>
         </rule>
     </emulator>
     <emulator name="RUFFLE">
@@ -610,8 +558,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ruffle\ruffle.exe</entry>
-            <entry>%ESPATH%\ruffle\ruffle.exe</entry>
-            <entry>%ESPATH%\..\ruffle\ruffle.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ruffle\ruffle.exe</entry>
         </rule>
     </emulator>
     <emulator name="RYUJINX">
@@ -622,11 +569,9 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ryujinx\Ryujinx.exe</entry>
-            <entry>%ESPATH%\ryujinx\Ryujinx.exe</entry>
-            <entry>%ESPATH%\..\ryujinx\Ryujinx.exe</entry>
             <entry>%ESPATH%\Emulators\ryujinx\Ryujinx.Ava.exe</entry>
-            <entry>%ESPATH%\ryujinx\Ryujinx.Ava.exe</entry>
-            <entry>%ESPATH%\..\ryujinx\Ryujinx.Ava.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ryujinx\Ryujinx.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ryujinx\Ryujinx.Ava.exe</entry>
         </rule>
     </emulator>
     <emulator name="SAMEBOY">
@@ -636,8 +581,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\sameboy\sameboy.exe</entry>
-            <entry>%ESPATH%\sameboy\sameboy.exe</entry>
-            <entry>%ESPATH%\..\sameboy\sameboy.exe</entry>
+            <entry>%ESPATH%\..\Emulators\sameboy\sameboy.exe</entry>
         </rule>
     </emulator>
     <emulator name="SCUMMVM">
@@ -650,8 +594,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\scummvm\scummvm.exe</entry>
-            <entry>%ESPATH%\scummvm\scummvm.exe</entry>
-            <entry>%ESPATH%\..\scummvm\scummvm.exe</entry>
+            <entry>%ESPATH%\..\Emulators\scummvm\scummvm.exe</entry>
         </rule>
     </emulator>
     <emulator name="SDL2TRS">
@@ -661,8 +604,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\sdl2trs\sdl2trs64.exe</entry>
-            <entry>%ESPATH%\sdl2trs\sdl2trs64.exe</entry>
-            <entry>%ESPATH%\..\sdl2trs\sdl2trs64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\sdl2trs\sdl2trs64.exe</entry>
         </rule>
     </emulator>
     <emulator name="SHEEPSHAVER">
@@ -672,8 +614,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\SheepShaver\SheepShaver.exe</entry>
-            <entry>%ESPATH%\SheepShaver\SheepShaver.exe</entry>
-            <entry>%ESPATH%\..\SheepShaver\SheepShaver.exe</entry>
+            <entry>%ESPATH%\..\Emulators\SheepShaver\SheepShaver.exe</entry>
         </rule>
     </emulator>
     <emulator name="SIMCOUPE">
@@ -686,8 +627,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\SimCoupe\SimCoupe.exe</entry>
-            <entry>%ESPATH%\SimCoupe\SimCoupe.exe</entry>
-            <entry>%ESPATH%\..\SimCoupe\SimCoupe.exe</entry>
+            <entry>%ESPATH%\..\Emulators\SimCoupe\SimCoupe.exe</entry>
         </rule>
     </emulator>
     <emulator name="SIMPLE64">
@@ -697,8 +637,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\simple64\simple64-gui.exe</entry>
-            <entry>%ESPATH%\simple64\simple64-gui.exe</entry>
-            <entry>%ESPATH%\..\simple64\simple64-gui.exe</entry>
+            <entry>%ESPATH%\..\Emulators\simple64\simple64-gui.exe</entry>
         </rule>
     </emulator>
     <emulator name="SNES9X">
@@ -708,8 +647,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\snes9x\snes9x-x64.exe</entry>
-            <entry>%ESPATH%\snes9x\snes9x-x64.exe</entry>
-            <entry>%ESPATH%\..\snes9x\snes9x-x64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\snes9x\snes9x-x64.exe</entry>
         </rule>
     </emulator>
     <emulator name="SOLARUS">
@@ -719,8 +657,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\solarus\solarus-run.exe</entry>
-            <entry>%ESPATH%\solarus\solarus-run.exe</entry>
-            <entry>%ESPATH%\..\solarus\solarus-run.exe</entry>
+            <entry>%ESPATH%\..\Emulators\solarus\solarus-run.exe</entry>
         </rule>
     </emulator>
     <emulator name="SSF">
@@ -730,8 +667,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\SSF\SSF.exe</entry>
-            <entry>%ESPATH%\SSF\SSF.exe</entry>
-            <entry>%ESPATH%\..\SSF\SSF.exe</entry>
+            <entry>%ESPATH%\..\Emulators\SSF\SSF.exe</entry>
         </rule>
     </emulator>
     <emulator name="STEAM">
@@ -754,8 +690,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Stella\64-bit\Stella.exe</entry>
-            <entry>%ESPATH%\Stella\64-bit\Stella.exe</entry>
-            <entry>%ESPATH%\..\Stella\64-bit\Stella.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Stella\64-bit\Stella.exe</entry>
         </rule>
     </emulator>
     <emulator name="SUPERMODEL">
@@ -765,8 +700,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Supermodel\Supermodel.exe</entry>
-            <entry>%ESPATH%\Supermodel\Supermodel.exe</entry>
-            <entry>%ESPATH%\..\Supermodel\Supermodel.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Supermodel\Supermodel.exe</entry>
         </rule>
     </emulator>
     <emulator name="TRIFORCE">
@@ -776,8 +710,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Triforce\DolphinWX.exe</entry>
-            <entry>%ESPATH%\Triforce\DolphinWX.exe</entry>
-            <entry>%ESPATH%\..\Triforce\DolphinWX.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Triforce\DolphinWX.exe</entry>
         </rule>
     </emulator>
     <emulator name="TSUGARU">
@@ -787,8 +720,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\tsugaru\Tsugaru_CUI.exe</entry>
-            <entry>%ESPATH%\tsugaru\Tsugaru_CUI.exe</entry>
-            <entry>%ESPATH%\..\tsugaru\Tsugaru_CUI.exe</entry>
+            <entry>%ESPATH%\..\Emulators\tsugaru\Tsugaru_CUI.exe</entry>
         </rule>
     </emulator>
     <emulator name="VBA-M">
@@ -798,8 +730,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\VBA-M\visualboyadvance-m.exe</entry>
-            <entry>%ESPATH%\VBA-M\visualboyadvance-m.exe</entry>
-            <entry>%ESPATH%\..\VBA-M\visualboyadvance-m.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VBA-M\visualboyadvance-m.exe</entry>
         </rule>
     </emulator>
     <emulator name="VICE-X64SC">
@@ -809,11 +740,9 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\VICE\x64sc.exe</entry>
-            <entry>%ESPATH%\VICE\x64sc.exe</entry>
-            <entry>%ESPATH%\..\VICE\x64sc.exe</entry>
             <entry>%ESPATH%\Emulators\VICE\bin\x64sc.exe</entry>
-            <entry>%ESPATH%\VICE\bin\x64sc.exe</entry>
-            <entry>%ESPATH%\..\VICE\bin\x64sc.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\x64sc.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\bin\x64sc.exe</entry>
         </rule>
     </emulator>
     <emulator name="VICE-XVIC">
@@ -823,11 +752,9 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\VICE\xvic.exe</entry>
-            <entry>%ESPATH%\VICE\xvic.exe</entry>
-            <entry>%ESPATH%\..\VICE\xvic.exe</entry>
             <entry>%ESPATH%\Emulators\VICE\bin\xvic.exe</entry>
-            <entry>%ESPATH%\VICE\bin\xvic.exe</entry>
-            <entry>%ESPATH%\..\VICE\bin\xvic.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\xvic.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\bin\xvic.exe</entry>
         </rule>
     </emulator>
     <emulator name="VITA3K">
@@ -837,8 +764,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Vita3K\Vita3K.exe</entry>
-            <entry>%ESPATH%\Vita3K\Vita3K.exe</entry>
-            <entry>%ESPATH%\..\Vita3K\Vita3K.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Vita3K\Vita3K.exe</entry>
         </rule>
     </emulator>
     <emulator name="XEMU">
@@ -848,8 +774,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\xemu\xemu.exe</entry>
-            <entry>%ESPATH%\xemu\xemu.exe</entry>
-            <entry>%ESPATH%\..\xemu\xemu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\xemu\xemu.exe</entry>
         </rule>
     </emulator>
     <emulator name="XENIA">
@@ -859,8 +784,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\xenia\xenia.exe</entry>
-            <entry>%ESPATH%\xenia\xenia.exe</entry>
-            <entry>%ESPATH%\..\xenia\xenia.exe</entry>
+            <entry>%ESPATH%\..\Emulators\xenia\xenia.exe</entry>
         </rule>
     </emulator>
     <emulator name="XROAR">
@@ -870,8 +794,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\xroar\xroar.exe</entry>
-            <entry>%ESPATH%\xroar\xroar.exe</entry>
-            <entry>%ESPATH%\..\xroar\xroar.exe</entry>
+            <entry>%ESPATH%\..\Emulators\xroar\xroar.exe</entry>
         </rule>
     </emulator>
     <emulator name="YUZU">
@@ -882,8 +805,7 @@
         <rule type="staticpath">
             <entry>~\AppData\Local\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
             <entry>%ESPATH%\Emulators\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
-            <entry>%ESPATH%\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
-            <entry>%ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
         </rule>
     </emulator>
     <emulator name="ZESARUX">
@@ -893,8 +815,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ZEsarUX\zesarux.exe</entry>
-            <entry>%ESPATH%\ZEsarUX\zesarux.exe</entry>
-            <entry>%ESPATH%\..\ZEsarUX\zesarux.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ZEsarUX\zesarux.exe</entry>
         </rule>
     </emulator>
 </ruleList>
\ No newline at end of file
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index b6b8dcafd..bd7690e77 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -12,10 +12,8 @@
             <!-- Portable installation -->
             <entry>%ESPATH%\Emulators\RetroArch-Win64\retroarch.exe</entry>
             <entry>%ESPATH%\Emulators\RetroArch\retroarch.exe</entry>
-            <entry>%ESPATH%\RetroArch-Win64\retroarch.exe</entry>
-            <entry>%ESPATH%\RetroArch\retroarch.exe</entry>
-            <entry>%ESPATH%\..\RetroArch-Win64\retroarch.exe</entry>
-            <entry>%ESPATH%\..\RetroArch\retroarch.exe</entry>
+            <entry>%ESPATH%\..\Emulators\RetroArch-Win64\retroarch.exe</entry>
+            <entry>%ESPATH%\..\Emulators\RetroArch\retroarch.exe</entry>
         </rule>
     </emulator>
     <core name="RETROARCH">
@@ -27,64 +25,56 @@
         <!-- Apple II emulator AppleWin -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\AppleWin\AppleWin.exe</entry>
-            <entry>%ESPATH%\AppleWin\AppleWin.exe</entry>
-            <entry>%ESPATH%\..\AppleWin\AppleWin.exe</entry>
+            <entry>%ESPATH%\..\Emulators\AppleWin\AppleWin.exe</entry>
         </rule>
     </emulator>
     <emulator name="ARCADEFLASHWEB">
         <!-- Adobe Flash player ArcadeFlashWeb -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
-            <entry>%ESPATH%\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
-            <entry>%ESPATH%\..\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
         </rule>
     </emulator>
     <emulator name="ARES">
         <!-- Multi-system emulator ares -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ares\ares.exe</entry>
-            <entry>%ESPATH%\ares\ares.exe</entry>
-            <entry>%ESPATH%\..\ares\ares.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ares\ares.exe</entry>
         </rule>
     </emulator>
     <emulator name="ATARI800">
         <!-- Atari 8-bit computer emulator Atari800 -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\atari800\atari800.exe</entry>
-            <entry>%ESPATH%\atari800\atari800.exe</entry>
-            <entry>%ESPATH%\..\atari800\atari800.exe</entry>
+            <entry>%ESPATH%\..\Emulators\atari800\atari800.exe</entry>
         </rule>
     </emulator>
     <emulator name="BASILISKII">
         <!-- Macintosh 68k emulator Basilisk II -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\BasiliskII\BasiliskII.exe</entry>
-            <entry>%ESPATH%\BasiliskII\BasiliskII.exe</entry>
-            <entry>%ESPATH%\..\BasiliskII\BasiliskII.exe</entry>
+            <entry>%ESPATH%\..\Emulators\BasiliskII\BasiliskII.exe</entry>
         </rule>
     </emulator>
     <emulator name="BIGPEMU">
         <!-- Atari Jaguar emulator BigPEmu -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\BigPEmu\BigPEmu.exe</entry>
-            <entry>%ESPATH%\BigPEmu\BigPEmu.exe</entry>
-            <entry>%ESPATH%\..\BigPEmu\BigPEmu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\BigPEmu\BigPEmu.exe</entry>
         </rule>
     </emulator>
     <emulator name="BSNES">
         <!-- Super Nintendo/Super Famicom emulator bsnes -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\bsnes\bsnes.exe</entry>
-            <entry>%ESPATH%\bsnes\bsnes.exe</entry>
-            <entry>%ESPATH%\..\bsnes\bsnes.exe</entry>
+            <entry>%ESPATH%\..\Emulators\bsnes\bsnes.exe</entry>
         </rule>
     </emulator>
     <emulator name="CEMU">
         <!-- Nintendo Wii U emulator Cemu -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\cemu\Cemu.exe</entry>
-            <entry>%ESPATH%\cemu\Cemu.exe</entry>
-            <entry>%ESPATH%\..\cemu\Cemu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\cemu\Cemu.exe</entry>
         </rule>
     </emulator>
     <emulator name="CITRA">
@@ -92,58 +82,50 @@
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Citra\nightly-mingw\citra-qt.exe</entry>
             <entry>%ESPATH%\Emulators\Citra\canary-mingw\citra-qt.exe</entry>
-            <entry>%ESPATH%\Citra\nightly-mingw\citra-qt.exe</entry>
-            <entry>%ESPATH%\Citra\canary-mingw\citra-qt.exe</entry>
-            <entry>%ESPATH%\..\Citra\nightly-mingw\citra-qt.exe</entry>
-            <entry>%ESPATH%\..\Citra\canary-mingw\citra-qt.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Citra\nightly-mingw\citra-qt.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Citra\canary-mingw\citra-qt.exe</entry>
         </rule>
     </emulator>
     <emulator name="CPCEMU">
         <!-- Amstrad CPC emulator CPCemu -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\cpcemu\cpcemu.exe</entry>
-            <entry>%ESPATH%\cpcemu\cpcemu.exe</entry>
-            <entry>%ESPATH%\..\cpcemu\cpcemu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\cpcemu\cpcemu.exe</entry>
         </rule>
     </emulator>
     <emulator name="CSPECT">
         <!-- Sinclair ZX Spectrum Next emulator #CSpect -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\CSpect\CSpect.exe</entry>
-            <entry>%ESPATH%\CSpect\CSpect.exe</entry>
-            <entry>%ESPATH%\..\CSpect\CSpect.exe</entry>
+            <entry>%ESPATH%\..\Emulators\CSpect\CSpect.exe</entry>
         </rule>
     </emulator>
     <emulator name="CXBX-RELOADED">
         <!-- Microsoft Xbox emulator Cxbx-Reloaded -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Cxbx-Reloaded\cxbx.exe</entry>
-            <entry>%ESPATH%\Cxbx-Reloaded\cxbx.exe</entry>
-            <entry>%ESPATH%\..\Cxbx-Reloaded\cxbx.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Cxbx-Reloaded\cxbx.exe</entry>
         </rule>
     </emulator>
     <emulator name="DOLPHIN">
         <!-- Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Dolphin-x64\Dolphin.exe</entry>
-            <entry>%ESPATH%\Dolphin-x64\Dolphin.exe</entry>
-            <entry>%ESPATH%\..\Dolphin-x64\Dolphin.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Dolphin-x64\Dolphin.exe</entry>
         </rule>
     </emulator>
     <emulator name="DOSBOX-STAGING">
         <!-- DOS emulator DOSBox Staging -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\dosbox-staging\dosbox.exe</entry>
-            <entry>%ESPATH%\dosbox-staging\dosbox.exe</entry>
-            <entry>%ESPATH%\..\dosbox-staging\dosbox.exe</entry>
+            <entry>%ESPATH%\..\Emulators\dosbox-staging\dosbox.exe</entry>
         </rule>
     </emulator>
     <emulator name="DOSBOX-X">
         <!-- DOS emulator DOSBox-X -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\DOSBox-X\dosbox-x.exe</entry>
-            <entry>%ESPATH%\DOSBox-X\dosbox-x.exe</entry>
-            <entry>%ESPATH%\..\DOSBox-X\dosbox-x.exe</entry>
+            <entry>%ESPATH%\..\Emulators\DOSBox-X\dosbox-x.exe</entry>
         </rule>
     </emulator>
     <emulator name="DUCKSTATION">
@@ -151,117 +133,101 @@
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
             <entry>%ESPATH%\Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
-            <entry>%ESPATH%\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
-            <entry>%ESPATH%\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
-            <entry>%ESPATH%\..\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
-            <entry>%ESPATH%\..\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
+            <entry>%ESPATH%\..\Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
+            <entry>%ESPATH%\..\Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
         </rule>
     </emulator>
     <emulator name="EASYRPG">
         <!-- EasyRPG game engine -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\EasyRPG\Player.exe</entry>
-            <entry>%ESPATH%\EasyRPG\Player.exe</entry>
-            <entry>%ESPATH%\..\EasyRPG\Player.exe</entry>
+            <entry>%ESPATH%\..\Emulators\EasyRPG\Player.exe</entry>
         </rule>
     </emulator>
     <emulator name="FINALBURN-NEO">
         <!-- Arcade emulator FinalBurn Neo -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\fbneo\fbneo64.exe</entry>
-            <entry>%ESPATH%\fbneo\fbneo64.exe</entry>
-            <entry>%ESPATH%\..\fbneo\fbneo64.exe</entry>
             <entry>%ESPATH%\Emulators\fbneo\fbneo.exe</entry>
-            <entry>%ESPATH%\fbneo\fbneo.exe</entry>
-            <entry>%ESPATH%\..\fbneo\fbneo.exe</entry>
+            <entry>%ESPATH%\..\Emulators\fbneo\fbneo64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\fbneo\fbneo.exe</entry>
         </rule>
     </emulator>
     <emulator name="FLYCAST">
         <!-- Sega Dreamcast emulator Flycast -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\flycast\flycast.exe</entry>
-            <entry>%ESPATH%\flycast\flycast.exe</entry>
-            <entry>%ESPATH%\..\flycast\flycast.exe</entry>
+            <entry>%ESPATH%\..\Emulators\flycast\flycast.exe</entry>
         </rule>
     </emulator>
     <emulator name="FS-UAE">
         <!-- Commodore Amiga emulator FS-UAE -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
-            <entry>%ESPATH%\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
-            <entry>%ESPATH%\..\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
+            <entry>%ESPATH%\..\Emulators\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
         </rule>
     </emulator>
     <emulator name="FUSE">
         <!-- Sinclair ZX Spectrum emulator Fuse -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Fuse\fuse.exe</entry>
-            <entry>%ESPATH%\Fuse\fuse.exe</entry>
-            <entry>%ESPATH%\..\Fuse\fuse.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Fuse\fuse.exe</entry>
         </rule>
     </emulator>
     <emulator name="GARGOYLE">
         <!-- Interactive fiction player Gargoyle -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\gargoyle\gargoyle.exe</entry>
-            <entry>%ESPATH%\gargoyle\gargoyle.exe</entry>
-            <entry>%ESPATH%\..\gargoyle\gargoyle.exe</entry>
+            <entry>%ESPATH%\..\Emulators\gargoyle\gargoyle.exe</entry>
         </rule>
     </emulator>
     <emulator name="GEARBOY">
         <!-- Nintendo Game Boy and Game Boy Color emulator Gearboy -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Gearboy\Gearboy.exe</entry>
-            <entry>%ESPATH%\Gearboy\Gearboy.exe</entry>
-            <entry>%ESPATH%\..\Gearboy\Gearboy.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Gearboy\Gearboy.exe</entry>
         </rule>
     </emulator>
     <emulator name="GOPHER2600">
         <!-- Atari 2600 emulator Gopher2600 -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\gopher2600\gopher2600_windows_amd64.exe</entry>
-            <entry>%ESPATH%\gopher2600\gopher2600_windows_amd64.exe</entry>
-            <entry>%ESPATH%\..\gopher2600\gopher2600_windows_amd64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\gopher2600\gopher2600_windows_amd64.exe</entry>
         </rule>
     </emulator>
     <emulator name="HATARI">
         <!-- Atari ST/STE/TT/Falcon emulator Hatari -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\hatari\hatari.exe</entry>
-            <entry>%ESPATH%\hatari\hatari.exe</entry>
-            <entry>%ESPATH%\..\hatari\hatari.exe</entry>
+            <entry>%ESPATH%\..\Emulators\hatari\hatari.exe</entry>
         </rule>
     </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Hypseus Singe\hypseus.exe</entry>
-            <entry>%ESPATH%\Hypseus Singe\hypseus.exe</entry>
-            <entry>%ESPATH%\..\Hypseus Singe\hypseus.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Hypseus Singe\hypseus.exe</entry>
         </rule>
     </emulator>
     <emulator name="KEMULATOR">
         <!-- Java 2 Micro Edition emulator KEmulator -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\KEmulator\KEmulator.exe</entry>
-            <entry>%ESPATH%\KEmulator\KEmulator.exe</entry>
-            <entry>%ESPATH%\..\KEmulator\KEmulator.exe</entry>
+            <entry>%ESPATH%\..\Emulators\KEmulator\KEmulator.exe</entry>
         </rule>
     </emulator>
     <emulator name="M2EMULATOR">
         <!-- Sega Model 2 Emulator -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\m2emulator\EMULATOR.EXE</entry>
-            <entry>%ESPATH%\m2emulator\EMULATOR.EXE</entry>
-            <entry>%ESPATH%\..\m2emulator\EMULATOR.EXE</entry>
+            <entry>%ESPATH%\..\Emulators\m2emulator\EMULATOR.EXE</entry>
         </rule>
     </emulator>
     <emulator name="MAME">
         <!-- Arcade emulator MAME -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\mame\mame.exe</entry>
-            <entry>%ESPATH%\mame\mame.exe</entry>
-            <entry>%ESPATH%\..\mame\mame.exe</entry>
+            <entry>%ESPATH%\..\Emulators\mame\mame.exe</entry>
         </rule>
     </emulator>
     <emulator name="MEDNAFEN">
@@ -271,235 +237,205 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\mednafen\mednafen.exe</entry>
-            <entry>%ESPATH%\mednafen\mednafen.exe</entry>
-            <entry>%ESPATH%\..\mednafen\mednafen.exe</entry>
+            <entry>%ESPATH%\..\Emulators\mednafen\mednafen.exe</entry>
         </rule>
     </emulator>
     <emulator name="MELONDS">
         <!-- Nintendo DS and DSi emulator melonDS -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\melonDS\melonDS.exe</entry>
-            <entry>%ESPATH%\melonDS\melonDS.exe</entry>
-            <entry>%ESPATH%\..\melonDS\melonDS.exe</entry>
+            <entry>%ESPATH%\..\Emulators\melonDS\melonDS.exe</entry>
         </rule>
     </emulator>
     <emulator name="MGBA">
         <!-- Nintendo Game Boy Advance emulator mGBA -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\mGBA\mGBA.exe</entry>
-            <entry>%ESPATH%\mGBA\mGBA.exe</entry>
-            <entry>%ESPATH%\..\mGBA\mGBA.exe</entry>
+            <entry>%ESPATH%\..\Emulators\mGBA\mGBA.exe</entry>
         </rule>
     </emulator>
     <emulator name="MUPEN64PLUS">
         <!-- Nintendo 64 emulator Mupen64Plus -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\mupen64plus\mupen64plus-ui-console.exe</entry>
-            <entry>%ESPATH%\mupen64plus\mupen64plus-ui-console.exe</entry>
-            <entry>%ESPATH%\..\mupen64plus\mupen64plus-ui-console.exe</entry>
+            <entry>%ESPATH%\..\Emulators\mupen64plus\mupen64plus-ui-console.exe</entry>
         </rule>
     </emulator>
     <emulator name="OPENMSX">
         <!-- MSX home computer emulator openMSX -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\openMSX\openmsx.exe</entry>
-            <entry>%ESPATH%\openMSX\openmsx.exe</entry>
-            <entry>%ESPATH%\..\openMSX\openmsx.exe</entry>
+            <entry>%ESPATH%\..\Emulators\openMSX\openmsx.exe</entry>
         </rule>
     </emulator>
     <emulator name="ORICUTRON">
         <!-- Tangerine Computer Systems emulator Oricutron -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Oricutron\oricutron.exe</entry>
-            <entry>%ESPATH%\Oricutron\oricutron.exe</entry>
-            <entry>%ESPATH%\..\Oricutron\oricutron.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Oricutron\oricutron.exe</entry>
         </rule>
     </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qt*.exe</entry>
-            <entry>%ESPATH%\PCSX2-Qt\pcsx2-qt*.exe</entry>
-            <entry>%ESPATH%\..\PCSX2-Qt\pcsx2-qt*.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PCSX2-Qt\pcsx2-qt*.exe</entry>
         </rule>
     </emulator>
     <emulator name="PCSX2-LEGACY">
         <!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\PCSX2\pcsx2.exe</entry>
-            <entry>%ESPATH%\PCSX2\pcsx2.exe</entry>
-            <entry>%ESPATH%\..\PCSX2\pcsx2.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PCSX2\pcsx2.exe</entry>
         </rule>
     </emulator>
     <emulator name="PICO-8">
         <!-- PICO-8 Fantasy Console (game engine) -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\PICO-8\pico8.exe</entry>
-            <entry>%ESPATH%\PICO-8\pico8.exe</entry>
-            <entry>%ESPATH%\..\PICO-8\pico8.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PICO-8\pico8.exe</entry>
         </rule>
     </emulator>
     <emulator name="PLAY!">
         <!-- Sony PlayStation 2 emulator Play! -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Play\Play.exe</entry>
-            <entry>%ESPATH%\Play\Play.exe</entry>
-            <entry>%ESPATH%\..\Play\Play.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Play\Play.exe</entry>
         </rule>
     </emulator>
     <emulator name="PPSSPP">
         <!-- Sony PlayStation Portable emulator PPSSPP -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\PPSSPP\PPSSPPWindows64.exe</entry>
-            <entry>%ESPATH%\PPSSPP\PPSSPPWindows64.exe</entry>
-            <entry>%ESPATH%\..\PPSSPP\PPSSPPWindows64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PPSSPP\PPSSPPWindows64.exe</entry>
         </rule>
     </emulator>
     <emulator name="PRBOOM-PLUS">
         <!-- Doom engine source port PrBoom+ -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\prboom-plus\prboom-plus.exe</entry>
-            <entry>%ESPATH%\prboom-plus\prboom-plus.exe</entry>
-            <entry>%ESPATH%\..\prboom-plus\prboom-plus.exe</entry>
+            <entry>%ESPATH%\..\Emulators\prboom-plus\prboom-plus.exe</entry>
         </rule>
     </emulator>
     <emulator name="PRIMEHACK">
         <!-- PrimeHack, fork of Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\PrimeHack\Dolphin.exe</entry>
-            <entry>%ESPATH%\PrimeHack\Dolphin.exe</entry>
-            <entry>%ESPATH%\..\PrimeHack\Dolphin.exe</entry>
+            <entry>%ESPATH%\..\Emulators\PrimeHack\Dolphin.exe</entry>
         </rule>
     </emulator>
     <emulator name="PROJECT64">
         <!-- Nintendo 64 emulator Project64 -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Project64\Project64.exe</entry>
-            <entry>%ESPATH%\Project64\Project64.exe</entry>
-            <entry>%ESPATH%\..\Project64\Project64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Project64\Project64.exe</entry>
         </rule>
     </emulator>
     <emulator name="PUNES">
         <!-- Nintendo NES and Famicom emulator puNES -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\punes\punes64.exe</entry>
-            <entry>%ESPATH%\punes\punes64.exe</entry>
-            <entry>%ESPATH%\..\punes\punes64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\punes\punes64.exe</entry>
         </rule>
     </emulator>
     <emulator name="REDREAM">
         <!-- Sega Dreamcast emulator Redream -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\redream\redream.exe</entry>
-            <entry>%ESPATH%\redream\redream.exe</entry>
-            <entry>%ESPATH%\..\redream\redream.exe</entry>
+            <entry>%ESPATH%\..\Emulators\redream\redream.exe</entry>
         </rule>
     </emulator>
     <emulator name="ROSALIES-MUPEN-GUI">
         <!-- Nintendo 64 emulator Rosalie's Mupen GUI -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\RMG\RMG.exe</entry>
-            <entry>%ESPATH%\RMG\RMG.exe</entry>
-            <entry>%ESPATH%\..\RMG\RMG.exe</entry>
+            <entry>%ESPATH%\..\Emulators\RMG\RMG.exe</entry>
         </rule>
     </emulator>
     <emulator name="RPCS3">
         <!-- Sony PlayStation 3 emulator RPCS3 -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\RPCS3\rpcs3.exe</entry>
-            <entry>%ESPATH%\RPCS3\rpcs3.exe</entry>
-            <entry>%ESPATH%\..\RPCS3\rpcs3.exe</entry>
+            <entry>%ESPATH%\..\Emulators\RPCS3\rpcs3.exe</entry>
         </rule>
     </emulator>
     <emulator name="RUFFLE">
         <!-- Adobe Flash player Ruffle -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ruffle\ruffle.exe</entry>
-            <entry>%ESPATH%\ruffle\ruffle.exe</entry>
-            <entry>%ESPATH%\..\ruffle\ruffle.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ruffle\ruffle.exe</entry>
         </rule>
     </emulator>
     <emulator name="RYUJINX">
         <!-- Nintendo Switch emulator Ryujinx -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ryujinx\Ryujinx.exe</entry>
-            <entry>%ESPATH%\ryujinx\Ryujinx.exe</entry>
-            <entry>%ESPATH%\..\ryujinx\Ryujinx.exe</entry>
             <entry>%ESPATH%\Emulators\ryujinx\Ryujinx.Ava.exe</entry>
-            <entry>%ESPATH%\ryujinx\Ryujinx.Ava.exe</entry>
-            <entry>%ESPATH%\..\ryujinx\Ryujinx.Ava.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ryujinx\Ryujinx.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ryujinx\Ryujinx.Ava.exe</entry>
         </rule>
     </emulator>
     <emulator name="SAMEBOY">
         <!-- Nintendo Game Boy and Game Boy Color emulator SameBoy -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\sameboy\sameboy.exe</entry>
-            <entry>%ESPATH%\sameboy\sameboy.exe</entry>
-            <entry>%ESPATH%\..\sameboy\sameboy.exe</entry>
+            <entry>%ESPATH%\..\Emulators\sameboy\sameboy.exe</entry>
         </rule>
     </emulator>
     <emulator name="SCUMMVM">
         <!-- ScummVM game engine -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\scummvm\scummvm.exe</entry>
-            <entry>%ESPATH%\scummvm\scummvm.exe</entry>
-            <entry>%ESPATH%\..\scummvm\scummvm.exe</entry>
+            <entry>%ESPATH%\..\Emulators\scummvm\scummvm.exe</entry>
         </rule>
     </emulator>
     <emulator name="SDL2TRS">
         <!-- Tandy TRS-80 emulator sdl2trs -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\sdl2trs\sdl2trs64.exe</entry>
-            <entry>%ESPATH%\sdl2trs\sdl2trs64.exe</entry>
-            <entry>%ESPATH%\..\sdl2trs\sdl2trs64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\sdl2trs\sdl2trs64.exe</entry>
         </rule>
     </emulator>
     <emulator name="SHEEPSHAVER">
         <!-- Apple Macintosh PowerPC emulator SheepShaver -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\SheepShaver\SheepShaver.exe</entry>
-            <entry>%ESPATH%\SheepShaver\SheepShaver.exe</entry>
-            <entry>%ESPATH%\..\SheepShaver\SheepShaver.exe</entry>
+            <entry>%ESPATH%\..\Emulators\SheepShaver\SheepShaver.exe</entry>
         </rule>
     </emulator>
     <emulator name="SIMCOUPE">
         <!-- SAM Coupé emulator SimCoupé -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\SimCoupe\SimCoupe.exe</entry>
-            <entry>%ESPATH%\SimCoupe\SimCoupe.exe</entry>
-            <entry>%ESPATH%\..\SimCoupe\SimCoupe.exe</entry>
+            <entry>%ESPATH%\..\Emulators\SimCoupe\SimCoupe.exe</entry>
         </rule>
     </emulator>
     <emulator name="SIMPLE64">
         <!-- Nintendo 64 emulator simple64 -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\simple64\simple64-gui.exe</entry>
-            <entry>%ESPATH%\simple64\simple64-gui.exe</entry>
-            <entry>%ESPATH%\..\simple64\simple64-gui.exe</entry>
+            <entry>%ESPATH%\..\Emulators\simple64\simple64-gui.exe</entry>
         </rule>
     </emulator>
     <emulator name="SNES9X">
         <!-- Super Nintendo emulator Snes9x -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\snes9x\snes9x-x64.exe</entry>
-            <entry>%ESPATH%\snes9x\snes9x-x64.exe</entry>
-            <entry>%ESPATH%\..\snes9x\snes9x-x64.exe</entry>
+            <entry>%ESPATH%\..\Emulators\snes9x\snes9x-x64.exe</entry>
         </rule>
     </emulator>
     <emulator name="SOLARUS">
         <!-- Solarus game engine -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\solarus\solarus-run.exe</entry>
-            <entry>%ESPATH%\solarus\solarus-run.exe</entry>
-            <entry>%ESPATH%\..\solarus\solarus-run.exe</entry>
+            <entry>%ESPATH%\..\Emulators\solarus\solarus-run.exe</entry>
         </rule>
     </emulator>
     <emulator name="SSF">
         <!-- Sega Saturn emulator SSF -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\SSF\SSF.exe</entry>
-            <entry>%ESPATH%\SSF\SSF.exe</entry>
-            <entry>%ESPATH%\..\SSF\SSF.exe</entry>
+            <entry>%ESPATH%\..\Emulators\SSF\SSF.exe</entry>
         </rule>
     </emulator>
     <emulator name="STEAM">
@@ -519,110 +455,95 @@
         <!-- Atari 2600 emulator Stella -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Stella\64-bit\Stella.exe</entry>
-            <entry>%ESPATH%\Stella\64-bit\Stella.exe</entry>
-            <entry>%ESPATH%\..\Stella\64-bit\Stella.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Stella\64-bit\Stella.exe</entry>
         </rule>
     </emulator>
     <emulator name="SUPERMODEL">
         <!-- Sega Model 3 emulator Supermodel -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Supermodel\Supermodel.exe</entry>
-            <entry>%ESPATH%\Supermodel\Supermodel.exe</entry>
-            <entry>%ESPATH%\..\Supermodel\Supermodel.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Supermodel\Supermodel.exe</entry>
         </rule>
     </emulator>
     <emulator name="TRIFORCE">
         <!-- Triforce, fork of Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Triforce\DolphinWX.exe</entry>
-            <entry>%ESPATH%\Triforce\DolphinWX.exe</entry>
-            <entry>%ESPATH%\..\Triforce\DolphinWX.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Triforce\DolphinWX.exe</entry>
         </rule>
     </emulator>
     <emulator name="TSUGARU">
         <!-- Fujitsu FM Towns emulator Tsugaru -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\tsugaru\Tsugaru_CUI.exe</entry>
-            <entry>%ESPATH%\tsugaru\Tsugaru_CUI.exe</entry>
-            <entry>%ESPATH%\..\tsugaru\Tsugaru_CUI.exe</entry>
+            <entry>%ESPATH%\..\Emulators\tsugaru\Tsugaru_CUI.exe</entry>
         </rule>
     </emulator>
     <emulator name="VBA-M">
         <!-- Nintendo Game Boy Advance emulator VBA-M -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\VBA-M\visualboyadvance-m.exe</entry>
-            <entry>%ESPATH%\VBA-M\visualboyadvance-m.exe</entry>
-            <entry>%ESPATH%\..\VBA-M\visualboyadvance-m.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VBA-M\visualboyadvance-m.exe</entry>
         </rule>
     </emulator>
     <emulator name="VICE-X64SC">
         <!-- Commodore 8-bit computer emulator VICE (x64sc accurate) -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\VICE\x64sc.exe</entry>
-            <entry>%ESPATH%\VICE\x64sc.exe</entry>
-            <entry>%ESPATH%\..\VICE\x64sc.exe</entry>
             <entry>%ESPATH%\Emulators\VICE\bin\x64sc.exe</entry>
-            <entry>%ESPATH%\VICE\bin\x64sc.exe</entry>
-            <entry>%ESPATH%\..\VICE\bin\x64sc.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\x64sc.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\bin\x64sc.exe</entry>
         </rule>
     </emulator>
     <emulator name="VICE-XVIC">
         <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\VICE\xvic.exe</entry>
-            <entry>%ESPATH%\VICE\xvic.exe</entry>
-            <entry>%ESPATH%\..\VICE\xvic.exe</entry>
             <entry>%ESPATH%\Emulators\VICE\bin\xvic.exe</entry>
-            <entry>%ESPATH%\VICE\bin\xvic.exe</entry>
-            <entry>%ESPATH%\..\VICE\bin\xvic.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\xvic.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\bin\xvic.exe</entry>
         </rule>
     </emulator>
     <emulator name="VITA3K">
         <!-- Sony PlayStation Vita emulator Vita3K -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\Vita3K\Vita3K.exe</entry>
-            <entry>%ESPATH%\Vita3K\Vita3K.exe</entry>
-            <entry>%ESPATH%\..\Vita3K\Vita3K.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Vita3K\Vita3K.exe</entry>
         </rule>
     </emulator>
     <emulator name="XEMU">
         <!-- Microsoft Xbox emulator xemu -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\xemu\xemu.exe</entry>
-            <entry>%ESPATH%\xemu\xemu.exe</entry>
-            <entry>%ESPATH%\..\xemu\xemu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\xemu\xemu.exe</entry>
         </rule>
     </emulator>
     <emulator name="XENIA">
         <!-- Microsoft Xbox 360 emulator xenia -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\xenia\xenia.exe</entry>
-            <entry>%ESPATH%\xenia\xenia.exe</entry>
-            <entry>%ESPATH%\..\xenia\xenia.exe</entry>
+            <entry>%ESPATH%\..\Emulators\xenia\xenia.exe</entry>
         </rule>
     </emulator>
     <emulator name="XROAR">
         <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\xroar\xroar.exe</entry>
-            <entry>%ESPATH%\xroar\xroar.exe</entry>
-            <entry>%ESPATH%\..\xroar\xroar.exe</entry>
+            <entry>%ESPATH%\..\Emulators\xroar\xroar.exe</entry>
         </rule>
     </emulator>
     <emulator name="YUZU">
         <!-- Nintendo Switch emulator Yuzu -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
-            <entry>%ESPATH%\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
-            <entry>%ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
+            <entry>%ESPATH%\..\Emulators\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
         </rule>
     </emulator>
     <emulator name="ZESARUX">
         <!-- Sinclair ZX Spectrum emulator ZEsarUX -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\ZEsarUX\zesarux.exe</entry>
-            <entry>%ESPATH%\ZEsarUX\zesarux.exe</entry>
-            <entry>%ESPATH%\..\ZEsarUX\zesarux.exe</entry>
+            <entry>%ESPATH%\..\Emulators\ZEsarUX\zesarux.exe</entry>
         </rule>
     </emulator>
 </ruleList>
\ No newline at end of file