diff --git a/tools/compound/addAutoMirrored.py b/tools/compound/addAutoMirrored.py
index 3d20211bc6..a8e22c42a5 100644
--- a/tools/compound/addAutoMirrored.py
+++ b/tools/compound/addAutoMirrored.py
@@ -101,10 +101,10 @@ files = [
 def main():
     for file in files:
         # Open file for read
-        with open("./compound/src/main/res/drawable/" + file, 'r') as f:
+        with open("./libraries/compound/src/main/res/drawable/" + file, 'r') as f:
             data = f.read().split("\n")
         # Open file to write
-        with open("./compound/src/main/res/drawable/" + file, 'w') as f:
+        with open("./libraries/compound/src/main/res/drawable/" + file, 'w') as f:
             # Write new data
             # write the 3 first lines in data
             for i in range(3):
diff --git a/tools/compound/import_tokens.sh b/tools/compound/import_tokens.sh
index adcd8d23af..700decf81e 100755
--- a/tools/compound/import_tokens.sh
+++ b/tools/compound/import_tokens.sh
@@ -2,37 +2,38 @@
 
 set -e
 
-SHORT=b,:
-LONG=branch,:
 BRANCH='main'
 
 while getopts b: flag
 do
     case "${flag}" in
         b) BRANCH=${OPTARG};;
+        *) echo "usage: $0 [-b branch]" >&2
+           exit 1 ;;
     esac
 done
 
 echo "Branch used: $BRANCH"
 
 echo "Cloning the compound-design-tokens repository..."
-if [ -d tmp ]; then
-    echo "Deleting tmp folder..."
-    rm -rf tmp
+if [ -d tmpCompound ]; then
+    echo "Deleting tmpCompound folder..."
+    rm -rf tmpCompound
 fi
-mkdir tmp
-pushd tmp
-git clone --branch $BRANCH https://github.com/vector-im/compound-design-tokens
+mkdir tmpCompound
+pushd tmpCompound
+git clone --branch "${BRANCH}" https://github.com/vector-im/compound-design-tokens
 
 echo "Copying files from tokens repository..."
-cp -R compound-design-tokens/assets/android/res/drawable ../compound/src/main/res/
-cp -R compound-design-tokens/assets/android/src/* ../compound/src/main/kotlin/io/element/android/compound/tokens/generated/
+rm -R ../libraries/compound/src/main/res/drawable
+cp -R compound-design-tokens/assets/android/res/drawable ../libraries/compound/src/main/res/
+cp -R compound-design-tokens/assets/android/src/* ../libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/
 popd
 
 echo "Adding autoMirrored attribute..."
-python3 ./scripts/addAutoMirrored.py
+python3 ./tools/compound/addAutoMirrored.py
 
 echo "Removing temporary files..."
-rm -rf tmp
+rm -rf tmpCompound
 
 echo "Done!"