diff --git a/.github/workflows/build-windows-executable-app-with-pyinstaller.yaml b/.github/workflows/build-windows-executable-app-with-pyinstaller.yaml
index 63e85f2b..af504ad0 100644
--- a/.github/workflows/build-windows-executable-app-with-pyinstaller.yaml
+++ b/.github/workflows/build-windows-executable-app-with-pyinstaller.yaml
@@ -223,22 +223,26 @@ jobs:
 
     - name: Copy everything to dist directory
       run: |
-        mkdir dist
-        mkdir dist/bin
-        
-        cp -r .streamlit dist/.streamlit
-        cp -r content dist/content
-        cp -r docs dist/docs
-        cp -r src dist/src
-        cp -r assets dist/assets
-        cp -r example-data dist/example-data
-        cp openms-bin/*.dll streamlit_exe/bin/
-        cp -r share dist/share
-        cp app.py dist/
+        mkdir streamlit_exe
+
+        mv python-${{ env.PYTHON_VERSION }} streamlit_exe
+        mv run_app.bat streamlit_exe
+        cp -r src streamlit_exe
+        cp -r gdpr_consent streamlit_exe
+        cp -r content streamlit_exe
+        cp -r docs streamlit_exe
+        cp -r assets streamlit_exe
+        cp -r example-data streamlit_exe
+        cp openms-bin/*.dll streamlit_exe
+        cp -r .streamlit streamlit_exe
+        cp -r share streamlit_exe/share
+        cp app.py streamlit_exe
+        cp settings.json streamlit_exe
+        cp default-parameters.json streamlit_exe
 
         $files = $env:TOPP_TOOLS -split ' '
         foreach ($file in $files) {
-          Copy-Item "openms-bin/${file}.exe" -Destination "dist/bin/${file}.exe"
+          Copy-Item "openms-bin/${file}.exe" -Destination "streamlit_exe/${file}.exe"
         }
     
     - name: Modify .spec file
diff --git a/.github/workflows/build-windows-executable-app.yaml b/.github/workflows/build-windows-executable-app.yaml
index 309201ad..f92e3ae3 100644
--- a/.github/workflows/build-windows-executable-app.yaml
+++ b/.github/workflows/build-windows-executable-app.yaml
@@ -212,7 +212,6 @@ jobs:
     - name: Create All-in-one executable folder
       run: |
         mkdir streamlit_exe
-        mkdir streamlit_exe/bin
 
         mv python-${{ env.PYTHON_VERSION }} streamlit_exe
         mv run_app.bat streamlit_exe