diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt
index 8cdf83552..ff246ba55 100644
--- a/app/src/main/java/com/aurora/store/MainActivity.kt
+++ b/app/src/main/java/com/aurora/store/MainActivity.kt
@@ -27,7 +27,6 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.ime
 import androidx.core.view.WindowInsetsCompat.Type.systemBars
@@ -40,7 +39,7 @@ import com.aurora.store.data.event.InstallerEvent
 import com.aurora.store.data.model.NetworkStatus
 import com.aurora.store.data.receiver.MigrationReceiver
 import com.aurora.store.databinding.ActivityMainBinding
-import com.aurora.store.util.AppUtil
+import com.aurora.store.data.helper.UpdateHelper
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_DEFAULT_SELECTED_TAB
 import com.aurora.store.view.ui.sheets.NetworkDialogSheet
@@ -54,7 +53,7 @@ import javax.inject.Inject
 class MainActivity : AppCompatActivity() {
 
     @Inject
-    lateinit var appUtil: AppUtil
+    lateinit var updateHelper: UpdateHelper
 
     private val networkViewModel: NetworkViewModel by viewModels()
 
@@ -153,8 +152,8 @@ class MainActivity : AppCompatActivity() {
         lifecycleScope.launch {
             AuroraApp.events.installerEvent.collect {
                 when (it) {
-                    is InstallerEvent.Installed -> appUtil.deleteUpdate(it.packageName)
-                    is InstallerEvent.Uninstalled -> appUtil.deleteUpdate(it.packageName)
+                    is InstallerEvent.Installed -> updateHelper.deleteUpdate(it.packageName)
+                    is InstallerEvent.Uninstalled -> updateHelper.deleteUpdate(it.packageName)
                     else -> {}
                 }
             }
@@ -162,12 +161,12 @@ class MainActivity : AppCompatActivity() {
 
         lifecycleScope.launch {
             AuroraApp.events.busEvent.collect {
-                if (it is BusEvent.Blacklisted) appUtil.deleteUpdate(it.packageName)
+                if (it is BusEvent.Blacklisted) updateHelper.deleteUpdate(it.packageName)
             }
         }
 
         lifecycleScope.launch {
-            appUtil.updates.collectLatest { list ->
+            updateHelper.updates.collectLatest { list ->
                 B.navView.getOrCreateBadge(R.id.updatesFragment).apply {
                     isVisible = !list.isNullOrEmpty()
                     number = list?.size ?: 0
diff --git a/app/src/main/java/com/aurora/store/util/AppUtil.kt b/app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt
similarity index 94%
rename from app/src/main/java/com/aurora/store/util/AppUtil.kt
rename to app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt
index 83bf5c0e0..042c1402c 100644
--- a/app/src/main/java/com/aurora/store/util/AppUtil.kt
+++ b/app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt
@@ -1,4 +1,4 @@
-package com.aurora.store.util
+package com.aurora.store.data.helper
 
 import android.content.Context
 import android.content.pm.PackageInfo
@@ -15,6 +15,9 @@ import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.data.providers.BlacklistProvider
 import com.aurora.store.data.room.update.Update
 import com.aurora.store.data.room.update.UpdateDao
+import com.aurora.store.util.CertUtil
+import com.aurora.store.util.PackageUtil
+import com.aurora.store.util.Preferences
 import com.google.gson.Gson
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
@@ -26,7 +29,7 @@ import javax.inject.Inject
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 
-class AppUtil @Inject constructor(
+class UpdateHelper @Inject constructor(
     private val gson: Gson,
     private val authProvider: AuthProvider,
     private val updateDao: UpdateDao,
@@ -35,7 +38,7 @@ class AppUtil @Inject constructor(
     @ApplicationContext private val context: Context
 ) {
 
-    private val TAG = AppUtil::class.java.simpleName
+    private val TAG = UpdateHelper::class.java.simpleName
 
     private val RELEASE = "release"
     private val NIGHTLY = "nightly"
@@ -84,7 +87,7 @@ class AppUtil @Inject constructor(
         updateDao.delete(packageName)
     }
 
-    suspend fun getFilteredInstalledApps(
+    private suspend fun getFilteredInstalledApps(
         packageInfoMap: MutableMap<String, PackageInfo>? = null
     ): List<App> {
         return withContext(Dispatchers.IO) {
diff --git a/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt b/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt
index f96466296..699fea8fe 100644
--- a/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt
@@ -17,7 +17,7 @@ import com.aurora.extensions.isIgnoringBatteryOptimizations
 import com.aurora.extensions.isMAndAbove
 import com.aurora.store.data.installer.AppInstaller
 import com.aurora.store.data.providers.AuthProvider
-import com.aurora.store.util.AppUtil
+import com.aurora.store.data.helper.UpdateHelper
 import com.aurora.store.data.helper.DownloadHelper
 import com.aurora.store.util.NotificationUtil
 import com.aurora.store.util.Preferences
@@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit.MINUTES
  */
 @HiltWorker
 class UpdateWorker @AssistedInject constructor(
-    private val appUtil: AppUtil,
+    private val updateHelper: UpdateHelper,
     private val downloadHelper: DownloadHelper,
     private val authProvider: AuthProvider,
     @Assisted private val appContext: Context,
@@ -123,7 +123,7 @@ class UpdateWorker @AssistedInject constructor(
             }
 
             try {
-                val updatesList = appUtil.checkUpdates()
+                val updatesList = updateHelper.checkUpdates()
                     .filter { it.hasValidCert }
                     .filterNot { it.isSelfUpdate() }
 
diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
index 10ea0b1a8..6f79b00b5 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
@@ -23,7 +23,7 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.aurora.store.data.room.update.Update
-import com.aurora.store.util.AppUtil
+import com.aurora.store.data.helper.UpdateHelper
 import com.aurora.store.data.helper.DownloadHelper
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -34,7 +34,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class UpdatesViewModel @Inject constructor(
-    private val appUtil: AppUtil,
+    private val updateHelper: UpdateHelper,
     private val downloadHelper: DownloadHelper,
 ) : ViewModel() {
     private val TAG = UpdatesViewModel::class.java.simpleName
@@ -42,7 +42,7 @@ class UpdatesViewModel @Inject constructor(
     var updateAllEnqueued: Boolean = false
 
     val downloadsList get() = downloadHelper.downloadsList
-    val updates get() = appUtil.updates
+    val updates get() = updateHelper.updates
 
     private val _fetchingUpdates = MutableStateFlow(false)
     val fetchingUpdates = _fetchingUpdates.asStateFlow()
@@ -51,7 +51,7 @@ class UpdatesViewModel @Inject constructor(
         _fetchingUpdates.value = true
         viewModelScope.launch(Dispatchers.IO) {
             try {
-                appUtil.checkUpdates()
+                updateHelper.checkUpdates()
             } catch (exception: Exception) {
                 Log.d(TAG, "Failed to get updates", exception)
             }