diff --git a/app/src/main/java/foundation/e/apps/data/fused/ApplicationApi.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationApi.kt
similarity index 95%
rename from app/src/main/java/foundation/e/apps/data/fused/ApplicationApi.kt
rename to app/src/main/java/foundation/e/apps/data/application/ApplicationApi.kt
index 71368780327923470c98497c65de35d49f41f08f..0c821f28dc4a4bd48c95c4089eef7b1f6d4a1959 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/ApplicationApi.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationApi.kt
@@ -1,4 +1,4 @@
-package foundation.e.apps.data.fused
+package foundation.e.apps.data.application
 
 import androidx.lifecycle.LiveData
 import com.aurora.gplayapi.SearchSuggestEntry
@@ -11,10 +11,10 @@ import foundation.e.apps.data.enums.FilterLevel
 import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.data.Application
-import foundation.e.apps.data.fused.data.Category
-import foundation.e.apps.data.fused.data.Home
-import foundation.e.apps.data.fused.utils.CategoryType
+import foundation.e.apps.data.application.data.Application
+import foundation.e.apps.data.application.data.Category
+import foundation.e.apps.data.application.data.Home
+import foundation.e.apps.data.application.utils.CategoryType
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import retrofit2.Response
 
diff --git a/app/src/main/java/foundation/e/apps/data/fused/ApplicationApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationApiImpl.kt
similarity index 96%
rename from app/src/main/java/foundation/e/apps/data/fused/ApplicationApiImpl.kt
rename to app/src/main/java/foundation/e/apps/data/application/ApplicationApiImpl.kt
index 4e6afa0dd22a75caa175853db8655bec0dee360a..21d36bc31dfe96cae1af920b5b3b589d5d1ff51d 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/ApplicationApiImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationApiImpl.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused
+package foundation.e.apps.data.application
 
 import android.content.Context
 import android.text.format.Formatter
@@ -48,15 +48,15 @@ import foundation.e.apps.data.enums.Source
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.enums.Type
 import foundation.e.apps.data.enums.isUnFiltered
-import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_ANY
-import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_OPEN
-import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_PWA
-import foundation.e.apps.data.fused.data.Application
-import foundation.e.apps.data.fused.data.Category
-import foundation.e.apps.data.fused.data.Home
-import foundation.e.apps.data.fused.data.Ratings
-import foundation.e.apps.data.fused.utils.CategoryType
-import foundation.e.apps.data.fused.utils.CategoryUtils
+import foundation.e.apps.data.application.ApplicationApi.Companion.APP_TYPE_ANY
+import foundation.e.apps.data.application.ApplicationApi.Companion.APP_TYPE_OPEN
+import foundation.e.apps.data.application.ApplicationApi.Companion.APP_TYPE_PWA
+import foundation.e.apps.data.application.data.Application
+import foundation.e.apps.data.application.data.Category
+import foundation.e.apps.data.application.data.Home
+import foundation.e.apps.data.application.data.Ratings
+import foundation.e.apps.data.application.utils.CategoryType
+import foundation.e.apps.data.application.utils.CategoryUtils
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import foundation.e.apps.data.playstore.PlayStoreRepository
 import foundation.e.apps.data.handleNetworkResult
diff --git a/app/src/main/java/foundation/e/apps/data/fused/ApplicationInstaller.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationInstaller.kt
similarity index 87%
rename from app/src/main/java/foundation/e/apps/data/fused/ApplicationInstaller.kt
rename to app/src/main/java/foundation/e/apps/data/application/ApplicationInstaller.kt
index cb3cb1c7ee3429a936917a11d8de9b875908436f..29b10ee664220495fe44b02ec7145674532f148c 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/ApplicationInstaller.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationInstaller.kt
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused
+package foundation.e.apps.data.application
 
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 
 interface ApplicationInstaller {
 
diff --git a/app/src/main/java/foundation/e/apps/data/fused/ApplicationRepository.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt
similarity index 92%
rename from app/src/main/java/foundation/e/apps/data/fused/ApplicationRepository.kt
rename to app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt
index 41c0374164d3e23f93e54bc53c810137799474f3..e0b876a634ca85d4bc19511d304293fdba6e3a68 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/ApplicationRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused
+package foundation.e.apps.data.application
 
 import androidx.lifecycle.LiveData
 import com.aurora.gplayapi.SearchSuggestEntry
@@ -28,10 +28,10 @@ import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Source
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.data.Application
-import foundation.e.apps.data.fused.data.Category
-import foundation.e.apps.data.fused.data.Home
-import foundation.e.apps.data.fused.utils.CategoryType
+import foundation.e.apps.data.application.data.Application
+import foundation.e.apps.data.application.data.Category
+import foundation.e.apps.data.application.data.Home
+import foundation.e.apps.data.application.utils.CategoryType
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt b/app/src/main/java/foundation/e/apps/data/application/UpdatesDao.kt
similarity index 94%
rename from app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt
rename to app/src/main/java/foundation/e/apps/data/application/UpdatesDao.kt
index b21cefbc352a60ac28bd3fade18d93d0059e20de..e460f1a5de9b125194e4f0ebc8e7bfea5c917613 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/UpdatesDao.kt
@@ -15,9 +15,9 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused
+package foundation.e.apps.data.application
 
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 
 object UpdatesDao {
diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/Application.kt b/app/src/main/java/foundation/e/apps/data/application/data/Application.kt
similarity index 96%
rename from app/src/main/java/foundation/e/apps/data/fused/data/Application.kt
rename to app/src/main/java/foundation/e/apps/data/application/data/Application.kt
index 48a86c073e7da5690fce3daae453da194c04c1f8..d8a544060daf85e3f5feef3b898a5c3755f545c2 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/data/Application.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/data/Application.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused.data
+package foundation.e.apps.data.application.data
 
 import com.aurora.gplayapi.Constants.Restriction
 import foundation.e.apps.data.enums.FilterLevel
diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/Category.kt b/app/src/main/java/foundation/e/apps/data/application/data/Category.kt
similarity index 93%
rename from app/src/main/java/foundation/e/apps/data/fused/data/Category.kt
rename to app/src/main/java/foundation/e/apps/data/application/data/Category.kt
index 3beb69d40b57187002ed8a778a823cc68d7a4a58..85d4d5ab23aebc5d4cad751a2bfd42ebe87a3d27 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/data/Category.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/data/Category.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused.data
+package foundation.e.apps.data.application.data
 
 import foundation.e.apps.data.enums.AppTag
 import java.util.UUID
diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/Home.kt b/app/src/main/java/foundation/e/apps/data/application/data/Home.kt
similarity index 92%
rename from app/src/main/java/foundation/e/apps/data/fused/data/Home.kt
rename to app/src/main/java/foundation/e/apps/data/application/data/Home.kt
index 8585a07a52406e75fe8c774a02f9e8cdb6019f14..0dbe525f9463887b8ba2a1031b19d147f29a07c8 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/data/Home.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/data/Home.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused.data
+package foundation.e.apps.data.application.data
 
 data class Home(
     val title: String = String(),
diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt b/app/src/main/java/foundation/e/apps/data/application/data/Ratings.kt
similarity index 92%
rename from app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt
rename to app/src/main/java/foundation/e/apps/data/application/data/Ratings.kt
index 29f5bc87a4846bfb15e8afc8ef093b7d5c3b48cc..a8db122e75232ca3a55005b534925a7f19675f2f 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/data/Ratings.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused.data
+package foundation.e.apps.data.application.data
 
 data class Ratings(
     val privacyScore: Double = -1.0,
diff --git a/app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt b/app/src/main/java/foundation/e/apps/data/application/utils/CategoryUtils.kt
similarity index 96%
rename from app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt
rename to app/src/main/java/foundation/e/apps/data/application/utils/CategoryUtils.kt
index 5e31be48b0e85b1573300ffb1ff34b59d358842d..03960b9e42fa10160665a2c6b15e5314d910f8e0 100644
--- a/app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/utils/CategoryUtils.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.fused.utils
+package foundation.e.apps.data.application.utils
 
 import foundation.e.apps.R
 
diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt
index f314b03f3c6bde55756b55dfc5a806d8a7fd135a..906d9b2d0a17384ff555de8830d6f01756472513 100644
--- a/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt
+++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt
@@ -18,7 +18,7 @@
 
 package foundation.e.apps.data.cleanapk.data.app
 
-import foundation.e.apps.data.fused.data.Application as AppLoungeApplication
+import foundation.e.apps.data.application.data.Application as AppLoungeApplication
 
 data class Application(
     val app: AppLoungeApplication = AppLoungeApplication(),
diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt
index 4a0f30cfa9433bd70205fcf0e42fca7d594e7174..8e50e09c383b1ab92f15c25c3b7650a06a4e44dc 100644
--- a/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt
+++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt
@@ -19,7 +19,7 @@
 package foundation.e.apps.data.cleanapk.data.home
 
 import foundation.e.apps.data.enums.Origin
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 
 data class Home(
     val top_updated_apps: List<Application> = emptyList(),
diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt
index c8e37b215cb38f5c27afb2816f3ae7ff7ae1b155..41d0b4362fe81345e39c108453e8a9ad43f30543 100644
--- a/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt
+++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt
@@ -18,7 +18,7 @@
 
 package foundation.e.apps.data.cleanapk.data.search
 
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 
 data class Search(
     val apps: List<Application> = emptyList(),
diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt
index 935a040efb339f12f88f0289d33962417cd201cb..d3ba7254820320ec982a53a295ab6d155b31a6e1 100644
--- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt
@@ -25,7 +25,7 @@ import foundation.e.apps.data.exodus.Report
 import foundation.e.apps.data.exodus.Tracker
 import foundation.e.apps.data.exodus.TrackerDao
 import foundation.e.apps.data.exodus.models.AppPrivacyInfo
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.getResult
 import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL
 import foundation.e.apps.utils.getFormattedString
diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt
index d03f23f129ca69d98fba9da45b312354d5b55e91..564512d9d5589ed1ea95a9c131665dc66389241d 100644
--- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt
@@ -2,7 +2,7 @@ package foundation.e.apps.data.exodus.repositories
 
 import foundation.e.apps.data.Result
 import foundation.e.apps.data.exodus.models.AppPrivacyInfo
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 
 interface IAppPrivacyInfoRepository {
     suspend fun getAppPrivacyInfo(application: Application, appHandle: String): Result<AppPrivacyInfo>
diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepository.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepository.kt
index 11549bcf871bac7126c3e3301b45547d6e74072c..58b466b74a4a626a8c679fbd58278af95dcbf8cc 100644
--- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepository.kt
@@ -18,7 +18,7 @@
 
 package foundation.e.apps.data.exodus.repositories
 
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 
 interface PrivacyScoreRepository {
 
diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt
index b92c127eaf4d4a3a445f893b7d33d1737f604b62..91d0e3f12f1b713002d67fee6ce6efc9d7055ecb 100644
--- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt
@@ -18,7 +18,7 @@
 
 package foundation.e.apps.data.exodus.repositories
 
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.di.CommonUtilsModule
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt
index ae330067c42da78c705f2f508c40996ce3acb64e..337965d6682e25e26419d9fe5c3e54d2f462a6c9 100644
--- a/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt
@@ -21,7 +21,7 @@
 package foundation.e.apps.data.faultyApps
 
 import foundation.e.apps.OpenForTesting
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt
index cc34e1af3a30e67370b97f77786d8a38dd14eec8..978b36e0543f1173c0099de96499ee6bfd75fdc2 100644
--- a/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt
@@ -5,7 +5,7 @@ import foundation.e.apps.data.cleanapk.ApkSignatureManager
 import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.fdroid.models.BuildInfo
 import foundation.e.apps.data.fdroid.models.FdroidEntity
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt b/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt
index ba6a215f910c3e2ac19f8c49c42312c43802d96e..51bdaefabdfd3a7655c92ead9d22014b9b9492de 100644
--- a/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt
@@ -20,7 +20,7 @@ package foundation.e.apps.data.fdroid
 
 import android.content.Context
 import foundation.e.apps.data.fdroid.models.FdroidEntity
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 
 interface IFdroidRepository {
     /**
diff --git a/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt
index 10470199c27d16add31510a45c518eff96bf9308..5134c117d399ac4c4035754816eec880b06b9dfa 100644
--- a/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.LiveData
 import foundation.e.apps.OpenForTesting
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.fdroid.FdroidRepository
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import foundation.e.apps.install.download.data.DownloadProgress
 import foundation.e.apps.install.workmanager.InstallWorkManager
diff --git a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
index 5f82c8e531dfe5f1bcc4a00dc3f66cdc49f6377c..50480c04e5915be98cf7519230a5ca7017929153 100644
--- a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
@@ -24,7 +24,7 @@ import com.aurora.gplayapi.data.models.Category
 import com.aurora.gplayapi.data.models.File
 import com.aurora.gplayapi.data.models.SearchBundle
 import foundation.e.apps.data.StoreRepository
-import foundation.e.apps.data.fused.utils.CategoryType
+import foundation.e.apps.data.application.utils.CategoryType
 
 interface PlayStoreRepository : StoreRepository {
     suspend fun getSearchResult(query: String, subBundle: MutableSet<SearchBundle.SubBundle>?): Pair<List<App>, MutableSet<SearchBundle.SubBundle>>
diff --git a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt
index 96c35cf8d81b0f89f98e564940bbd1376265eb4f..63a467e92bba59fb25e1f16ae407080c7cd8c254 100644
--- a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt
@@ -35,7 +35,7 @@ import com.aurora.gplayapi.helpers.SearchHelper
 import com.aurora.gplayapi.helpers.TopChartsHelper
 import dagger.hilt.android.qualifiers.ApplicationContext
 import foundation.e.apps.R
-import foundation.e.apps.data.fused.utils.CategoryType
+import foundation.e.apps.data.application.utils.CategoryType
 import foundation.e.apps.data.playstore.utils.GPlayHttpClient
 import foundation.e.apps.data.login.AuthenticatorRepository
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt
index f2c5eb397dade2c67cd2e0220b7b8956e99c06da..5367ffe3d7b7e7c9fc0fea9f16c36f01a891b8b7 100644
--- a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt
@@ -30,9 +30,9 @@ import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.enums.isUnFiltered
 import foundation.e.apps.data.faultyApps.FaultyAppRepository
 import foundation.e.apps.data.fdroid.FdroidRepository
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_ANY
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.ApplicationApi.Companion.APP_TYPE_ANY
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.preference.PreferenceManagerModule
 import foundation.e.apps.install.pkg.PkgManagerModule
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt
index 0d9aa3d1db26a40a8d98a5cfe8e2102fe2e2c492..7e030148cba5bad60bbad84259e3330673416214 100644
--- a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt
@@ -20,8 +20,8 @@ package foundation.e.apps.data.updates
 
 import com.aurora.gplayapi.data.models.AuthData
 import foundation.e.apps.data.enums.ResultStatus
-import foundation.e.apps.data.fused.UpdatesDao
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.UpdatesDao
+import foundation.e.apps.data.application.data.Application
 import javax.inject.Inject
 
 class UpdatesManagerRepository @Inject constructor(
diff --git a/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt b/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt
index 5b95d94859f36e63d8c9675d99da375735f7d38e..a09e75eedf0f3450ba33ef97ff552893911bec88 100644
--- a/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt
+++ b/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt
@@ -10,8 +10,8 @@ import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepository
 import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepositoryImpl
 import foundation.e.apps.data.fdroid.FdroidRepository
 import foundation.e.apps.data.fdroid.IFdroidRepository
-import foundation.e.apps.data.fused.ApplicationApi
-import foundation.e.apps.data.fused.ApplicationApiImpl
+import foundation.e.apps.data.application.ApplicationApi
+import foundation.e.apps.data.application.ApplicationApiImpl
 import foundation.e.apps.data.fusedDownload.FusedManagerImpl
 import foundation.e.apps.data.fusedDownload.IFusedManager
 import javax.inject.Singleton
diff --git a/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt b/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt
index d898c4e7a3c6bf6745bf12588b51cdc059a8d742..eaaafb3e60861d8fd57f2af23b4499a87ce0ea29 100644
--- a/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt
+++ b/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt
@@ -24,7 +24,7 @@ import android.content.pm.PackageInstaller
 import android.os.IBinder
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.data.faultyApps.FaultyAppRepository
-import foundation.e.apps.data.fused.UpdatesDao
+import foundation.e.apps.data.application.UpdatesDao
 import foundation.e.apps.data.fusedDownload.FusedManagerRepository
 import foundation.e.apps.utils.eventBus.AppEvent
 import foundation.e.apps.utils.eventBus.EventBus
diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt b/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt
index 83d92bb72d18e2a4fb2135d8a7fef902c29262e0..f71649f52efb86028d887eaff4bd9ff17632c7a1 100644
--- a/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt
+++ b/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt
@@ -13,7 +13,7 @@ import androidx.core.graphics.drawable.IconCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import foundation.e.apps.OpenForTesting
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.FusedDownloadRepository
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt
index 46a4563515b77d47765a3b9e852c13bfd5fec9ee..21956d6f676688d09ebfcea142fc992427635d50 100644
--- a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt
+++ b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt
@@ -34,7 +34,7 @@ import foundation.e.apps.OpenForTesting
 import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.enums.Type
-import foundation.e.apps.data.fused.ApplicationApi
+import foundation.e.apps.data.application.ApplicationApi
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import kotlinx.coroutines.DelicateCoroutinesApi
 import timber.log.Timber
diff --git a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt
index 67224f56570a44927574e853fa682a20cdee6918..fcd7528b2fc942470e1e33910a30e7f5a01a53d2 100644
--- a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt
+++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt
@@ -23,7 +23,7 @@ import androidx.core.content.pm.PackageInfoCompat
 import com.aurora.gplayapi.data.models.AuthData
 import foundation.e.apps.ISplitInstallService
 import foundation.e.apps.data.DownloadManager
-import foundation.e.apps.data.fused.ApplicationRepository
+import foundation.e.apps.data.application.ApplicationRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt
index a6e30289a6bbf62a70ab3c1f0bcd29b336ba16cd..1335092429afdaec35a670babee19586cb03fc57 100644
--- a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt
+++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.AuthData
 import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.data.DownloadManager
-import foundation.e.apps.data.fused.ApplicationRepository
+import foundation.e.apps.data.application.ApplicationRepository
 import foundation.e.apps.data.preference.DataStoreModule
 import foundation.e.splitinstall.ISplitInstallService
 import foundation.e.splitinstall.SplitInstall
diff --git a/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt
index 5147c25499777ea1bca05c616633799923e5ae46..68807788a25cd78c8efb7218b58e2f978813d574 100644
--- a/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt
+++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt
@@ -19,7 +19,7 @@ import foundation.e.apps.data.ResultSupreme
 import foundation.e.apps.data.blockedApps.BlockedAppRepository
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.User
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.login.AuthenticatorRepository
 import foundation.e.apps.data.preference.DataStoreManager
 import foundation.e.apps.data.updates.UpdatesManagerRepository
diff --git a/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt b/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt
index ece6ec7214ae321fddf1e9c1d2e357eac08967f4..3ccd311a6533b54cae843c8f6b7fc61dcd6214aa 100644
--- a/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt
+++ b/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt
@@ -26,9 +26,9 @@ import foundation.e.apps.data.ResultSupreme
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.enums.Type
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.UpdatesDao
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.UpdatesDao
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.FusedDownloadRepository
 import foundation.e.apps.data.fusedDownload.FusedManagerRepository
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
diff --git a/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt
index 48840a8a659368074979f9b5ed0959f19a87766e..a4fd28790c90d004f8c660029710e99ce9b3c37a 100644
--- a/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt
@@ -7,7 +7,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import foundation.e.apps.data.blockedApps.BlockedAppRepository
 import foundation.e.apps.data.faultyApps.FaultyAppRepository
 import foundation.e.apps.data.fdroid.FdroidRepository
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.playstore.PlayStoreRepository
 import javax.inject.Inject
 import javax.inject.Named
diff --git a/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt b/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt
index 05f0625ea1d94386b02df401bb09e6ce50176081..28ecaa2bd74171a103959bb2424c8656e07f2c2b 100644
--- a/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt
@@ -20,7 +20,7 @@ package foundation.e.apps.ui
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.FusedManagerRepository
 import foundation.e.apps.install.download.data.DownloadProgress
 import foundation.e.apps.install.download.data.DownloadProgressLD
diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
index 38fc2b93c94aaeb3735f2561bb320767cea5cf0b..d110ba5c7eabc5477ac88bdbd893a8f05b8e0df6 100644
--- a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
@@ -41,8 +41,8 @@ import foundation.e.apps.data.ecloud.EcloudRepository
 import foundation.e.apps.data.enums.User
 import foundation.e.apps.data.enums.isInitialized
 import foundation.e.apps.data.enums.isUnFiltered
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.FusedManagerRepository
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import foundation.e.apps.data.preference.DataStoreModule
diff --git a/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt b/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt
index 043112c390a79893452c65a731f8c81f03f01a97..46c07546d42ba0837db593d0dceda8c88101e5ef 100644
--- a/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt
@@ -10,7 +10,7 @@ import foundation.e.apps.data.Result
 import foundation.e.apps.data.exodus.models.AppPrivacyInfo
 import foundation.e.apps.data.exodus.repositories.IAppPrivacyInfoRepository
 import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepository
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
diff --git a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt
index fa4b56a1c12ea8b073c383fa6daee9f266bc9267..bacd5077f9983086c8a209eec6f8f4ad425986f7 100644
--- a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt
@@ -53,7 +53,7 @@ import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.enums.User
 import foundation.e.apps.data.enums.isInitialized
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.GPlayLoginException
 import foundation.e.apps.databinding.FragmentApplicationBinding
diff --git a/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt
index 29c4cc658d19de3d98ff5aaae57fdae5d86c65b7..c893fb260381e866649e88cc25df8c692c7b4671 100644
--- a/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt
@@ -27,8 +27,8 @@ import foundation.e.apps.R
 import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.FusedManagerRepository
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import foundation.e.apps.data.login.AuthObject
diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt
index 320d9e0104f88626ddf4422703c06d5f37bbd209..bd887d93850952370daab57b6d21c855242ff80a 100644
--- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt
+++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt
@@ -18,7 +18,7 @@
 package foundation.e.apps.ui.applicationlist
 
 import androidx.recyclerview.widget.DiffUtil
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL
 
 class ApplicationDiffUtil : DiffUtil.ItemCallback<Application>() {
diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt
index e840e118237271617455761a2f8cf887f438da39..f1c18aa09aef4786842c5351d02be2b39672ad79 100644
--- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt
@@ -33,8 +33,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.R
 import foundation.e.apps.data.ResultSupreme
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.ApplicationInstaller
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationInstaller
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.GPlayLoginException
 import foundation.e.apps.databinding.FragmentApplicationListBinding
diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt
index cc51a5c53eaa6d384519d368b2e1f77e4ebed071..f9c0c72ce71792d10f4b75db6dfc60ae15409121 100644
--- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt
+++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt
@@ -39,8 +39,8 @@ import foundation.e.apps.data.cleanapk.CleanApkRetrofit
 import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.enums.User
-import foundation.e.apps.data.fused.ApplicationInstaller
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationInstaller
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.databinding.ApplicationListItemBinding
 import foundation.e.apps.install.pkg.InstallerService
 import foundation.e.apps.ui.AppInfoFetchViewModel
diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt
index 4cada5c55e2fb71ac2be212fea5d113abad2048a..bf4272a17563055deaa5833684382af66772ddc6 100644
--- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt
@@ -25,8 +25,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import foundation.e.apps.data.ResultSupreme
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Source
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.CleanApkException
 import foundation.e.apps.data.login.exceptions.GPlayException
diff --git a/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt
index af0383c0dca7bf2bf80a5a227364cfe4669721fe..fadb8dd123421944ea4061f6d85a3a8cd96528c4 100644
--- a/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt
@@ -26,7 +26,7 @@ import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.R
-import foundation.e.apps.data.fused.utils.CategoryType
+import foundation.e.apps.data.application.utils.CategoryType
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.GPlayLoginException
 import foundation.e.apps.databinding.FragmentAppsBinding
diff --git a/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt b/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt
index 4d7a43068a864bd3330d6a8a102835564cb92f70..cb777869c9ffcb919deb5453e025e320302b6e2b 100644
--- a/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt
@@ -23,9 +23,9 @@ import androidx.lifecycle.viewModelScope
 import com.aurora.gplayapi.data.models.AuthData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import foundation.e.apps.data.enums.ResultStatus
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.data.Category
-import foundation.e.apps.data.fused.utils.CategoryType
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.data.Category
+import foundation.e.apps.data.application.utils.CategoryType
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.CleanApkException
 import foundation.e.apps.data.login.exceptions.GPlayException
diff --git a/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt
index 8f8f11fdbf5c6d0cc83d7240de196a13da0094e3..dbbf2ad7aa98c15c5c0294085e3362c51d36ced2 100644
--- a/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt
@@ -26,7 +26,7 @@ import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.R
-import foundation.e.apps.data.fused.utils.CategoryType
+import foundation.e.apps.data.application.utils.CategoryType
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.GPlayLoginException
 import foundation.e.apps.databinding.FragmentGamesBinding
diff --git a/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt
index b00228a1d07620c6f1ff792f7571629643f703d7..c2e5e6d56d79ff0bc2a1f913e3dd182b98cb1f2a 100644
--- a/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt
+++ b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt
@@ -19,7 +19,7 @@
 package foundation.e.apps.ui.categories.model
 
 import androidx.recyclerview.widget.DiffUtil
-import foundation.e.apps.data.fused.data.Category
+import foundation.e.apps.data.application.data.Category
 
 class CategoriesDiffUtil(
     private val oldList: List<Category>,
diff --git a/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt
index 220b74f8e2de4e4f0f853131e9e1c8e83f852d16..3890be7c1758eb759faa9adf12daccfb2f125709 100644
--- a/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt
+++ b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt
@@ -25,7 +25,7 @@ import androidx.navigation.findNavController
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
-import foundation.e.apps.data.fused.data.Category
+import foundation.e.apps.data.application.data.Category
 import foundation.e.apps.databinding.CategoriesListItemBinding
 import foundation.e.apps.ui.categories.CategoriesFragmentDirections
 
diff --git a/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt
index 7c081c6dbb2ec8132841188a76ebb142e25dadcf..3d0314d993e85f240d3344587d181c36cfb14815 100644
--- a/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt
@@ -31,9 +31,9 @@ import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.R
 import foundation.e.apps.data.ResultSupreme
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.ApplicationInstaller
-import foundation.e.apps.data.fused.data.Application
-import foundation.e.apps.data.fused.data.Home
+import foundation.e.apps.data.application.ApplicationInstaller
+import foundation.e.apps.data.application.data.Application
+import foundation.e.apps.data.application.data.Home
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.GPlayException
 import foundation.e.apps.data.login.exceptions.GPlayLoginException
diff --git a/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt
index d8a6ca4a4533e2986dc27c4d6c4337e92e00a508..517513c03df2a5e7f002d07c227f8cacd13cdd68 100644
--- a/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt
@@ -24,9 +24,9 @@ import androidx.lifecycle.viewModelScope
 import com.aurora.gplayapi.data.models.AuthData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import foundation.e.apps.data.ResultSupreme
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.data.Application
-import foundation.e.apps.data.fused.data.Home
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.data.Application
+import foundation.e.apps.data.application.data.Home
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.CleanApkException
 import foundation.e.apps.data.login.exceptions.GPlayException
diff --git a/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt
index 2ca4d87b2301b2a0f86359e16210d90acd7027fa..8e05f40ad326fa7b39a7f4a42b04c4e96261a285 100644
--- a/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt
+++ b/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt
@@ -18,7 +18,7 @@
 package foundation.e.apps.ui.home.model
 
 import androidx.recyclerview.widget.DiffUtil
-import foundation.e.apps.data.fused.data.Home
+import foundation.e.apps.data.application.data.Home
 
 class FusedHomeDiffUtil : DiffUtil.ItemCallback<Home>() {
     override fun areItemsTheSame(oldItem: Home, newItem: Home): Boolean {
diff --git a/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt
index a590c04aaec7357455d08d119d72c3937a189366..8f2be23a6d612d5fe7005c8f651f843132b83a2c 100644
--- a/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt
+++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt
@@ -18,7 +18,7 @@
 package foundation.e.apps.ui.home.model
 
 import androidx.recyclerview.widget.DiffUtil
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 
 class HomeChildFusedAppDiffUtil : DiffUtil.ItemCallback<Application>() {
     override fun areItemsTheSame(oldItem: Application, newItem: Application): Boolean {
diff --git a/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt
index eaafb99c16f87afad4ad781d36ee12723eb9d43d..d26563217e076d087e1c5b218b87a32147df21a3 100644
--- a/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt
+++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt
@@ -36,8 +36,8 @@ import foundation.e.apps.data.cleanapk.CleanApkRetrofit
 import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.enums.User
-import foundation.e.apps.data.fused.ApplicationInstaller
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationInstaller
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.databinding.HomeChildListItemBinding
 import foundation.e.apps.ui.AppInfoFetchViewModel
 import foundation.e.apps.ui.MainActivityViewModel
diff --git a/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt
index 41faf14fbb44443a58714b7f267099e1d7642e72..7231e3db3d3d728a2a31797a52b978d7841b05fb 100644
--- a/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt
+++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt
@@ -25,9 +25,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import foundation.e.apps.data.fused.ApplicationInstaller
-import foundation.e.apps.data.fused.data.Application
-import foundation.e.apps.data.fused.data.Home
+import foundation.e.apps.data.application.ApplicationInstaller
+import foundation.e.apps.data.application.data.Application
+import foundation.e.apps.data.application.data.Home
 import foundation.e.apps.databinding.HomeParentListItemBinding
 import foundation.e.apps.ui.AppInfoFetchViewModel
 import foundation.e.apps.ui.MainActivityViewModel
diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
index c2debc1acb3efa1704254bacd63e036c4dd4a9df..4c54fc682241cff5e208483a078c85cbae390873 100644
--- a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
@@ -43,8 +43,8 @@ import com.facebook.shimmer.ShimmerFrameLayout
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.R
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.ApplicationInstaller
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationInstaller
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.GPlayLoginException
diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
index 41dc94bc8633df42ff5484706c676ee5ebab46f9..23186b5b722d61e1365196c2e525fa00e991e2a9 100644
--- a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
@@ -26,9 +26,9 @@ import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.SearchBundle
 import dagger.hilt.android.lifecycle.HiltViewModel
 import foundation.e.apps.data.ResultSupreme
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.GplaySearchResult
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.GplaySearchResult
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.CleanApkException
 import foundation.e.apps.data.login.exceptions.GPlayException
diff --git a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt
index d3c507cad16681bb6ca6c907bcb3d24d3a156528..5b54866c6eb632a194fd93c099f494d7bc3ffd80 100644
--- a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt
@@ -39,7 +39,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.BuildConfig
 import foundation.e.apps.R
 import foundation.e.apps.data.enums.User
-import foundation.e.apps.data.fused.UpdatesDao
+import foundation.e.apps.data.application.UpdatesDao
 import foundation.e.apps.data.login.LoginViewModel
 import foundation.e.apps.databinding.CustomPreferenceBinding
 import foundation.e.apps.install.updates.UpdatesWorkManager
diff --git a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt
index f9d772da47e088fd7dcb2c6c6b79eee6d0abe9af..615da67a64911542ba676abc903c92fced8ab024 100644
--- a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt
@@ -36,8 +36,8 @@ import foundation.e.apps.R
 import foundation.e.apps.data.ResultSupreme
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.ApplicationInstaller
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationInstaller
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.GPlayException
diff --git a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt
index 5b6ed102ea33800ed50cfdce1f5be5bf8479d937..5f0a47a8bdfe781da0fab056350dc3d5c1e6dd5a 100644
--- a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt
@@ -25,8 +25,8 @@ import com.aurora.gplayapi.data.models.AuthData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.exceptions.CleanApkException
 import foundation.e.apps.data.login.exceptions.GPlayException
diff --git a/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt b/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt
index 882267e2c8291d251838cab1966e7197a66398ed..7be3cb29f682e387887b0fc9b69d4116f6783b1c 100644
--- a/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt
+++ b/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt
@@ -20,7 +20,7 @@ package foundation.e.apps
 
 import android.content.Context
 import android.content.pm.ApplicationInfo
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.updates.UpdatesManagerImpl.Companion.PACKAGE_NAME_ANDROID_VENDING
 import foundation.e.apps.data.updates.UpdatesManagerImpl.Companion.PACKAGE_NAME_F_DROID
 import foundation.e.apps.install.pkg.PkgManagerModule
diff --git a/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt b/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt
index 1fa245f58d6bb86e940cfb74e4a4e561f5aa2269..d028feafea5f7838a3e27563cb85b72dacd60b8c 100644
--- a/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt
+++ b/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt
@@ -27,9 +27,9 @@ import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.faultyApps.FaultyAppRepository
 import foundation.e.apps.data.fdroid.FdroidRepository
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.ApplicationApi
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.ApplicationApi
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.updates.UpdatesManagerImpl
 import foundation.e.apps.util.MainCoroutineRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
diff --git a/app/src/test/java/foundation/e/apps/exodus/AppPrivacyInfoRepositoryImplTest.kt b/app/src/test/java/foundation/e/apps/exodus/AppPrivacyInfoRepositoryImplTest.kt
index 90ffa5bd0e1f7f0c1cbd1c0ea870514df4383f4c..0658e81693e27f23c60fde9e2d71ea21dabaeab7 100644
--- a/app/src/test/java/foundation/e/apps/exodus/AppPrivacyInfoRepositoryImplTest.kt
+++ b/app/src/test/java/foundation/e/apps/exodus/AppPrivacyInfoRepositoryImplTest.kt
@@ -21,7 +21,7 @@ package foundation.e.apps.exodus
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.exodus.repositories.AppPrivacyInfoRepositoryImpl
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.util.MainCoroutineRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
diff --git a/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt b/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt
index 82997fb1c685595918e38f93d24b16f6361de622..e8b61b401fe0b915a5c50ed917287afb4ffcaae1 100644
--- a/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt
+++ b/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt
@@ -20,7 +20,7 @@ package foundation.e.apps.exodus
 
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepositoryImpl
-import foundation.e.apps.data.fused.data.Application
+import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.di.CommonUtilsModule
 import org.junit.Assert
 import org.junit.Before
diff --git a/app/src/test/java/foundation/e/apps/fused/ApplicationApiImplTest.kt b/app/src/test/java/foundation/e/apps/fused/ApplicationApiImplTest.kt
index aa58ad778d09429308c1d8f8d57144e66033229f..e636cc92fb79930234cad74342b3019d52970f2d 100644
--- a/app/src/test/java/foundation/e/apps/fused/ApplicationApiImplTest.kt
+++ b/app/src/test/java/foundation/e/apps/fused/ApplicationApiImplTest.kt
@@ -34,10 +34,10 @@ import foundation.e.apps.data.enums.FilterLevel
 import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.enums.ResultStatus
 import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.fused.ApplicationApiImpl
-import foundation.e.apps.data.fused.data.Application
-import foundation.e.apps.data.fused.data.Home
-import foundation.e.apps.data.fused.utils.CategoryType
+import foundation.e.apps.data.application.ApplicationApiImpl
+import foundation.e.apps.data.application.data.Application
+import foundation.e.apps.data.application.data.Home
+import foundation.e.apps.data.application.utils.CategoryType
 import foundation.e.apps.data.playstore.PlayStoreRepository
 import foundation.e.apps.install.pkg.PWAManagerModule
 import foundation.e.apps.install.pkg.PkgManagerModule
diff --git a/app/src/test/java/foundation/e/apps/fused/ApplicationApiRepositoryTest.kt b/app/src/test/java/foundation/e/apps/fused/ApplicationApiRepositoryTest.kt
index 406c9dd12f3ed0ffe44337e8969eb618caedc6a5..bde38b21767e3d73815c9ce1fc293026f92fcc81 100644
--- a/app/src/test/java/foundation/e/apps/fused/ApplicationApiRepositoryTest.kt
+++ b/app/src/test/java/foundation/e/apps/fused/ApplicationApiRepositoryTest.kt
@@ -17,8 +17,8 @@
 
 package foundation.e.apps.fused
 
-import foundation.e.apps.data.fused.ApplicationRepository
-import foundation.e.apps.data.fused.ApplicationApiImpl
+import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.application.ApplicationApiImpl
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
diff --git a/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt b/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt
index 5741dfe41e71caa00f3b7f0e1340cf206a5e763e..3bff045e9bd8d904c2511fb4d5ff60e0d22cd43d 100644
--- a/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt
+++ b/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt
@@ -23,7 +23,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.aurora.gplayapi.data.models.AuthData
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.fdroid.FdroidRepository
-import foundation.e.apps.data.fused.ApplicationRepository
+import foundation.e.apps.data.application.ApplicationRepository
 import foundation.e.apps.data.fusedDownload.FusedDownloadRepository
 import foundation.e.apps.data.fusedDownload.IFusedManager
 import foundation.e.apps.data.fusedDownload.models.FusedDownload