diff --git a/flatpak/org.videolan.VLC/openlp-vlc.yaml b/flatpak/openlp-vlc.yaml
similarity index 95%
rename from flatpak/org.videolan.VLC/openlp-vlc.yaml
rename to flatpak/openlp-vlc.yaml
index 5a48923..e18009e 100644
--- a/flatpak/org.videolan.VLC/openlp-vlc.yaml
+++ b/flatpak/openlp-vlc.yaml
@@ -15,11 +15,11 @@ build-options:
   env:
     V: '1'
 modules:
-  - shared-modules/intltool/intltool-0.51.json
-  - shared-modules/SDL/SDL-1.2.15.json
-  - shared-modules/SDL/SDL_image-1.2.12.json
-  - shared-modules/lua5.3/lua-5.3.5.json
-  - shared-modules/glu/glu-9.json
+  - org.videolan.VLC/shared-modules/intltool/intltool-0.51.json
+  - org.videolan.VLC/shared-modules/SDL/SDL-1.2.15.json
+  - org.videolan.VLC/shared-modules/SDL/SDL_image-1.2.12.json
+  - org.videolan.VLC/shared-modules/lua5.3/lua-5.3.5.json
+  - org.videolan.VLC/shared-modules/glu/glu-9.json
   - name: libraw1394
     rm-configure: true
     sources:
@@ -178,9 +178,9 @@ modules:
 ##          project-id: 12587
 ##          url-template: https://www.quut.com/gsm/gsm-$version.tar.gz
 #      - type: patch
-#        path: gsm.patch
+#        path: org.videolan.VLC/gsm.patch
 #      - type: patch
-#        path: gsm-makefile.patch
+#        path: org.videolan.VLC/gsm-makefile.patch
   - name: libdvbpsi
     rm-configure: true
     sources:
@@ -205,7 +205,7 @@ modules:
         url: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/libkate-0.4.1.tar.gz
         sha256: c40e81d5866c3d4bf744e76ce0068d8f388f0e25f7e258ce0c8e76d7adc87b68
       - type: patch
-        path: libkate.patch
+        path: org.videolan.VLC/libkate.patch
       - type: script
         commands:
           - autoreconf -fiv
@@ -400,7 +400,7 @@ modules:
             <: '5'
           url-template: https://ffmpeg.org/releases/ffmpeg-$version.tar.xz
       - type: patch
-        path: ffmpeg_binutils241.patch
+        path: org.videolan.VLC/ffmpeg_binutils241.patch
   - shared-modules/libsecret/libsecret.json
   - name: libaacs
     config-opts:
@@ -432,7 +432,7 @@ modules:
           project-id: 5563
           url-template: https://download.videolan.org/videolan/libbdplus/$version/libbdplus-$version.tar.bz2
       - type: patch
-        path: libbdplus-gpg-error.patch
+        path: org.videolan.VLC/libbdplus-gpg-error.patch
   - name: libbluray
     config-opts:
       - --disable-static
@@ -566,9 +566,9 @@ modules:
         url: https://download.videolan.org/contrib/live555/live.2020.11.05.tar.gz
         sha256: 89bdfba7fd215e16be2c9d46a797bf85c5f7f7c46b53dc8af2d1171a658da5b7
       - type: patch
-        path: live555-add-pkgconfig-file.patch
+        path: org.videolan.VLC/live555-add-pkgconfig-file.patch
       - type: patch
-        path: live555-nosignal.patch
+        path: org.videolan.VLC/live555-nosignal.patch
   - name: libnotify
     buildsystem: meson
     config-opts:
@@ -604,9 +604,9 @@ modules:
     cleanup:
       - /share/macosx
     post-install:
-      - install -Dp -m 644 org.videolan.VLC.appdata.xml /app/share/appdata/vlc.appdata.xml
+      - install -Dp -m 644 org.videolan.VLC/org.videolan.VLC.appdata.xml /app/share/appdata/vlc.appdata.xml
       - mv /app/bin/vlc /app/bin/vlc.bin
-      - mv vlc.sh /app/bin/vlc
+      - mv org.videolan.VLC/vlc.sh /app/bin/vlc
       - chmod +x /app/bin/vlc
       - echo "StartupWMClass=VLC" >> /app/share/applications/vlc.desktop
       - sed -i -e 's/Icon=vlc/Icon=org.videolan.VLC/g' /app/share/applications/vlc-*.desktop
@@ -627,15 +627,15 @@ modules:
             <: '4'
           url-template: https://download.videolan.org/videolan/vlc/$version/vlc-$version.tar.xz
       - type: file
-        path: org.videolan.VLC.appdata.xml
+        path: org.videolan.VLC/org.videolan.VLC.appdata.xml
       - type: patch
-        path: vlc-fix-appdata.patch
+        path: org.videolan.VLC/vlc-fix-appdata.patch
       - type: patch
-        path: vlc-disc-shortcuts.patch
+        path: org.videolan.VLC/vlc-disc-shortcuts.patch
       - type: patch
-        path: vlc-ignore-time-for-cache.patch
+        path: org.videolan.VLC/vlc-ignore-time-for-cache.patch
       - type: file
-        path: vlc.sh
+        path: org.videolan.VLC/vlc.sh
       - type: file
         url: https://src.fedoraproject.org/lookaside/extras/chrpath/chrpath-0.16.tar.gz/2bf8d1d1ee345fc8a7915576f5649982/chrpath-0.16.tar.gz
         sha256: bb0d4c54bac2990e1bdf8132f2c9477ae752859d523e141e72b3b11a12c26e7b