diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java
index 7270468d9..3dbb40caa 100644
--- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java
+++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java
@@ -33,7 +33,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.kiwix.kiwixmobile.KiwixApplication;
 import org.kiwix.kiwixmobile.R;
-import org.kiwix.kiwixmobile.ZimContentProvider;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.di.components.DaggerTestComponent;
 import org.kiwix.kiwixmobile.di.components.TestComponent;
 import org.kiwix.kiwixmobile.di.modules.ApplicationModule;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ee2c4011b..acf451343 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -156,7 +156,7 @@
     <activity android:name=".bookmark.BookmarksActivity" />
 
     <provider
-      android:name=".ZimContentProvider"
+      android:name=".data.ZimContentProvider"
       android:authorities="${applicationId}.zim.base"
       android:exported="true" />
 
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixErrorActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixErrorActivity.java
index b8382cabb..117033ff7 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixErrorActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixErrorActivity.java
@@ -11,6 +11,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 
 import org.kiwix.kiwixmobile.base.BaseActivity;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.data.local.dao.BookDao;
 import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity;
 import org.kiwix.kiwixmobile.utils.SplashActivity;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarksPresenter.java b/app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarksPresenter.java
index a52607422..ce83a210c 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarksPresenter.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarksPresenter.java
@@ -17,8 +17,8 @@
  */
 package org.kiwix.kiwixmobile.bookmark;
 
-import org.kiwix.kiwixmobile.ZimContentProvider;
 import org.kiwix.kiwixmobile.base.BasePresenter;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.data.local.dao.BookmarksDao;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java b/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java
similarity index 99%
rename from app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java
rename to app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java
index f9ed5f72d..08ec4be03 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.kiwix.kiwixmobile;
+package org.kiwix.kiwixmobile.data;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -36,6 +36,8 @@ import org.kiwix.kiwixlib.JNIKiwixReader;
 import org.kiwix.kiwixlib.JNIKiwixSearcher;
 import org.kiwix.kiwixlib.JNIKiwixString;
 import org.kiwix.kiwixlib.Pair;
+import org.kiwix.kiwixmobile.BuildConfig;
+import org.kiwix.kiwixmobile.KiwixApplication;
 import org.kiwix.kiwixmobile.main.MainActivity;
 import org.kiwix.kiwixmobile.utils.files.FileUtils;
 
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java b/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
index 16e2b2b73..e0e4c8ed1 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
@@ -26,7 +26,7 @@ import com.yahoo.squidb.data.SquidDatabase;
 import com.yahoo.squidb.data.adapter.SQLiteDatabaseWrapper;
 import com.yahoo.squidb.sql.Table;
 
-import org.kiwix.kiwixmobile.ZimContentProvider;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.data.local.dao.BookmarksDao;
 import org.kiwix.kiwixmobile.data.local.entity.BookDatabaseEntity;
 import org.kiwix.kiwixmobile.data.local.entity.Bookmarks;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/data/local/dao/RecentSearchDao.java b/app/src/main/java/org/kiwix/kiwixmobile/data/local/dao/RecentSearchDao.java
index 15ecbc670..349259c09 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/data/local/dao/RecentSearchDao.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/data/local/dao/RecentSearchDao.java
@@ -20,7 +20,7 @@ package org.kiwix.kiwixmobile.data.local.dao;
 import com.yahoo.squidb.data.SquidCursor;
 import com.yahoo.squidb.sql.Query;
 
-import org.kiwix.kiwixmobile.ZimContentProvider;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.data.local.KiwixDatabase;
 import org.kiwix.kiwixmobile.data.local.entity.RecentSearch;
 
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/components/ApplicationComponent.java b/app/src/main/java/org/kiwix/kiwixmobile/di/components/ApplicationComponent.java
index b727699f7..4b7e0798e 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/di/components/ApplicationComponent.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/di/components/ApplicationComponent.java
@@ -18,8 +18,8 @@
 package org.kiwix.kiwixmobile.di.components;
 
 import org.kiwix.kiwixmobile.KiwixApplication;
-import org.kiwix.kiwixmobile.ZimContentProvider;
 import org.kiwix.kiwixmobile.base.BaseFragment;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.di.modules.ApplicationModule;
 import org.kiwix.kiwixmobile.di.modules.JNIModule;
 import org.kiwix.kiwixmobile.di.modules.NetworkModule;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixTextToSpeech.java b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixTextToSpeech.java
index e9e09d994..32223fb38 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixTextToSpeech.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixTextToSpeech.java
@@ -32,7 +32,7 @@ import android.webkit.WebView;
 import android.widget.Toast;
 
 import org.kiwix.kiwixmobile.R;
-import org.kiwix.kiwixmobile.ZimContentProvider;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.utils.LanguageUtils;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java
index 8fbdd00c6..66083b1a6 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java
@@ -30,7 +30,7 @@ import android.widget.TextView;
 
 import org.kiwix.kiwixmobile.BuildConfig;
 import org.kiwix.kiwixmobile.R;
-import org.kiwix.kiwixmobile.ZimContentProvider;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.utils.StyleUtils;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index bf2669aae..0291e2aba 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -79,9 +79,9 @@ import android.widget.Toast;
 import org.json.JSONArray;
 import org.kiwix.kiwixmobile.BuildConfig;
 import org.kiwix.kiwixmobile.R;
-import org.kiwix.kiwixmobile.ZimContentProvider;
 import org.kiwix.kiwixmobile.base.BaseActivity;
 import org.kiwix.kiwixmobile.bookmark.BookmarksActivity;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.data.local.dao.BookmarksDao;
 import org.kiwix.kiwixmobile.search.SearchActivity;
 import org.kiwix.kiwixmobile.settings.KiwixSettingsActivity;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/search/AutoCompleteAdapter.java b/app/src/main/java/org/kiwix/kiwixmobile/search/AutoCompleteAdapter.java
index 57656de70..09feaceab 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/search/AutoCompleteAdapter.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/search/AutoCompleteAdapter.java
@@ -29,7 +29,7 @@ import android.widget.TextView;
 import org.kiwix.kiwixlib.JNIKiwix;
 import org.kiwix.kiwixlib.JNIKiwixSearcher;
 import org.kiwix.kiwixmobile.KiwixApplication;
-import org.kiwix.kiwixmobile.ZimContentProvider;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.utils.SharedPreferenceUtil;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/files/FileSearch.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/files/FileSearch.java
index ace5b4906..755185f65 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/utils/files/FileSearch.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/files/FileSearch.java
@@ -27,7 +27,7 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.util.Log;
 
-import org.kiwix.kiwixmobile.ZimContentProvider;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity;
 
 import java.io.File;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java
index 3fd320723..f29158d2f 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java
@@ -42,8 +42,8 @@ import android.widget.Toast;
 
 import org.kiwix.kiwixmobile.KiwixApplication;
 import org.kiwix.kiwixmobile.R;
-import org.kiwix.kiwixmobile.ZimContentProvider;
 import org.kiwix.kiwixmobile.base.BaseFragment;
+import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.data.local.dao.BookDao;
 import org.kiwix.kiwixmobile.library.LibraryAdapter;
 import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity;