diff --git a/.env.ios b/.env.ios
index 4870f11c..45d2db71 100644
--- a/.env.ios
+++ b/.env.ios
@@ -1,5 +1,5 @@
 PLATFORM="ios"
 GYM_SCHEME="Passepartout-iOS"
 BUNDLE_CONTEXT="ios"
-DELIVER_SCREENSHOTS_PATH="Passepartout/App/iOS/fastlane/screenshots"
-DELIVER_METADATA_PATH="Passepartout/App/iOS/fastlane/metadata"
+APP_CONTEXT="iOS"
+APP_ROOT="Passepartout/App/$APP_CONTEXT"
diff --git a/.env.mac b/.env.mac
index ed6ea094..ef63be73 100644
--- a/.env.mac
+++ b/.env.mac
@@ -1,5 +1,5 @@
 PLATFORM="mac"
 GYM_SCHEME="Passepartout-macOS"
 BUNDLE_CONTEXT="macos"
-DELIVER_SCREENSHOTS_PATH="Passepartout/App/macOS/fastlane/screenshots"
-DELIVER_METADATA_PATH="Passepartout/App/macOS/fastlane/metadata"
+APP_CONTEXT="macOS"
+APP_ROOT="Passepartout/App/$APP_CONTEXT"
diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile
index d081bbc1..07ded9ed 100644
--- a/fastlane/Deliverfile
+++ b/fastlane/Deliverfile
@@ -2,6 +2,9 @@
 # For more information, check out the docs
 # https://docs.fastlane.tools/actions/deliver/
 
+screenshots_path "#{ENV['APP_ROOT']}/fastlane/screenshots"
+metadata_path "#{ENV['APP_ROOT']}/fastlane/metadata"
+
 skip_binary_upload true
 skip_metadata false
 skip_screenshots false
diff --git a/scripts/add-provider-description.sh b/scripts/add-provider-description.sh
index 5a6a3b0c..0d16204c 100755
--- a/scripts/add-provider-description.sh
+++ b/scripts/add-provider-description.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-PATTERN="fastlane/metadata/*/description.txt"
+PATTERN="Passepartout/App/*/fastlane/metadata/*/description.txt"
 AFTER=$1
 NAME=$2
 DELIMITER="†"
diff --git a/scripts/downscale-icon.sh b/scripts/downscale-ios-icon.sh
similarity index 68%
rename from scripts/downscale-icon.sh
rename to scripts/downscale-ios-icon.sh
index 0bd3c932..efee6657 100755
--- a/scripts/downscale-icon.sh
+++ b/scripts/downscale-ios-icon.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 SIZES="120 152 167 180 76"
 
-cd Passepartout-iOS/Assets.xcassets/AppIcon.appiconset
+cd Passepartout/App/iOS/Assets.xcassets/AppIcon.appiconset
 for S in $SIZES; do
     convert -geometry "${S}x${S}" AppIcon-1024.png AppIcon-$S.png
 done
diff --git a/scripts/export-for-translations.sh b/scripts/export-for-translations.sh
index 548ff868..38d49a80 100755
--- a/scripts/export-for-translations.sh
+++ b/scripts/export-for-translations.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-. .env
+. .env.$1
 
 DIST="l10n"
 DIST_APP="$DIST/App"
@@ -10,20 +10,20 @@ rm -rf $OUTPUT $DIST
 mkdir -p $DIST_APP
 mkdir -p $DIST_META
 
-if [[ $1 == "all" ]]; then
-    cp Submodules/Core/Passepartout/Resources/en.lproj/Core.strings $DIST_APP/Core.txt
-    cp Submodules/Core/Passepartout/Resources/en.lproj/Intents.strings $DIST_APP/Intents.txt
-    cp $PROJECT/Global/en.lproj/App.strings $DIST_APP/App.txt
-    cp $PROJECT/en.lproj/InfoPlist.strings $DIST_APP/InfoPlist.txt
+if [[ $2 == "all" ]]; then
+    cp Passepartout/Core/Resources/en.lproj/Core.strings $DIST_APP/Core.txt
+    cp Passepartout/Core/Resources/en.lproj/Intents.strings $DIST_APP/Intents.txt
+    cp $APP_ROOT/en.lproj/App.strings $DIST_APP/App.txt
+    cp $APP_ROOT/en.lproj/InfoPlist.strings $DIST_APP/InfoPlist.txt
 
-    cp fastlane/metadata/en-US/name.txt $DIST_META
-    cp fastlane/metadata/en-US/subtitle.txt $DIST_META
-    cp fastlane/metadata/en-US/description.txt $DIST_META
-elif [[ $1 == "new" ]]; then
-    grep -f templates/new-strings.txt Submodules/Core/Passepartout/Resources/en.lproj/Core.strings >$DIST_APP/Core.txt
-    grep -f templates/new-strings.txt Submodules/Core/Passepartout/Resources/en.lproj/Intents.strings >$DIST_APP/Intents.txt
-    grep -f templates/new-strings.txt $PROJECT/Global/en.lproj/App.strings >$DIST_APP/App.txt
-    grep -f templates/new-strings.txt $PROJECT/en.lproj/InfoPlist.strings >$DIST_APP/InfoPlist.txt
+    cp $APP_ROOT/fastlane/metadata/en-US/name.txt $DIST_META
+    cp $APP_ROOT/fastlane/metadata/en-US/subtitle.txt $DIST_META
+    cp $APP_ROOT/fastlane/metadata/en-US/description.txt $DIST_META
+elif [[ $2 == "new" ]]; then
+    grep -f templates/new-strings.txt Passepartout/Core/Resources/en.lproj/Core.strings >$DIST_APP/Core.txt
+    grep -f templates/new-strings.txt Passepartout/Core/Resources/en.lproj/Intents.strings >$DIST_APP/Intents.txt
+    grep -f templates/new-strings.txt $APP_ROOT/en.lproj/App.strings >$DIST_APP/App.txt
+    grep -f templates/new-strings.txt $APP_ROOT/en.lproj/InfoPlist.strings >$DIST_APP/InfoPlist.txt
 else
     echo "No argument given (all|new)"
     exit
diff --git a/scripts/list-untranslated.sh b/scripts/list-untranslated.sh
index 9c9e9c28..2635a3d3 100755
--- a/scripts/list-untranslated.sh
+++ b/scripts/list-untranslated.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
-. .env
+. .env.$1
 
-DIR_APP="$PROJECT/Global"
+DIR_APP="$APP_ROOT"
 FILENAME_APP="App.strings"
-DIR_CORE="Submodules/Core/Passepartout/Resources"
+DIR_CORE="Passepartout/Core/Resources"
 FILENAME_CORE="Core.strings"
 
-if [[ $2 = "core" ]]; then
+if [[ $3 = "core" ]]; then
     DIR=$DIR_CORE
     FILENAME=$FILENAME_CORE
 else
@@ -15,7 +15,7 @@ else
 fi
 
 LANG_BASE="en"
-LANG_TARGET="$1"
+LANG_TARGET="$2"
 STRINGS_BASE="$DIR/$LANG_BASE.lproj/$FILENAME"
 STRINGS_TARGET="$DIR/$LANG_TARGET.lproj/$FILENAME"
 IDS="string-ids.tmp"
diff --git a/scripts/reset-archive.sh b/scripts/reset-archive.sh
index 0d0f4dcb..ebb82817 100755
--- a/scripts/reset-archive.sh
+++ b/scripts/reset-archive.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
-git checkout Passepartout*/Info.plist
-git checkout Passepartout*.pbxproj
+git checkout *Info.plist Passepartout.xcodeproj