diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 5c66ec73..334d4f4f 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -189,16 +189,12 @@ modules:
       - type: git
         url: https://github.com/libretro/RetroArch.git
         branch: de4e56ecf28a09057734f8624af6d62f3088734f
-      #debug
-      - type: shell
-        commands:
-          - ls -ln
-          - BREAK
-      #/debug
+      - type: dir
+        path: rd-submodules/retroarch/
       - type: file
-        path: rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml
+        path: org.libretro.RetroArch.appdata.xml
       - type: file
-        path: rd-submodules/retroarch/retroarch.cfg
+        path: retroarch.cfg
     post-install:
       - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/
       - >-
@@ -212,8 +208,8 @@ modules:
       - mkdir -p ${FLATPAK_DEST}/share/appdata
       - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata
     modules:
-      - rd-submodules/retroarch/libpng/libpng-1.6.35.json
-      - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
+      - libpng/libpng-1.6.35.json
+      - nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
       - shared-modules/SDL/SDL-1.2.15.json
       - shared-modules/SDL/SDL_image-1.2.12.json
       - shared-modules/SDL/SDL_mixer-1.2.12.json
@@ -221,11 +217,11 @@ modules:
       - shared-modules/SDL/SDL_ttf-2.0.11.json
       - shared-modules/libusb/libusb.json
       - shared-modules/gudev/gudev.json
-      - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json
-      - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json
-      - rd-submodules/retroarch/libaio/libaio-0.3.112.json
-      - rd-submodules/retroarch/shared-modules/glu/glu-9.json
-      - rd-submodules/retroarch/libdecor/libdecor-0.1.0.json
+      - libbz2/libbz2-1.0.8.json
+      - xrandr/xrandr-1.5.1.json
+      - libaio/libaio-0.3.112.json
+      - shared-modules/glu/glu-9.json
+      - libdecor/libdecor-0.1.0.json
   - name: retroarch-filers-video
     subdir: gfx/video_filters
     make-install-args: