diff --git a/.github/workflows/build-and-candidate.yml b/.github/workflows/build-and-candidate.yml
index 383c78079..9fd58c886 100644
--- a/.github/workflows/build-and-candidate.yml
+++ b/.github/workflows/build-and-candidate.yml
@@ -31,8 +31,8 @@ jobs:
         # Build translations
         mkdir otl/
         
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
 
         cp out/* otl/
 
@@ -58,8 +58,8 @@ jobs:
 
     - name: 'Generate i18n'
       run: |
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
       
     - name: "Clone dependencies & set versions"
       run: |
@@ -188,8 +188,8 @@ jobs:
 
     - name: 'Generate i18n'
       run: |
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
       
     - name: "Clone dependencies & set versions"
       run: |
@@ -228,7 +228,7 @@ jobs:
         # Cleanup and bundle
         echo "Cleaning up..."
         rm "out/Inochi Creator.app/Contents/MacOS/inochi-creator-x86_64" "out/Inochi Creator.app/Contents/MacOS/inochi-creator-arm64"
-        ./osxbundle.sh
+        ./build-aux/osx/osxbundle.sh
 
     - name: Archive Zip
       uses: thedoctor0/zip-release@main
@@ -240,7 +240,7 @@ jobs:
 
     - name: 'Build DMG'
       run: |
-        ./gendmg.sh
+        ./build-aux/osx/gendmg.sh
 
     - name: Release
       uses: softprops/action-gh-release@v1
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 91921ea88..9b6af4304 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -33,8 +33,8 @@ jobs:
         # Build translations
         mkdir otl/
         
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
 
         cp out/* otl/
 
@@ -60,8 +60,8 @@ jobs:
 
     - name: 'Generate i18n'
       run: |
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
       
     - name: "Clone dependencies & set versions"
       run: |
@@ -229,8 +229,8 @@ jobs:
 
     - name: 'Generate i18n'
       run: |
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
       
     - name: "Clone dependencies & set versions"
       run: |
@@ -269,7 +269,7 @@ jobs:
         # Cleanup and bundle
         echo "Cleaning up..."
         rm "out/Inochi Creator.app/Contents/MacOS/inochi-creator-x86_64" "out/Inochi Creator.app/Contents/MacOS/inochi-creator-arm64"
-        ./osxbundle.sh
+        ./build-aux/osx/osxbundle.sh
 
     - name: Archive Zip
       uses: thedoctor0/zip-release@main
@@ -290,7 +290,7 @@ jobs:
 
     - name: 'Build DMG'
       run: |
-        ./gendmg.sh
+        ./build-aux/osx/gendmg.sh
 
     - name: Release
       uses: softprops/action-gh-release@v1
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c32f052d7..b09e59819 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -31,8 +31,8 @@ jobs:
         # Build translations
         mkdir otl/
         
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
 
         cp out/* otl/
 
@@ -58,8 +58,8 @@ jobs:
 
     - name: 'Generate i18n'
       run: |
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
       
     - name: "Clone dependencies & set versions"
       run: |
@@ -193,8 +193,8 @@ jobs:
 
     - name: 'Generate i18n'
       run: |
-        sudo chmod +x gentl.sh
-        ./gentl.sh
+        sudo chmod +x ./build-aux/gentl.sh
+        ./build-aux/gentl.sh
       
     - name: "Clone dependencies & set versions"
       run: |
@@ -234,11 +234,11 @@ jobs:
         # Cleanup and bundle
         echo "Cleaning up..."
         rm "out/Inochi Creator.app/Contents/MacOS/inochi-creator-x86_64" "out/Inochi Creator.app/Contents/MacOS/inochi-creator-arm64"
-        ./osxbundle.sh
+        ./build-aux/osx/osxbundle.sh
 
     - name: 'Build DMG'
       run: |
-        ./gendmg.sh
+        ./build-aux/osx/gendmg.sh
 
     - name: Release to nightly tag
       uses: softprops/action-gh-release@v1
@@ -254,7 +254,7 @@ jobs:
       options: --privileged
 
     env:
-      MANIFEST_PATH: res/flatpak/nightly/com.inochi2d.inochi-creator.yml
+      MANIFEST_PATH: build-aux/flatpak/nightly/com.inochi2d.inochi-creator.yml
       FLATPAK_BRANCH: nightly
       FLATPAK_BUILD_DIR: build-dir
       FLATPAK_BUILD_REPO: build-repo
diff --git a/.gitmodules b/.gitmodules
index d760db14c..0bfa947ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "res/flatpak/shared-modules"]
-	path = res/flatpak/shared-modules
+	path = build-aux/flatpak/shared-modules
 	url = https://github.com/flathub/shared-modules.git
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 543bf7f30..9a55b7a92 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -17,7 +17,7 @@
   [Asahi Lina](https://twitter.com/LinaAsahi)
   [seagetch](https://twitter.com/seagetch)
   [carbotaniuman](https://github.com/carbotaniuman)
-  [Grillo](https://twitter.com/Grillo_delmal)
+  [Grillo](https://vt.social/@grillo_delmal)
   [Aki-nyan](https://twitter.com/lethalbit)
   [PanzerKern](https://github.com/pankern)
 
diff --git a/res/flatpak/modules/ffmpeg.yml b/build-aux/flatpak/modules/ffmpeg.yml
similarity index 100%
rename from res/flatpak/modules/ffmpeg.yml
rename to build-aux/flatpak/modules/ffmpeg.yml
diff --git a/res/flatpak/nightly/com.inochi2d.inochi-creator.yml b/build-aux/flatpak/nightly/com.inochi2d.inochi-creator.yml
similarity index 93%
rename from res/flatpak/nightly/com.inochi2d.inochi-creator.yml
rename to build-aux/flatpak/nightly/com.inochi2d.inochi-creator.yml
index ef550de41..9ff9fc4ee 100644
--- a/res/flatpak/nightly/com.inochi2d.inochi-creator.yml
+++ b/build-aux/flatpak/nightly/com.inochi2d.inochi-creator.yml
@@ -38,7 +38,7 @@ modules:
 
       append-path: /usr/lib/sdk/ldc/bin
     build-commands:
-      - chmod +x ./gentl.sh; ./gentl.sh
+      - chmod +x ./build-aux/gentl.sh; ./build-aux/gentl.sh
       - git clone https://github.com/Inochi2D/i2d-imgui.git --recurse-submodules;
         git clone https://github.com/Inochi2D/inochi2d.git;
         git clone https://github.com/Inochi2D/dcv-i2d;
@@ -69,8 +69,5 @@ modules:
         url: https://github.com/Inochi2D/branding.git
         commit: a412602d346ba69c63237217ae286112e300927d
 
-      - type: file
-        path: inochi-creator.desktop
-
-      - type: file
-        path: com.inochi2d.inochi-creator.metainfo.xml
+      - type: dir
+        path: ../../../res/flatpak/nightly/
\ No newline at end of file
diff --git a/res/flatpak/shared-modules b/build-aux/flatpak/shared-modules
similarity index 100%
rename from res/flatpak/shared-modules
rename to build-aux/flatpak/shared-modules
diff --git a/genpot.sh b/build-aux/genpot.sh
similarity index 100%
rename from genpot.sh
rename to build-aux/genpot.sh
diff --git a/gentl.sh b/build-aux/gentl.sh
similarity index 100%
rename from gentl.sh
rename to build-aux/gentl.sh
diff --git a/genver.sh b/build-aux/genver.sh
similarity index 100%
rename from genver.sh
rename to build-aux/genver.sh
diff --git a/BuildUniversal.sh b/build-aux/osx/BuildUniversal.sh
similarity index 97%
rename from BuildUniversal.sh
rename to build-aux/osx/BuildUniversal.sh
index 7c3f4ed56..ffca9e3eb 100755
--- a/BuildUniversal.sh
+++ b/build-aux/osx/BuildUniversal.sh
@@ -19,4 +19,4 @@ lipo -info "out/Inochi Creator.app/Contents/MacOS/inochi-creator"
 # Cleanup and bundle
 echo "Cleaning up..."
 rm "out/Inochi Creator.app/Contents/MacOS/inochi-creator-x86_64" "out/Inochi Creator.app/Contents/MacOS/inochi-creator-arm64"
-./osxbundle.sh
\ No newline at end of file
+./build-aux/osx/osxbundle.sh
\ No newline at end of file
diff --git a/gendmg.sh b/build-aux/osx/gendmg.sh
similarity index 100%
rename from gendmg.sh
rename to build-aux/osx/gendmg.sh
diff --git a/osxbundle.sh b/build-aux/osx/osxbundle.sh
similarity index 100%
rename from osxbundle.sh
rename to build-aux/osx/osxbundle.sh
diff --git a/genver.ps1 b/build-aux/windows/genver.ps1
similarity index 100%
rename from genver.ps1
rename to build-aux/windows/genver.ps1
diff --git a/vcvars.ps1 b/build-aux/windows/vcvars.ps1
similarity index 100%
rename from vcvars.ps1
rename to build-aux/windows/vcvars.ps1