diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..15f02b0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.gradle
+local.properties
+build
diff --git a/android-kiwix-lib-publisher/.gitignore b/android-kiwix-lib-publisher/.gitignore
deleted file mode 100644
index 2b75303..0000000
--- a/android-kiwix-lib-publisher/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
diff --git a/android-kiwix-lib-publisher/kiwixLibAndroid/.gitignore b/android-kiwix-lib-publisher/kiwixLibAndroid/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle b/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
deleted file mode 100644
index 25cc67f..0000000
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
+++ /dev/null
@@ -1,64 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
-android {
-    compileSdkVersion 28
-    defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
-}
-
-task writePom {
-  pom {
-    project {
-        groupId 'org.kiwix.kiwixlib'
-        artifactId 'kiwixlib'
-        version '10.1.1' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
-        packaging 'aar'
-        name 'kiwixlib'
-        url 'https://github.com/kiwix/libkiwix'
-        licenses {
-            license {
-                name 'GPLv3'
-                url 'https://www.gnu.org/licenses/gpl-3.0.en.html'
-            }
-        }
-      developers {
-          developer {
-              id 'kiwix'
-              name 'kiwix'
-              email 'contact@kiwix.org'
-          }
-      }
-      scm {
-          connection 'https://github.com/kiwix/libkiwix.git'
-          developerConnection 'https://github.com/kiwix/libkiwix.git'
-          url 'https://github.com/kiwix/libkiwix'
-      }
-    }
-  }.withXml {
-    def dependenciesNode = asNode().appendNode('dependencies')
-
-    //Iterate over the implementation dependencies, adding a <dependency> node for each
-    configurations.implementation.allDependencies.each {
-      def dependencyNode = dependenciesNode.appendNode('dependency')
-      dependencyNode.appendNode('groupId', it.group)
-      dependencyNode.appendNode('artifactId', it.name)
-      dependencyNode.appendNode('version', it.version)
-    }
-  }.writeTo("$buildDir/pom.xml")
-}
-
diff --git a/android-kiwix-lib-publisher/kiwixLibAndroid/proguard-rules.pro b/android-kiwix-lib-publisher/kiwixLibAndroid/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/android-kiwix-lib-publisher/kiwixLibAndroid/src/main/AndroidManifest.xml b/android-kiwix-lib-publisher/kiwixLibAndroid/src/main/AndroidManifest.xml
deleted file mode 100644
index e9b809a..0000000
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.kiwix.kiwixlib">
-
-    <application
-        android:allowBackup="true"
-        android:supportsRtl="true">
-
-    </application>
-
-</manifest>
diff --git a/android-kiwix-lib-publisher/build.gradle b/build.gradle
similarity index 100%
rename from android-kiwix-lib-publisher/build.gradle
rename to build.gradle
diff --git a/android-kiwix-lib-publisher/gradle.properties b/gradle.properties
similarity index 100%
rename from android-kiwix-lib-publisher/gradle.properties
rename to gradle.properties
diff --git a/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/android-kiwix-lib-publisher/gradlew b/gradlew
similarity index 100%
rename from android-kiwix-lib-publisher/gradlew
rename to gradlew
diff --git a/android-kiwix-lib-publisher/gradlew.bat b/gradlew.bat
similarity index 100%
rename from android-kiwix-lib-publisher/gradlew.bat
rename to gradlew.bat
diff --git a/src/wrapper/java/book.cpp b/lib/src/main/cpp/book.cpp
similarity index 100%
rename from src/wrapper/java/book.cpp
rename to lib/src/main/cpp/book.cpp
diff --git a/src/wrapper/java/filter.cpp b/lib/src/main/cpp/filter.cpp
similarity index 100%
rename from src/wrapper/java/filter.cpp
rename to lib/src/main/cpp/filter.cpp
diff --git a/src/wrapper/java/kiwixicu.cpp b/lib/src/main/cpp/kiwixicu.cpp
similarity index 100%
rename from src/wrapper/java/kiwixicu.cpp
rename to lib/src/main/cpp/kiwixicu.cpp
diff --git a/src/wrapper/java/kiwixreader.cpp b/lib/src/main/cpp/kiwixreader.cpp
similarity index 100%
rename from src/wrapper/java/kiwixreader.cpp
rename to lib/src/main/cpp/kiwixreader.cpp
diff --git a/src/wrapper/java/kiwixsearcher.cpp b/lib/src/main/cpp/kiwixsearcher.cpp
similarity index 100%
rename from src/wrapper/java/kiwixsearcher.cpp
rename to lib/src/main/cpp/kiwixsearcher.cpp
diff --git a/src/wrapper/java/kiwixserver.cpp b/lib/src/main/cpp/kiwixserver.cpp
similarity index 100%
rename from src/wrapper/java/kiwixserver.cpp
rename to lib/src/main/cpp/kiwixserver.cpp
diff --git a/src/wrapper/java/library.cpp b/lib/src/main/cpp/library.cpp
similarity index 100%
rename from src/wrapper/java/library.cpp
rename to lib/src/main/cpp/library.cpp
diff --git a/src/wrapper/java/manager.cpp b/lib/src/main/cpp/manager.cpp
similarity index 100%
rename from src/wrapper/java/manager.cpp
rename to lib/src/main/cpp/manager.cpp
diff --git a/src/wrapper/java/meson.build b/lib/src/main/cpp/meson.build
similarity index 100%
rename from src/wrapper/java/meson.build
rename to lib/src/main/cpp/meson.build
diff --git a/src/wrapper/java/utils.h b/lib/src/main/cpp/utils.h
similarity index 100%
rename from src/wrapper/java/utils.h
rename to lib/src/main/cpp/utils.h
diff --git a/src/wrapper/java/AndroidManifest.xml b/lib/src/main/java/AndroidManifest.xml
similarity index 100%
rename from src/wrapper/java/AndroidManifest.xml
rename to lib/src/main/java/AndroidManifest.xml
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/Book.java b/lib/src/main/java/org/kiwix/kiwixlib/Book.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/Book.java
rename to lib/src/main/java/org/kiwix/kiwixlib/Book.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java b/lib/src/main/java/org/kiwix/kiwixlib/DirectAccessInfo.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
rename to lib/src/main/java/org/kiwix/kiwixlib/DirectAccessInfo.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/Filter.java b/lib/src/main/java/org/kiwix/kiwixlib/Filter.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/Filter.java
rename to lib/src/main/java/org/kiwix/kiwixlib/Filter.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIICU.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIICU.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIICU.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIICU.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwix.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwix.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIKiwix.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIKiwix.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixBool.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixBool.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixException.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixException.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixException.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixException.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixInt.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixInt.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixInt.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixInt.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixReader.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixReader.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixServer.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixServer.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixString.java b/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixString.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixString.java
rename to lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixString.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/Library.java b/lib/src/main/java/org/kiwix/kiwixlib/Library.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/Library.java
rename to lib/src/main/java/org/kiwix/kiwixlib/Library.java
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/Manager.java b/lib/src/main/java/org/kiwix/kiwixlib/Manager.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/kiwixlib/Manager.java
rename to lib/src/main/java/org/kiwix/kiwixlib/Manager.java
diff --git a/src/wrapper/java/org/kiwix/testing/catalog.xml b/lib/src/main/java/org/kiwix/testing/catalog.xml
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/catalog.xml
rename to lib/src/main/java/org/kiwix/testing/catalog.xml
diff --git a/src/wrapper/java/org/kiwix/testing/compile_and_run_test.sh b/lib/src/main/java/org/kiwix/testing/compile_and_run_test.sh
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/compile_and_run_test.sh
rename to lib/src/main/java/org/kiwix/testing/compile_and_run_test.sh
diff --git a/src/wrapper/java/org/kiwix/testing/create_test_zimfiles b/lib/src/main/java/org/kiwix/testing/create_test_zimfiles
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/create_test_zimfiles
rename to lib/src/main/java/org/kiwix/testing/create_test_zimfiles
diff --git a/src/wrapper/java/org/kiwix/testing/hamcrest-core-1.3.jar b/lib/src/main/java/org/kiwix/testing/hamcrest-core-1.3.jar
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/hamcrest-core-1.3.jar
rename to lib/src/main/java/org/kiwix/testing/hamcrest-core-1.3.jar
diff --git a/src/wrapper/java/org/kiwix/testing/junit-4.13.jar b/lib/src/main/java/org/kiwix/testing/junit-4.13.jar
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/junit-4.13.jar
rename to lib/src/main/java/org/kiwix/testing/junit-4.13.jar
diff --git a/src/wrapper/java/org/kiwix/testing/small.zim b/lib/src/main/java/org/kiwix/testing/small.zim
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/small.zim
rename to lib/src/main/java/org/kiwix/testing/small.zim
diff --git a/src/wrapper/java/org/kiwix/testing/small.zim.embedded b/lib/src/main/java/org/kiwix/testing/small.zim.embedded
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/small.zim.embedded
rename to lib/src/main/java/org/kiwix/testing/small.zim.embedded
diff --git a/src/wrapper/java/org/kiwix/testing/small_zimfile_data/favicon.png b/lib/src/main/java/org/kiwix/testing/small_zimfile_data/favicon.png
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/small_zimfile_data/favicon.png
rename to lib/src/main/java/org/kiwix/testing/small_zimfile_data/favicon.png
diff --git a/src/wrapper/java/org/kiwix/testing/small_zimfile_data/main.html b/lib/src/main/java/org/kiwix/testing/small_zimfile_data/main.html
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/small_zimfile_data/main.html
rename to lib/src/main/java/org/kiwix/testing/small_zimfile_data/main.html
diff --git a/src/wrapper/java/org/kiwix/testing/test.java b/lib/src/main/java/org/kiwix/testing/test.java
similarity index 100%
rename from src/wrapper/java/org/kiwix/testing/test.java
rename to lib/src/main/java/org/kiwix/testing/test.java
diff --git a/src/wrapper/java/res/values/strings.xml b/lib/src/main/java/res/values/strings.xml
similarity index 100%
rename from src/wrapper/java/res/values/strings.xml
rename to lib/src/main/java/res/values/strings.xml
diff --git a/android-kiwix-lib-publisher/settings.gradle b/settings.gradle
similarity index 100%
rename from android-kiwix-lib-publisher/settings.gradle
rename to settings.gradle