diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b0b6212189461e3bdd062594d3462a5dbd2e4dae..4b789577b3f30108069c8b05478e75a20382c512 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,7 @@
         tools:targetApi="tiramisu">
 
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
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 d243155732e8d28e518b0971515da9c51a7fda27..0e303bf4a1543b1b497615195927521154377246 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
@@ -32,7 +32,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.pm.PackageInfoCompat
 import foundation.e.apps.ISplitInstallService
-import foundation.e.apps.MainActivity
+import foundation.e.apps.ui.MainActivity
 import foundation.e.apps.R
 import foundation.e.apps.data.DownloadManager
 import foundation.e.apps.data.application.ApplicationRepository
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 63eafed676847ffe53f5c36d68a79a3eafbce215..de50df95a18850d5e07349b53725b8b79e8556d9 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,7 +29,7 @@ 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.ui.MainActivity
 import foundation.e.apps.R
 
 object UpdatesNotifier {
diff --git a/app/src/main/java/foundation/e/apps/MainActivity.kt b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt
similarity index 96%
rename from app/src/main/java/foundation/e/apps/MainActivity.kt
rename to app/src/main/java/foundation/e/apps/ui/MainActivity.kt
index 618ce7584239e6946d11d5f774625f7e1c2969a4..65843485ce08243e241009d6f16699152c3c8ec1 100644
--- a/app/src/main/java/foundation/e/apps/MainActivity.kt
+++ b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt
@@ -16,7 +16,7 @@
  *
  */
 
-package foundation.e.apps
+package foundation.e.apps.ui
 
 import android.content.Intent
 import android.os.Build.VERSION
@@ -42,6 +42,8 @@ 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.BuildConfig
+import foundation.e.apps.R
 import foundation.e.apps.contract.ParentalControlContract.COLUMN_LOGIN_TYPE
 import foundation.e.apps.data.Constants
 import foundation.e.apps.data.enums.User
@@ -52,7 +54,6 @@ import foundation.e.apps.data.login.PlayStoreAuthenticator
 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.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/ui/application/ApplicationFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt
index 210a4aa1199b004e2de40ee65647947477eeb268..9d325f250d7aeee33dbbee5896ec9cf078ef5869 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
@@ -51,7 +51,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.ui.MainActivity
 import foundation.e.apps.R
 import foundation.e.apps.data.application.data.Application
 import foundation.e.apps.data.application.data.shareUri
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b2056ce54671e84b386ec2a77602684473bf186e..5d8706c335dd1a366e626ca0ba9cdd8c608e82fc 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=".MainActivity">
+    tools:context=".ui.MainActivity">
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/noInternet"