diff --git a/app/src/main/java/com/aurora/store/Enumerations.kt b/app/src/main/java/com/aurora/store/data/model/Enumerations.kt
similarity index 96%
rename from app/src/main/java/com/aurora/store/Enumerations.kt
rename to app/src/main/java/com/aurora/store/data/model/Enumerations.kt
index c5f632cbd..0c12e432b 100644
--- a/app/src/main/java/com/aurora/store/Enumerations.kt
+++ b/app/src/main/java/com/aurora/store/data/model/Enumerations.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store
+package com.aurora.store.data.model
 
 enum class AccountType {
     ANONYMOUS,
diff --git a/app/src/main/java/com/aurora/store/data/State.kt b/app/src/main/java/com/aurora/store/data/model/State.kt
similarity index 97%
rename from app/src/main/java/com/aurora/store/data/State.kt
rename to app/src/main/java/com/aurora/store/data/model/State.kt
index 793b2fd60..274738a37 100644
--- a/app/src/main/java/com/aurora/store/data/State.kt
+++ b/app/src/main/java/com/aurora/store/data/model/State.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.data
+package com.aurora.store.data.model
 
 
 sealed class ViewState {
diff --git a/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt b/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
index 7bb833045..9ea7e3e8f 100644
--- a/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
@@ -21,7 +21,7 @@ package com.aurora.store.data.providers
 
 import android.content.Context
 import com.aurora.Constants
-import com.aurora.store.AccountType
+import com.aurora.store.data.model.AccountType
 import com.aurora.store.data.SingletonHolder
 import com.aurora.store.util.Preferences
 
diff --git a/app/src/main/java/com/aurora/store/data/providers/AuthProvider.kt b/app/src/main/java/com/aurora/store/data/providers/AuthProvider.kt
index eda6a5fce..a92f12c8a 100644
--- a/app/src/main/java/com/aurora/store/data/providers/AuthProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/AuthProvider.kt
@@ -23,7 +23,7 @@ import android.content.Context
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.helpers.AuthValidator
-import com.aurora.store.AccountType
+import com.aurora.store.data.model.AccountType
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.util.Log
 import com.aurora.store.util.Preferences
diff --git a/app/src/main/java/com/aurora/store/view/custom/layouts/button/ActionButton.kt b/app/src/main/java/com/aurora/store/view/custom/layouts/button/ActionButton.kt
index c944e6025..90e423a9a 100644
--- a/app/src/main/java/com/aurora/store/view/custom/layouts/button/ActionButton.kt
+++ b/app/src/main/java/com/aurora/store/view/custom/layouts/button/ActionButton.kt
@@ -27,7 +27,7 @@ import androidx.core.content.ContextCompat
 import com.aurora.extensions.getString
 import com.aurora.extensions.runOnUiThread
 import com.aurora.store.R
-import com.aurora.store.State
+import com.aurora.store.data.model.State
 import com.aurora.store.databinding.ViewActionButtonBinding
 
 class ActionButton : RelativeLayout {
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt
index 7db75e81b..8a6172e7c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt
@@ -29,7 +29,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.store.R
-import com.aurora.store.data.ViewState
+import com.aurora.store.data.model.ViewState
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.controller.CategoryCarouselController
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt
index 4df2e5a1c..3a345e676 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt
@@ -29,7 +29,7 @@ import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.StreamHelper.Category
 import com.aurora.gplayapi.helpers.StreamHelper.Type
 import com.aurora.store.R
-import com.aurora.store.data.ViewState
+import com.aurora.store.data.model.ViewState
 import com.aurora.store.databinding.FragmentForYouBinding
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
index eff00b6cd..66d72ac46 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
@@ -57,8 +57,8 @@ import com.aurora.gplayapi.data.models.Review
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.store.R
-import com.aurora.store.State
-import com.aurora.store.data.ViewState
+import com.aurora.store.data.model.State
+import com.aurora.store.data.model.ViewState
 import com.aurora.store.data.event.BusEvent
 import com.aurora.store.data.event.InstallerEvent
 import com.aurora.store.data.installer.AppInstaller
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt
index 8e784073f..ace0e45d4 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt
@@ -29,7 +29,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.data.models.details.DevStream
 import com.aurora.store.R
-import com.aurora.store.data.ViewState
+import com.aurora.store.data.model.ViewState
 import com.aurora.store.databinding.FragmentDevProfileBinding
 import com.aurora.store.view.epoxy.controller.DeveloperCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/SplashFragment.kt b/app/src/main/java/com/aurora/store/view/ui/splash/SplashFragment.kt
index 0e27eee13..ed9d8113c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashFragment.kt
@@ -30,7 +30,7 @@ import com.aurora.extensions.isValidPackageName
 import com.aurora.extensions.restartApp
 import com.aurora.extensions.show
 import com.aurora.store.R
-import com.aurora.store.data.AuthState
+import com.aurora.store.data.model.AuthState
 import com.aurora.store.databinding.FragmentSplashBinding
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_DEFAULT_SELECTED_TAB
diff --git a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
index 2b6fdca62..8193f87fb 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
@@ -30,9 +30,9 @@ import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.PlayResponse
 import com.aurora.gplayapi.data.providers.DeviceInfoProvider
 import com.aurora.gplayapi.helpers.AuthHelper
-import com.aurora.store.AccountType
+import com.aurora.store.data.model.AccountType
 import com.aurora.store.R
-import com.aurora.store.data.AuthState
+import com.aurora.store.data.model.AuthState
 import com.aurora.store.data.event.BusEvent
 import com.aurora.store.data.model.InsecureAuth
 import com.aurora.store.data.network.HttpClient
diff --git a/app/src/main/java/com/aurora/store/viewmodel/details/DetailsClusterViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/details/DetailsClusterViewModel.kt
index eb7957558..8ebc226bb 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/details/DetailsClusterViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/DetailsClusterViewModel.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.AppDetailsHelper
 import com.aurora.gplayapi.helpers.StreamHelper
-import com.aurora.store.data.ViewState
+import com.aurora.store.data.model.ViewState
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.util.Log
diff --git a/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt
index b0259a94d..0237138d0 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt
@@ -24,13 +24,12 @@ import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.data.models.details.DevStream
 import com.aurora.gplayapi.helpers.AppDetailsHelper
 import com.aurora.gplayapi.helpers.StreamHelper
-import com.aurora.store.data.ViewState
+import com.aurora.store.data.model.ViewState
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.util.Log
diff --git a/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt
index 705df8b3e..ba5c6274e 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt
@@ -24,11 +24,10 @@ import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.StreamHelper
-import com.aurora.store.data.ViewState
+import com.aurora.store.data.model.ViewState
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.util.Log
diff --git a/app/src/main/java/com/aurora/store/viewmodel/subcategory/SubCategoryClusterViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/subcategory/SubCategoryClusterViewModel.kt
index 34bc85565..a92dd7b09 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/subcategory/SubCategoryClusterViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/subcategory/SubCategoryClusterViewModel.kt
@@ -27,7 +27,7 @@ import androidx.lifecycle.viewModelScope
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.CategoryHelper
-import com.aurora.store.data.ViewState
+import com.aurora.store.data.model.ViewState
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.util.Log