diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md
index 8b6ab5be3..4a725eee6 100644
--- a/INSTALL-DEV.md
+++ b/INSTALL-DEV.md
@@ -1527,6 +1527,8 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo
             <!-- Portable installation -->
             <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>
             <entry>%ESPATH%\..\RetroArch-Win64\retroarch.exe</entry>
             <entry>%ESPATH%\..\RetroArch\retroarch.exe</entry>
         </rule>
@@ -1548,6 +1550,7 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo
             <entry>C:\Program Files (x86)\PCSX2\pcsx2.exe</entry>
             <entry>D:\Program Files (x86)\PCSX2\pcsx2.exe</entry>
             <entry>%ESPATH%\PCSX2\pcsx2.exe</entry>
+            <entry>%ESPATH%\Emulators\PCSX2\pcsx2.exe</entry>
             <entry>%ESPATH%\..\PCSX2\pcsx2.exe</entry>
         </rule>
     </emulator>
@@ -1559,6 +1562,7 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo
         <rule type="staticpath">
             <entry>~\AppData\Local\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>
             <entry>%ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
         </rule>
     </emulator>
@@ -1773,6 +1777,31 @@ VBA-M\visualboyadvance-m.exe
 xemu\xemu.exe
 xenia\xenia.exe
 yuzu\yuzu-windows-msvc\yuzu.exe
+
+Emulators\RetroArch-Win64\retroarch.exe
+Emulators\RetroArch\retroarch.exe
+Emulators\cemu\Cemu.exe
+Emulators\Citra\canary-mingw\citra.exe
+Emulators\Citra\nightly-mingw\citra.exe
+Emulators\Dolphin-x64\Dolphin.exe
+Emulators\dosbox-staging\dosbox.exe
+Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe
+Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe
+Emulators\flycast\flycast.exe
+Emulators\mame\mame.exe
+Emulators\melonDS\melonDS.exe
+Emulators\mGBA\mGBA.exe
+Emulators\mupen64plus\mupen64plus-ui-console.exe
+Emulators\PCSX2\pcsx2.exe
+Emulators\PPSSPP\PPSSPPWindows64.exe
+Emulators\redream\redream.exe
+Emulators\RPCS3\rpcs3.exe
+Emulators\ryujinx\Ryujinx.exe
+Emulators\VBA-M\visualboyadvance-m.exe
+Emulators\xemu\xemu.exe
+Emulators\xenia\xenia.exe
+Emulators\yuzu\yuzu-windows-msvc\yuzu.exe
+
 ..\RetroArch-Win64\retroarch.exe
 ..\RetroArch\retroarch.exe
 ..\cemu\Cemu.exe
diff --git a/es-app/assets/org.es_de.emulationstation-de.yml b/es-app/assets/org.es_de.emulationstation-de.yml
index b30288cad..1dbd6c37c 100644
--- a/es-app/assets/org.es_de.emulationstation-de.yml
+++ b/es-app/assets/org.es_de.emulationstation-de.yml
@@ -28,49 +28,8 @@ cleanup:
   - /lib/debug
   - /lib/pkgconfig
   - /lib/libfreeimage.a
-  - /lib/libogg.a
-  - /lib/libvpx.a
 
 modules:
-  - name: libvpx
-    config-opts:
-    - --disable-examples
-    - --disable-docs
-    - --enable-pic
-    - --enable-vp9-highbitdepth
-    sources:
-    - type: git
-      url: https://github.com/webmproject/libvpx.git
-      tag: v1.11.0
-
-  - name: ogg
-    buildsystem: cmake
-    config-opts:
-    - -DCMAKE_POSITION_INDEPENDENT_CODE=on
-    - -DINSTALL_DOCS=off
-    sources:
-    - type: git
-      url: https://github.com/xiph/ogg.git
-      tag: v1.3.5
-
-  - name: vorbis
-    buildsystem: cmake
-    config-opts:
-    - -DBUILD_SHARED_LIBS=on
-    sources:
-    - type: git
-      url: https://gitlab.xiph.org/xiph/vorbis.git
-      tag: v1.3.7
-
-  - name: opus
-    buildsystem: cmake
-    config-opts:
-    - -DBUILD_SHARED_LIBS=on
-    sources:
-    - type: git
-      url: https://gitlab.xiph.org/xiph/opus.git
-      tag: v1.3.1
-
   - name: ffmpeg
     config-opts:
     - --disable-static
@@ -91,8 +50,6 @@ modules:
     no-autogen: true
     build-options:
         cxxflags: -std=c++14
-    make-args:
-    - DESTDIR=/app
     sources:
     - type: archive
       url: http://downloads.sourceforge.net/freeimage/FreeImage3180.zip
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 5f7c1ce84..12e5548db 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -27,6 +27,8 @@
             <!-- Portable installation -->
             <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>
             <entry>%ESPATH%\..\RetroArch-Win64\retroarch.exe</entry>
             <entry>%ESPATH%\..\RetroArch\retroarch.exe</entry>
         </rule>
@@ -43,6 +45,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\cemu\Cemu.exe</entry>
+            <entry>%ESPATH%\Emulators\cemu\Cemu.exe</entry>
             <entry>%ESPATH%\..\cemu\Cemu.exe</entry>
         </rule>
     </emulator>
@@ -55,8 +58,10 @@
             <entry>~\AppData\Local\Citra\nightly-mingw\citra.exe</entry>
             <entry>~\AppData\Local\Citra\canary-mingw\citra.exe</entry>
             <entry>%ESPATH%\Citra\nightly-mingw\citra.exe</entry>
-            <entry>%ESPATH%\..\Citra\nightly-mingw\citra.exe</entry>
             <entry>%ESPATH%\Citra\canary-mingw\citra.exe</entry>
+            <entry>%ESPATH%\Emulators\Citra\nightly-mingw\citra.exe</entry>
+            <entry>%ESPATH%\Emulators\Citra\canary-mingw\citra.exe</entry>
+            <entry>%ESPATH%\..\Citra\nightly-mingw\citra.exe</entry>
             <entry>%ESPATH%\..\Citra\canary-mingw\citra.exe</entry>
         </rule>
     </emulator>
@@ -67,6 +72,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\Dolphin-x64\Dolphin.exe</entry>
+            <entry>%ESPATH%\Emulators\Dolphin-x64\Dolphin.exe</entry>
             <entry>%ESPATH%\..\Dolphin-x64\Dolphin.exe</entry>
         </rule>
     </emulator>
@@ -77,6 +83,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\dosbox-staging\dosbox.exe</entry>
+            <entry>%ESPATH%\Emulators\dosbox-staging\dosbox.exe</entry>
             <entry>%ESPATH%\..\dosbox-staging\dosbox.exe</entry>
         </rule>
     </emulator>
@@ -89,6 +96,8 @@
         <rule type="staticpath">
             <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>
             <entry>%ESPATH%\..\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe</entry>
             <entry>%ESPATH%\..\duckstation\duckstation-qt-x64-ReleaseLTCG.exe</entry>
         </rule>
@@ -100,6 +109,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\flycast\flycast.exe</entry>
+            <entry>%ESPATH%\Emulators\flycast\flycast.exe</entry>
             <entry>%ESPATH%\..\flycast\flycast.exe</entry>
         </rule>
     </emulator>
@@ -110,6 +120,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
+            <entry>%ESPATH%\Emulators\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
             <entry>%ESPATH%\..\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
         </rule>
     </emulator>
@@ -120,6 +131,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\mame\mame.exe</entry>
+            <entry>%ESPATH%\Emulators\mame\mame.exe</entry>
             <entry>%ESPATH%\..\mame\mame.exe</entry>
         </rule>
     </emulator>
@@ -130,6 +142,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\melonDS\melonDS.exe</entry>
+            <entry>%ESPATH%\Emulators\melonDS\melonDS.exe</entry>
             <entry>%ESPATH%\..\melonDS\melonDS.exe</entry>
         </rule>
     </emulator>
@@ -145,6 +158,7 @@
             <entry>C:\Program Files\mGBA\mGBA.exe</entry>
             <entry>D:\Program Files\mGBA\mGBA.exe</entry>
             <entry>%ESPATH%\mGBA\mGBA.exe</entry>
+            <entry>%ESPATH%\Emulators\mGBA\mGBA.exe</entry>
             <entry>%ESPATH%\..\mGBA\mGBA.exe</entry>
         </rule>
     </emulator>
@@ -153,6 +167,7 @@
         <rule type="systempath">
             <entry>mupen64plus-ui-console.exe</entry>
             <entry>%ESPATH%\mupen64plus\mupen64plus-ui-console.exe</entry>
+            <entry>%ESPATH%\Emulators\mupen64plus\mupen64plus-ui-console.exe</entry>
             <entry>%ESPATH%\..\mupen64plus\mupen64plus-ui-console.exe</entry>
         </rule>
     </emulator>
@@ -168,6 +183,7 @@
             <entry>C:\Program Files (x86)\PCSX2\pcsx2.exe</entry>
             <entry>D:\Program Files (x86)\PCSX2\pcsx2.exe</entry>
             <entry>%ESPATH%\PCSX2\pcsx2.exe</entry>
+            <entry>%ESPATH%\Emulators\PCSX2\pcsx2.exe</entry>
             <entry>%ESPATH%\..\PCSX2\pcsx2.exe</entry>
         </rule>
     </emulator>
@@ -183,6 +199,7 @@
             <entry>C:\Program Files\PPSSPP\PPSSPPWindows64.exe</entry>
             <entry>D:\Program Files\PPSSPP\PPSSPPWindows64.exe</entry>
             <entry>%ESPATH%\PPSSPP\PPSSPPWindows64.exe</entry>
+            <entry>%ESPATH%\Emulators\PPSSPP\PPSSPPWindows64.exe</entry>
             <entry>%ESPATH%\..\PPSSPP\PPSSPPWindows64.exe</entry>
         </rule>
     </emulator>
@@ -193,6 +210,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\redream\redream.exe</entry>
+            <entry>%ESPATH%\Emulators\redream\redream.exe</entry>
             <entry>%ESPATH%\..\redream\redream.exe</entry>
         </rule>
     </emulator>
@@ -203,6 +221,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\RPCS3\rpcs3.exe</entry>
+            <entry>%ESPATH%\Emulators\RPCS3\rpcs3.exe</entry>
             <entry>%ESPATH%\..\RPCS3\rpcs3.exe</entry>
         </rule>
     </emulator>
@@ -213,6 +232,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\ryujinx\Ryujinx.exe</entry>
+            <entry>%ESPATH%\Emulators\ryujinx\Ryujinx.exe</entry>
             <entry>%ESPATH%\..\ryujinx\Ryujinx.exe</entry>
         </rule>
     </emulator>
@@ -223,6 +243,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\VBA-M\visualboyadvance-m.exe</entry>
+            <entry>%ESPATH%\Emulators\VBA-M\visualboyadvance-m.exe</entry>
             <entry>%ESPATH%\..\VBA-M\visualboyadvance-m.exe</entry>
         </rule>
     </emulator>
@@ -233,6 +254,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\xemu\xemu.exe</entry>
+            <entry>%ESPATH%\Emulators\xemu\xemu.exe</entry>
             <entry>%ESPATH%\..\xemu\xemu.exe</entry>
         </rule>
     </emulator>
@@ -243,6 +265,7 @@
         </rule>
         <rule type="staticpath">
             <entry>%ESPATH%\xenia\xenia.exe</entry>
+            <entry>%ESPATH%\Emulators\xenia\xenia.exe</entry>
             <entry>%ESPATH%\..\xenia\xenia.exe</entry>
         </rule>
     </emulator>
@@ -254,6 +277,7 @@
         <rule type="staticpath">
             <entry>~\AppData\Local\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>
             <entry>%ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
         </rule>
     </emulator>