diff --git a/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt b/app/src/main/java/foundation/e/apps/ui/LoginViewModel.kt
similarity index 97%
rename from app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt
rename to app/src/main/java/foundation/e/apps/ui/LoginViewModel.kt
index fba4285e03eb309b27c1af55e8199682e0b560dd..3c8c363877677cc24bcc668d4d65577cc872b1eb 100644
--- a/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/LoginViewModel.kt
@@ -15,13 +15,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.apps.data.login
+package foundation.e.apps.ui
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import foundation.e.apps.data.enums.User
+import foundation.e.apps.data.login.AuthObject
+import foundation.e.apps.data.login.AuthenticatorRepository
 import foundation.e.apps.ui.parentFragment.LoadingViewModel
 import kotlinx.coroutines.launch
 import okhttp3.Cache
diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivity.kt b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt
index e3dba9a5b8370776e5e498a22c6b5c4cf1dbbf79..486f1ed1a1bd569916de2c6e3fe3e56d14523374 100644
--- a/app/src/main/java/foundation/e/apps/ui/MainActivity.kt
+++ b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt
@@ -49,7 +49,6 @@ import foundation.e.apps.data.Constants
 import foundation.e.apps.data.enums.User
 import foundation.e.apps.data.install.models.AppInstall
 import foundation.e.apps.data.login.AuthObject
-import foundation.e.apps.data.login.LoginViewModel
 import foundation.e.apps.data.login.PlayStoreAuthenticator
 import foundation.e.apps.data.login.exceptions.GPlayValidationException
 import foundation.e.apps.databinding.ActivityMainBinding
diff --git a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt
index 11ab0653fc015026876d52b067c8ee08a0d53b92..6d3d162b8f2e58896832a8560047033049972e28 100644
--- a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt
@@ -34,7 +34,7 @@ import foundation.e.apps.R
 import foundation.e.apps.data.enums.User
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.PlayStoreAuthenticator
-import foundation.e.apps.data.login.LoginViewModel
+import foundation.e.apps.ui.LoginViewModel
 import foundation.e.apps.data.login.exceptions.CleanApkException
 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/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt
index bf1150b329ae56f6ece8b950a059727bdb739f17..760e0ee49362751ee353503b3426d59fdd9e60f4 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
@@ -41,7 +41,7 @@ import foundation.e.apps.BuildConfig
 import foundation.e.apps.R
 import foundation.e.apps.data.enums.User
 import foundation.e.apps.data.application.UpdatesDao
-import foundation.e.apps.data.login.LoginViewModel
+import foundation.e.apps.ui.LoginViewModel
 import foundation.e.apps.databinding.CustomPreferenceBinding
 import foundation.e.apps.install.updates.UpdatesWorkManager
 import foundation.e.apps.ui.MainActivityViewModel
diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt
index 213e84148393d2c6c1a0965bddde44ce7cb9d5c9..7ad1f6270823a595a0b4ff74ccfa2331ca5cafe6 100644
--- a/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.R
-import foundation.e.apps.data.login.LoginViewModel
+import foundation.e.apps.ui.LoginViewModel
 import foundation.e.apps.databinding.FragmentSignInBinding
 import foundation.e.apps.di.CommonUtilsModule.safeNavigate
 import foundation.e.apps.utils.showGoogleSignInAlertDialog
diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt
index d06706d73c90aed1affd70a246524089be67dd5a..3f85ffe1252015b15ac7fff527c78f9f2fdda3ce 100644
--- a/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt
@@ -32,7 +32,7 @@ import androidx.navigation.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.R
 import foundation.e.apps.data.playstore.utils.AC2DMUtil
-import foundation.e.apps.data.login.LoginViewModel
+import foundation.e.apps.ui.LoginViewModel
 import foundation.e.apps.databinding.FragmentGoogleSigninBinding
 import foundation.e.apps.di.CommonUtilsModule.safeNavigate
 
diff --git a/app/src/test/java/foundation/e/apps/login/LoginViewModelTest.kt b/app/src/test/java/foundation/e/apps/login/LoginViewModelTest.kt
index 9060e9740342b54dc7af2beb6d51f01728dd10d9..38fdebfe9d7b2c2dd0ab9dc381ed45eb282dedc5 100644
--- a/app/src/test/java/foundation/e/apps/login/LoginViewModelTest.kt
+++ b/app/src/test/java/foundation/e/apps/login/LoginViewModelTest.kt
@@ -24,7 +24,7 @@ import foundation.e.apps.data.ResultSupreme
 import foundation.e.apps.data.enums.User
 import foundation.e.apps.data.login.AuthObject
 import foundation.e.apps.data.login.AuthenticatorRepository
-import foundation.e.apps.data.login.LoginViewModel
+import foundation.e.apps.ui.LoginViewModel
 import okhttp3.Cache
 import org.junit.Before
 import org.junit.Rule