diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 508c47af8941dbd8a0d8322ed11f6c90b8a210bf..31b1787b3af90b038d28d3e6b3ed030f5385170a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,7 @@
         android:usesCleartextTraffic="true">
 
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivity.kt b/app/src/main/java/foundation/e/apps/MainActivity.kt
similarity index 96%
rename from app/src/main/java/foundation/e/apps/ui/MainActivity.kt
rename to app/src/main/java/foundation/e/apps/MainActivity.kt
index a2426b41f023fb3f26770c5dbb5ef2b061c65c0b..4a649f3d36a9bc5f2379790b5bc648efd30b6daf 100644
--- a/app/src/main/java/foundation/e/apps/ui/MainActivity.kt
+++ b/app/src/main/java/foundation/e/apps/MainActivity.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.ui
+package foundation.e.apps
 
 import android.app.usage.StorageStatsManager
 import android.os.Build
@@ -42,7 +42,6 @@ import com.aurora.gplayapi.exceptions.ApiException
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import foundation.e.apps.R
 import foundation.e.apps.data.enums.Status
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import foundation.e.apps.data.login.AuthObject
@@ -51,6 +50,7 @@ import foundation.e.apps.data.login.exceptions.GPlayValidationException
 import foundation.e.apps.databinding.ActivityMainBinding
 import foundation.e.apps.install.updates.UpdatesNotifier
 import foundation.e.apps.install.workmanager.InstallWorkManager
+import foundation.e.apps.ui.MainActivityViewModel
 import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment
 import foundation.e.apps.ui.purchase.AppPurchaseFragmentDirections
 import foundation.e.apps.ui.settings.SettingsFragment
diff --git a/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt
index 1d1f422581f19840594c56c2927f5920368f9524..988debf4008f3cce99f50bcfcc92ba3013c65cd0 100644
--- a/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt
+++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt
@@ -29,8 +29,8 @@ import android.os.Build
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import foundation.e.apps.MainActivity
 import foundation.e.apps.R
-import foundation.e.apps.ui.MainActivity
 
 object UpdatesNotifier {
     const val UPDATES_NOTIFICATION_CLICK_EXTRA = "updates_notification_click_extra"
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 4e0a86185f2f7201fc3394cdadeea73a7a0164f1..227c4f98fdd7167eb7a0aa7790f567e1827a6319 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
@@ -44,6 +44,7 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textview.MaterialTextView
 import dagger.hilt.android.AndroidEntryPoint
+import foundation.e.apps.MainActivity
 import foundation.e.apps.R
 import foundation.e.apps.data.cleanapk.CleanApkRetrofit
 import foundation.e.apps.data.enums.Origin
@@ -60,7 +61,6 @@ import foundation.e.apps.install.download.data.DownloadProgress
 import foundation.e.apps.install.pkg.PWAManagerModule
 import foundation.e.apps.install.pkg.PkgManagerModule
 import foundation.e.apps.ui.AppInfoFetchViewModel
-import foundation.e.apps.ui.MainActivity
 import foundation.e.apps.ui.MainActivityViewModel
 import foundation.e.apps.ui.PrivacyInfoViewModel
 import foundation.e.apps.ui.application.model.ApplicationScreenshotsRVAdapter
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 d6fb75fbdd7c128e000665beb1c3531b08c1c9e4..0f0edf9788892b72e7ee8936dad3a76b32af6b41 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
@@ -38,13 +38,13 @@ import com.google.android.material.snackbar.Snackbar
 import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.BuildConfig
+import foundation.e.apps.MainActivity
 import foundation.e.apps.R
 import foundation.e.apps.data.enums.User
 import foundation.e.apps.data.fused.UpdatesDao
 import foundation.e.apps.data.login.LoginViewModel
 import foundation.e.apps.databinding.CustomPreferenceBinding
 import foundation.e.apps.install.updates.UpdatesWorkManager
-import foundation.e.apps.ui.MainActivity
 import foundation.e.apps.ui.MainActivityViewModel
 import foundation.e.apps.utils.SystemInfoProvider
 import timber.log.Timber
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 59e74f839e8b1dca4e50b76c491ff8584517e4a0..99610ac8388a1c755549b52314d28545de85114b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,7 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.MainActivity">
+    tools:context=".MainActivity">
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/noInternet"