diff --git a/lib/src/main/cpp/book.cpp b/lib/src/main/cpp/book.cpp
index 238f490..e766abf 100644
--- a/lib/src/main/cpp/book.cpp
+++ b/lib/src/main/cpp/book.cpp
@@ -19,7 +19,7 @@
 
 
 #include <jni.h>
-#include "org_kiwix_kiwixlib_Book.h"
+#include "org_kiwix_libkiwix_Book.h"
 
 #include "utils.h"
 #include "book.h"
diff --git a/lib/src/main/cpp/filter.cpp b/lib/src/main/cpp/filter.cpp
index 09c0734..b3b5113 100644
--- a/lib/src/main/cpp/filter.cpp
+++ b/lib/src/main/cpp/filter.cpp
@@ -19,7 +19,7 @@
 
 
 #include <jni.h>
-#include "org_kiwix_kiwixlib_Filter.h"
+#include "org_kiwix_libkiwix_Filter.h"
 
 #include "library.h"
 #include "utils.h"
diff --git a/lib/src/main/cpp/kiwixicu.cpp b/lib/src/main/cpp/kiwixicu.cpp
index a10b578..e5ecb46 100644
--- a/lib/src/main/cpp/kiwixicu.cpp
+++ b/lib/src/main/cpp/kiwixicu.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <jni.h>
-#include "org_kiwix_kiwixlib_JNIICU.h"
+#include "org_kiwix_libkiwix_JNIICU.h"
 
 #include <iostream>
 #include <string>
diff --git a/lib/src/main/cpp/kiwixserver.cpp b/lib/src/main/cpp/kiwixserver.cpp
index 830fdc6..f9437c5 100644
--- a/lib/src/main/cpp/kiwixserver.cpp
+++ b/lib/src/main/cpp/kiwixserver.cpp
@@ -20,7 +20,7 @@
 
 
 #include <jni.h>
-#include "org_kiwix_kiwixlib_JNIKiwixServer.h"
+#include "org_kiwix_libkiwix_JNIKiwixServer.h"
 
 #include "tools/base64.h"
 #include "server.h"
diff --git a/lib/src/main/cpp/library.cpp b/lib/src/main/cpp/library.cpp
index f2a0846..9039db2 100644
--- a/lib/src/main/cpp/library.cpp
+++ b/lib/src/main/cpp/library.cpp
@@ -19,7 +19,7 @@
 
 
 #include <jni.h>
-#include "org_kiwix_kiwixlib_Library.h"
+#include "org_kiwix_libkiwix_Library.h"
 
 #include "library.h"
 #include "reader.h"
diff --git a/lib/src/main/cpp/manager.cpp b/lib/src/main/cpp/manager.cpp
index 4395609..0ca6dbc 100644
--- a/lib/src/main/cpp/manager.cpp
+++ b/lib/src/main/cpp/manager.cpp
@@ -19,7 +19,7 @@
 
 
 #include <jni.h>
-#include "org_kiwix_kiwixlib_Manager.h"
+#include "org_kiwix_libkiwix_Manager.h"
 
 #include "manager.h"
 #include "utils.h"
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/Book.java b/lib/src/main/java/org/kiwix/libkiwix/Book.java
similarity index 97%
rename from lib/src/main/java/org/kiwix/kiwixlib/Book.java
rename to lib/src/main/java/org/kiwix/libkiwix/Book.java
index 693e833..7961526 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/Book.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/Book.java
@@ -1,5 +1,5 @@
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 public class Book
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/DirectAccessInfo.java b/lib/src/main/java/org/kiwix/libkiwix/DirectAccessInfo.java
similarity index 96%
rename from lib/src/main/java/org/kiwix/kiwixlib/DirectAccessInfo.java
rename to lib/src/main/java/org/kiwix/libkiwix/DirectAccessInfo.java
index 4ba137d..157fb1d 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/DirectAccessInfo.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/DirectAccessInfo.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 public class DirectAccessInfo
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/Filter.java b/lib/src/main/java/org/kiwix/libkiwix/Filter.java
similarity index 98%
rename from lib/src/main/java/org/kiwix/kiwixlib/Filter.java
rename to lib/src/main/java/org/kiwix/libkiwix/Filter.java
index bf9e719..458856d 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/Filter.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/Filter.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 public class Filter
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIICU.java b/lib/src/main/java/org/kiwix/libkiwix/JNIICU.java
similarity index 97%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIICU.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIICU.java
index db8ba6e..f4ff419 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/JNIICU.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/JNIICU.java
@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 public class JNIICU
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwix.java b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwix.java
similarity index 94%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIKiwix.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIKiwix.java
index 57e148b..2d63938 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwix.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwix.java
@@ -18,11 +18,11 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 import android.content.Context;
 import com.getkeepsafe.relinker.ReLinker;
-import org.kiwix.kiwixlib.JNIICU;
+import org.kiwix.libkiwix.JNIICU;
 
 public class JNIKiwix
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixBool.java
similarity index 96%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIKiwixBool.java
index 74563d3..90ffa65 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixBool.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 public class JNIKiwixBool
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixException.java b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixException.java
similarity index 96%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixException.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIKiwixException.java
index dd0e214..da77973 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixException.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixException.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 public class JNIKiwixException extends Exception
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixInt.java b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixInt.java
similarity index 96%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixInt.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIKiwixInt.java
index a66c937..691424e 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixInt.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixInt.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 public class JNIKiwixInt
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixReader.java b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixReader.java
similarity index 100%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixReader.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIKiwixReader.java
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixSearcher.java
similarity index 100%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixSearcher.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIKiwixSearcher.java
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixServer.java b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixServer.java
similarity index 92%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixServer.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIKiwixServer.java
index 11c5f0d..df8e0eb 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixServer.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixServer.java
@@ -17,10 +17,10 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
-import org.kiwix.kiwixlib.JNIKiwixException;
-import org.kiwix.kiwixlib.Library;
+import org.kiwix.libkiwix.JNIKiwixException;
+import org.kiwix.libkiwix.Library;
 
 public class JNIKiwixServer
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixString.java b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixString.java
similarity index 97%
rename from lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixString.java
rename to lib/src/main/java/org/kiwix/libkiwix/JNIKiwixString.java
index 601fb9d..fd0e052 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/JNIKiwixString.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/JNIKiwixString.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
 public class JNIKiwixString
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/Library.java b/lib/src/main/java/org/kiwix/libkiwix/Library.java
similarity index 93%
rename from lib/src/main/java/org/kiwix/kiwixlib/Library.java
rename to lib/src/main/java/org/kiwix/libkiwix/Library.java
index 68aa7d2..60f3af6 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/Library.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/Library.java
@@ -17,10 +17,10 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
-import org.kiwix.kiwixlib.Book;
-import org.kiwix.kiwixlib.JNIKiwixException;
+import org.kiwix.libkiwix.Book;
+import org.kiwix.libkiwix.JNIKiwixException;
 
 public class Library
 {
diff --git a/lib/src/main/java/org/kiwix/kiwixlib/Manager.java b/lib/src/main/java/org/kiwix/libkiwix/Manager.java
similarity index 97%
rename from lib/src/main/java/org/kiwix/kiwixlib/Manager.java
rename to lib/src/main/java/org/kiwix/libkiwix/Manager.java
index 2772ca9..5ddbc08 100644
--- a/lib/src/main/java/org/kiwix/kiwixlib/Manager.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/Manager.java
@@ -17,9 +17,9 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixlib;
+package org.kiwix.libkiwix;
 
-import org.kiwix.kiwixlib.Library;
+import org.kiwix.libkiwix.Library;
 
 public class Manager
 {