diff --git a/.github/workflows/push-export.yml b/.github/workflows/push-export.yml
index 4e0b7bb..0c4db0b 100644
--- a/.github/workflows/push-export.yml
+++ b/.github/workflows/push-export.yml
@@ -21,20 +21,20 @@ jobs:
         uses: actions/checkout@v1
       - name: Setup
         run: |
-          mkdir -v -p ~/.local/share/godot/templates
-          mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
+          mkdir -v -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable/
+          mv -v /root/.local/share/godot/templates/* ~/.local/share/godot/export_templates/
       - name: Windows Build
         run: |
-          mkdir -v -p build/windows
-          godot -v --headless --export-release "Windows Desktop" ./build/windows/$EXPORT_NAME.exe
+          mkdir -v -p builds/windows
+          godot --headless --export-release "Windows Desktop" ./builds/windows/$EXPORT_NAME.exe
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: windows
-          path: build/windows
+          path: builds/windows
           retention-days: 1
       - name: Zip Folder
-        run: zip -r itch.zip build/windows
+        run: zip -r itch.zip builds/windows
       - name: Deploy to itch.io
         if: ${{ env.ITCH_IO=='true' }}
         uses: josephbmanley/butler-publish-itchio-action@master
@@ -56,20 +56,20 @@ jobs:
         uses: actions/checkout@v1
       - name: Setup
         run: |
-          mkdir -v -p ~/.local/share/godot/templates
-          mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
+          mkdir -v -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable/
+          mv -v /root/.local/share/godot/templates/* ~/.local/share/godot/export_templates/
       - name: Linux Build
         run: |
-          mkdir -v -p build/linux
-          godot -v --headless --export-release "Linux/X11" ./build/linux/$EXPORT_NAME.x86_64
+          mkdir -v -p builds/linux
+          godot -v --headless --export-release "Linux/X11" ./builds/linux/$EXPORT_NAME.x86_64
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: linux
-          path: build/linux
+          path: builds/linux
           retention-days: 1
       - name: Zip Folder
-        run: zip -r itch.zip build/linux
+        run: zip -r itch.zip builds/linux
       - name: Deploy to itch.io
         if: ${{ env.ITCH_IO=='true' }}
         uses: josephbmanley/butler-publish-itchio-action@master
@@ -91,17 +91,17 @@ jobs:
         uses: actions/checkout@v1
       - name: Setup
         run: |
-          mkdir -v -p ~/.local/share/godot/templates
-          mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
+          mkdir -v -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable/
+          mv -v /root/.local/share/godot/templates/* ~/.local/share/godot/export_templates/
       - name: Web Build
         run: |
-          mkdir -v -p build/web
-          godot -v --headless --export-release "HTML5" ./build/web/index.html
+          mkdir -v -p builds/web
+          godot -v --headless --export-release "Web" ./builds/web/index.html
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: web
-          path: build/web
+          path: builds/web
           retention-days: 1
       # Installing rsync is needed in order to deploy to GitHub Pages. Without it, the build will fail.
       - name: Install rsync 📚
@@ -111,9 +111,9 @@ jobs:
         uses: JamesIves/github-pages-deploy-action@releases/v4
         with:
           BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: build/web # The folder the action should deploy.
+          FOLDER: builds/web # The folder the action should deploy.
       - name: Zip Folder
-        run: zip -r itch.zip build/web
+        run: zip -r itch.zip builds/web
       - name: Deploy to itch.io
         if: ${{ env.ITCH_IO=='true' }}
         uses: josephbmanley/butler-publish-itchio-action@master
@@ -135,20 +135,20 @@ jobs:
         uses: actions/checkout@v1
       - name: Setup
         run: |
-          mkdir -v -p ~/.local/share/godot/templates
-          mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
+          mkdir -v -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable/
+          mv -v /root/.local/share/godot/templates/* ~/.local/share/godot/export_templates/
       - name: Mac Build
         run: |
-          mkdir -v -p build/mac
-          godot -v --headless --export-release "Mac OSX" ./build/mac/$EXPORT_NAME.zip
+          mkdir -v -p builds/mac
+          godot -v --headless --export-release "macOS" ./builds/mac/$EXPORT_NAME.zip
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: mac
-          path: build/mac
+          path: builds/mac
           retention-days: 1
       - name: Zip Folder
-        run: zip -r itch.zip build/mac
+        run: zip -r itch.zip builds/mac
       - name: Deploy to itch.io
         if: ${{ env.ITCH_IO=='true' }}
         uses: josephbmanley/butler-publish-itchio-action@master