diff --git a/app/build.gradle b/app/build.gradle
index d48433c..5f1d0fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -187,6 +187,7 @@ dependencies {
     implementation 'androidx.browser:browser:1.3.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation project(path: ':torrentStream')
+    implementation project(path: ':frostwire-jlibtorrent')
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/frostwire-jlibtorrent/src/main/java/com/frostwire/jlibtorrent/swig/add_piece_flags_t.java b/frostwire-jlibtorrent/src/main/java/com/frostwire/jlibtorrent/swig/add_piece_flags_t.java
index e13626d..7dc4bb1 100644
--- a/frostwire-jlibtorrent/src/main/java/com/frostwire/jlibtorrent/swig/add_piece_flags_t.java
+++ b/frostwire-jlibtorrent/src/main/java/com/frostwire/jlibtorrent/swig/add_piece_flags_t.java
@@ -9,26 +9,18 @@
 package com.frostwire.jlibtorrent.swig;
 
 public class add_piece_flags_t {
-  protected transient boolean swigCMemOwn;
   private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
 
   protected add_piece_flags_t(long cPtr, boolean cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
     swigCPtr = cPtr;
   }
 
-  public add_piece_flags_t() {
-    this(libtorrent_jni.new_add_piece_flags_t(), true);
-  }
-
   protected static long getCPtr(add_piece_flags_t obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  public static add_piece_flags_t all() {
-    return new add_piece_flags_t(libtorrent_jni.add_piece_flags_t_all(), true);
-  }
-
   @SuppressWarnings("deprecation")
   protected void finalize() {
     delete();
@@ -44,6 +36,10 @@ public class add_piece_flags_t {
     }
   }
 
+  public add_piece_flags_t() {
+    this(libtorrent_jni.new_add_piece_flags_t(), true);
+  }
+
   public boolean nonZero() {
     return libtorrent_jni.add_piece_flags_t_nonZero(swigCPtr, this);
   }
@@ -76,4 +72,8 @@ public class add_piece_flags_t {
     return libtorrent_jni.add_piece_flags_t_to_int(swigCPtr, this);
   }
 
+  public static add_piece_flags_t all() {
+    return new add_piece_flags_t(libtorrent_jni.add_piece_flags_t_all(), true);
+  }
+
 }
diff --git a/frostwire-jlibtorrent/swig/build-android-arm.sh b/frostwire-jlibtorrent/swig/build-android-arm.sh
index 35200f6..d0df643 100755
--- a/frostwire-jlibtorrent/swig/build-android-arm.sh
+++ b/frostwire-jlibtorrent/swig/build-android-arm.sh
@@ -25,15 +25,15 @@ export PATH=$ANDROID_TOOLCHAIN/arm-linux-androideabi/bin:$PATH;
 sed -i 's/RANLIB = ranlib/RANLIB = "${ANDROID_TOOLCHAIN}\/bin\/arm-linux-androideabi-ranlib"/g' ${BOOST_ROOT}/tools/build/src/tools/gcc.jam;
 create_folder_if_it_doesnt_exist ${SRC}
 
-FILE=../../torrentStream/src/main/jnLibs/${os_arch}eabi-v7a/${SHARED_LIB}
+FILE=../../torrentStream/src/main/jniLibs/${os_arch}eabi-v7a/${SHARED_LIB}
 if [ -f "$FILE" ]; then
     echo "${SHARED_LIB} exists for ${os_arch}eabi-v7a"
 else
     FILE2=bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB}
     if [ -f "$FILE2" ]; then
         cd ..
-        mkdir -p ../torrentStream/src/main/jnLibs/${os_arch}eabi-v7a
-        cp swig/bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}eabi-v7a/
+        mkdir -p ../torrentStream/src/main/jniLibs/${os_arch}eabi-v7a
+        cp swig/bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB} ../torrentStream/src/main/jniLibs/${os_arch}eabi-v7a/
         cd swig || exit
     else
         prompt_msg "About to prepare BOOST ${BOOST_VERSION}"
@@ -45,8 +45,8 @@ else
         ./run-swig.sh
         build_libraries
         cd ..
-        mkdir -p ../torrentStream/src/main/jnLibs/${os_arch}eabi-v7a
-        cp swig/bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}eabi-v7a/
+        mkdir -p ../torrentStream/src/main/jniLibs/${os_arch}eabi-v7a
+        cp swig/bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB} ../torrentStream/src/main/jniLibs/${os_arch}eabi-v7a/
         cd swig || exit
     fi
 fi
diff --git a/frostwire-jlibtorrent/swig/build-android-arm64.sh b/frostwire-jlibtorrent/swig/build-android-arm64.sh
index cd2d513..f12684b 100755
--- a/frostwire-jlibtorrent/swig/build-android-arm64.sh
+++ b/frostwire-jlibtorrent/swig/build-android-arm64.sh
@@ -26,15 +26,15 @@ sed -i 's/RANLIB = ranlib/RANLIB = "${ANDROID_TOOLCHAIN}\/bin\/aarch64-linux-and
 create_folder_if_it_doesnt_exist ${SRC}
 
 
-FILE=../../torrentStream/src/main/jnLibs/${os_arch}-v8a/${SHARED_LIB}
+FILE=../../torrentStream/src/main/jniLibs/${os_arch}-v8a/${SHARED_LIB}
 if [ -f "$FILE" ]; then
     echo "${SHARED_LIB} exists for ${os_arch}-v8a"
 else
     FILE2=bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB}
     if [ -f "$FILE2" ]; then
         cd ..
-        mkdir -p ../torrentStream/src/main/jnLibs/${os_arch}-v8a
-        cp swig/bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}-v8a/
+        mkdir -p ../torrentStream/src/main/jniLibs/${os_arch}-v8a
+        cp swig/bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB} ../torrentStream/src/main/jniLibs/${os_arch}-v8a/
         cd swig || exit
     else
         prompt_msg "About to prepare BOOST ${BOOST_VERSION}"
@@ -46,8 +46,8 @@ else
         ./run-swig.sh
         build_libraries
         cd ..
-        mkdir -p ../torrentStream/src/main/jnLibs/${os_arch}-v8a
-        cp swig/bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}-v8a/
+        mkdir -p ../torrentStream/src/main/jniLibs/${os_arch}-v8a
+        cp swig/bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB} ../torrentStream/src/main/jniLibs/${os_arch}-v8a/
         cd swig || exit
     fi
 fi
\ No newline at end of file
diff --git a/frostwire-jlibtorrent/swig/build-android-x86.sh b/frostwire-jlibtorrent/swig/build-android-x86.sh
index e8c4035..7916a4e 100755
--- a/frostwire-jlibtorrent/swig/build-android-x86.sh
+++ b/frostwire-jlibtorrent/swig/build-android-x86.sh
@@ -25,15 +25,15 @@ sed -i 's/RANLIB = ranlib/RANLIB = "${ANDROID_TOOLCHAIN}\/bin\/i686-linux-androi
 create_folder_if_it_doesnt_exist ${SRC}
 
 
-FILE=../../torrentStream/src/main/jnLibs/${os_arch}/${SHARED_LIB}
+FILE=../../torrentStream/src/main/jniLibs/${os_arch}/${SHARED_LIB}
 if [ -f "$FILE" ]; then
     echo "${SHARED_LIB} exists for ${os_arch}"
 else
     FILE2=bin/release/${os_build}/${os_arch}/${SHARED_LIB}
     if [ -f "$FILE2" ]; then
         cd ..
-        mkdir -p ../torrentStream/src/main/jnLibs/${os_arch}
-        cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}/
+        mkdir -p ../torrentStream/src/main/jniLibs/${os_arch}
+        cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} ../torrentStream/src/main/jniLibs/${os_arch}/
         cd swig || exit
     else
         prompt_msg "About to prepare BOOST ${BOOST_VERSION}"
@@ -49,8 +49,8 @@ else
         build_libraries
 
         cd ..
-        mkdir -p ../torrentStream/src/main/jnLibs/${os_arch}
-        cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}/
+        mkdir -p ../torrentStream/src/main/jniLibs/${os_arch}
+        cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} ../torrentStream/src/main/jniLibs/${os_arch}/
         cd swig || exit
     fi
 fi
diff --git a/frostwire-jlibtorrent/swig/build-android-x86_64.sh b/frostwire-jlibtorrent/swig/build-android-x86_64.sh
index 7767c56..d54deff 100755
--- a/frostwire-jlibtorrent/swig/build-android-x86_64.sh
+++ b/frostwire-jlibtorrent/swig/build-android-x86_64.sh
@@ -26,15 +26,15 @@ create_folder_if_it_doesnt_exist ${SRC}
 
 
 
-FILE=../../torrentStream/src/main/jnLibs/${os_arch}/${SHARED_LIB}
+FILE=../../torrentStream/src/main/jniLibs/${os_arch}/${SHARED_LIB}
 if [ -f "$FILE" ]; then
     echo "${SHARED_LIB} exists for ${os_arch}"
 else
     FILE2=bin/release/${os_build}/${os_arch}/${SHARED_LIB}
     if [ -f "$FILE2" ]; then
         cd ..
-        mkdir -p ../torrentStream/src/main/jnLibs/${os_arch}
-        cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}/
+        mkdir -p ../torrentStream/src/main/jniLibs/${os_arch}
+        cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} ../torrentStream/src/main/jniLibs/${os_arch}/
         cd swig || exit
     else
         prompt_msg "About to prepare BOOST ${BOOST_VERSION}"
@@ -49,8 +49,8 @@ else
         build_libraries
 
         cd ..
-        mkdir -p ../torrentStream/src/main/jnLibs/${os_arch}
-        cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}/
+        mkdir -p ../torrentStream/src/main/jniLibs/${os_arch}
+        cp swig/bin/release/${os_build}/${os_arch}/${SHARED_LIB} ../torrentStream/src/main/jniLibs/${os_arch}/
         cd swig || exit
     fi
 fi
diff --git a/torrentStream/.gitignore b/torrentStream/.gitignore
index 796b96d..61e6a53 100644
--- a/torrentStream/.gitignore
+++ b/torrentStream/.gitignore
@@ -1 +1,5 @@
 /build
+!/src/main/jniLibs/x86_64/libjlibtorrent.so
+!/src/main/jniLibs/arm64-v8a/libjlibtorrent.so
+!/src/main/jniLibs/x86/libjlibtorrent.so
+!/src/main/jniLibs/armeabi-v7a/libjlibtorrent.so
diff --git a/torrentStream/build.gradle b/torrentStream/build.gradle
index 3350949..5b57590 100644
--- a/torrentStream/build.gradle
+++ b/torrentStream/build.gradle
@@ -28,11 +28,6 @@ android {
         minSdkVersion 15
         targetSdkVersion 30
     }
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ["src/main/jnLibs"]
-        }
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -71,4 +66,5 @@ clean {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation project(path: ':frostwire-jlibtorrent')
 }
\ No newline at end of file