diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c30783b..e9269ba 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: artifact
-          path: ./output/*
+          path: ./buildscripts/*
       - uses: softprops/action-gh-release@v1
         if: github.ref == 'refs/heads/main'
         with:
@@ -58,4 +58,4 @@ jobs:
           prerelease: false
           tag_name: "vnext"
           files: |
-            output/*
+            buildscripts/*
diff --git a/buildscripts/bundle_default.sh b/buildscripts/bundle_default.sh
index 67c7bd5..05e7a7d 100755
--- a/buildscripts/bundle_default.sh
+++ b/buildscripts/bundle_default.sh
@@ -30,27 +30,18 @@ sudo chmod +x gradlew
 
 unzip -o app/build/outputs/apk/release/app-release.apk -d app/build/outputs/apk/release
 
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/arm64-v8a/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/arm64-v8a"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/armeabi-v7a/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/armeabi-v7a"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/x86/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/x86"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/x86_64/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/x86_64"
+cp app/build/outputs/apk/release/lib/arm64-v8a/libmediakitandroidhelper.so      ../../prefix/arm64-v8a/usr/local/lib
+cp app/build/outputs/apk/release/lib/armeabi-v7a/libmediakitandroidhelper.so    ../../prefix/armeabi-v7a/usr/local/lib
+cp app/build/outputs/apk/release/lib/x86/libmediakitandroidhelper.so            ../../prefix/x86/usr/local/lib
+cp app/build/outputs/apk/release/lib/x86_64/libmediakitandroidhelper.so         ../../prefix/x86_64/usr/local/lib
 
 cd ../..
 
-zip -r "default-arm64-v8a.jar"                lib/arm64-v8a
-zip -r "default-armeabi-v7a.jar"              lib/armeabi-v7a
-zip -r "default-x86.jar"                      lib/x86
-zip -r "default-x86_64.jar"                   lib/x86_64
+zip -r default-arm64-v8a.jar                prefix/arm64-v8a/usr/local/lib/*.so
+zip -r default-armeabi-v7a.jar              prefix/armeabi-v7a/usr/local/lib/*.so
+zip -r default-x86.jar                      prefix/x86/usr/local/lib/*.so
+zip -r default-x86_64.jar                   prefix/x86_64/usr/local/lib/*.so
 
-mkdir -p ../../../../../../../../../../output
-
-cp *.jar ../../../../../../../../../../output
+zip -r debug-symbols-default.zip prefix/*
 
 md5sum *.jar
-
-cd ../../../../../../../../..
-
-# --------------------------------------------------
-
-zip -r debug-symbols-default.zip prefix/*/lib
-cp debug-symbols-default.zip ../output
diff --git a/buildscripts/bundle_encoders-gpl.sh b/buildscripts/bundle_encoders-gpl.sh
index 4769213..903feef 100644
--- a/buildscripts/bundle_encoders-gpl.sh
+++ b/buildscripts/bundle_encoders-gpl.sh
@@ -31,27 +31,18 @@ sudo chmod +x gradlew
 
 unzip -o app/build/outputs/apk/release/app-release.apk -d app/build/outputs/apk/release
 
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/arm64-v8a/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/arm64-v8a"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/armeabi-v7a/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/armeabi-v7a"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/x86/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/x86"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/x86_64/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/x86_64"
+cp app/build/outputs/apk/release/lib/arm64-v8a/libmediakitandroidhelper.so      ../../prefix/arm64-v8a/usr/local/lib
+cp app/build/outputs/apk/release/lib/armeabi-v7a/libmediakitandroidhelper.so    ../../prefix/armeabi-v7a/usr/local/lib
+cp app/build/outputs/apk/release/lib/x86/libmediakitandroidhelper.so            ../../prefix/x86/usr/local/lib
+cp app/build/outputs/apk/release/lib/x86_64/libmediakitandroidhelper.so         ../../prefix/x86_64/usr/local/lib
 
 cd ../..
 
-zip -r "encoders-gpl-arm64-v8a.jar"                lib/arm64-v8a
-zip -r "encoders-gpl-armeabi-v7a.jar"              lib/armeabi-v7a
-zip -r "encoders-gpl-x86.jar"                      lib/x86
-zip -r "encoders-gpl-x86_64.jar"                   lib/x86_64
+zip -r encoders-gpl-arm64-v8a.jar                prefix/arm64-v8a/usr/local/lib/*.so
+zip -r encoders-gpl-armeabi-v7a.jar              prefix/armeabi-v7a/usr/local/lib/*.so
+zip -r encoders-gpl-x86.jar                      prefix/x86/usr/local/lib/*.so
+zip -r encoders-gpl-x86_64.jar                   prefix/x86_64/usr/local/lib/*.so
 
-mkdir -p ../../../../../../../../../../output
-
-cp *.jar ../../../../../../../../../../output
+zip -r debug-symbols-encoders-gpl.zip prefix/*
 
 md5sum *.jar
-
-cd ../../../../../../../../..
-
-# --------------------------------------------------
-
-zip -r debug-symbols-encoders-gpl.zip prefix/*/lib
-cp debug-symbols-encoders-gpl.zip ../output
diff --git a/buildscripts/bundle_full.sh b/buildscripts/bundle_full.sh
index 8c1222d..e204ce3 100644
--- a/buildscripts/bundle_full.sh
+++ b/buildscripts/bundle_full.sh
@@ -30,27 +30,18 @@ sudo chmod +x gradlew
 
 unzip -o app/build/outputs/apk/release/app-release.apk -d app/build/outputs/apk/release
 
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/arm64-v8a/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/arm64-v8a"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/armeabi-v7a/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/armeabi-v7a"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/x86/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/x86"
-ln -sf "$(pwd)/app/build/outputs/apk/release/lib/x86_64/libmediakitandroidhelper.so" "../../../libmpv/src/main/jniLibs/x86_64"
+cp app/build/outputs/apk/release/lib/arm64-v8a/libmediakitandroidhelper.so      ../../prefix/arm64-v8a/usr/local/lib
+cp app/build/outputs/apk/release/lib/armeabi-v7a/libmediakitandroidhelper.so    ../../prefix/armeabi-v7a/usr/local/lib
+cp app/build/outputs/apk/release/lib/x86/libmediakitandroidhelper.so            ../../prefix/x86/usr/local/lib
+cp app/build/outputs/apk/release/lib/x86_64/libmediakitandroidhelper.so         ../../prefix/x86_64/usr/local/lib
 
 cd ../..
 
-zip -r "full-arm64-v8a.jar"                lib/arm64-v8a
-zip -r "full-armeabi-v7a.jar"              lib/armeabi-v7a
-zip -r "full-x86.jar"                      lib/x86
-zip -r "full-x86_64.jar"                   lib/x86_64
+zip -r full-arm64-v8a.jar                prefix/arm64-v8a/usr/local/lib/*.so
+zip -r full-armeabi-v7a.jar              prefix/armeabi-v7a/usr/local/lib/*.so
+zip -r full-x86.jar                      prefix/x86/usr/local/lib/*.so
+zip -r full-x86_64.jar                   prefix/x86_64/usr/local/lib/*.so
 
-mkdir -p ../../../../../../../../../../output
-
-cp *.jar ../../../../../../../../../../output
+zip -r debug-symbols-full.zip prefix/*
 
 md5sum *.jar
-
-cd ../../../../../../../../..
-
-# --------------------------------------------------
-
-zip -r debug-symbols-full.zip prefix/*/lib
-cp debug-symbols-full.zip ../output