diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
index 54f473d4..ffb9d57a 100644
--- a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
@@ -14,7 +14,7 @@ import com.looker.droidify.R
 import com.looker.droidify.content.Preferences
 import com.looker.droidify.database.CursorOwner
 import com.looker.droidify.installer.AppInstaller
-import com.looker.droidify.ui.appDetail.AppDetailFragment
+import com.looker.droidify.ui.fragments.AppDetailFragment
 import com.looker.droidify.utility.KParcelable
 import com.looker.droidify.utility.extension.resources.getDrawableFromAttr
 import com.looker.droidify.utility.extension.text.nullIfEmpty
diff --git a/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt
index 6bf8014d..dd79c909 100644
--- a/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt
@@ -24,7 +24,7 @@ import com.looker.droidify.databinding.TabsToolbarBinding
 import com.looker.droidify.entity.ProductItem
 import com.looker.droidify.service.Connection
 import com.looker.droidify.service.SyncService
-import com.looker.droidify.ui.appsList.AppListFragment
+import com.looker.droidify.ui.fragments.AppListFragment
 import com.looker.droidify.utility.RxUtils
 import com.looker.droidify.utility.Utils
 import com.looker.droidify.utility.extension.android.*
diff --git a/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt b/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt
similarity index 99%
rename from src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt
rename to src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt
index 7ba01855..706f42c0 100644
--- a/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt
@@ -1,4 +1,4 @@
-package com.looker.droidify.ui.appDetail
+package com.looker.droidify.ui.adapters
 
 import android.annotation.SuppressLint
 import android.content.ClipData
diff --git a/src/main/kotlin/com/looker/droidify/ui/appsList/AppListAdapter.kt b/src/main/kotlin/com/looker/droidify/ui/adapters/AppListAdapter.kt
similarity index 99%
rename from src/main/kotlin/com/looker/droidify/ui/appsList/AppListAdapter.kt
rename to src/main/kotlin/com/looker/droidify/ui/adapters/AppListAdapter.kt
index 2e785330..bbd70dbc 100644
--- a/src/main/kotlin/com/looker/droidify/ui/appsList/AppListAdapter.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/adapters/AppListAdapter.kt
@@ -1,4 +1,4 @@
-package com.looker.droidify.ui.appsList
+package com.looker.droidify.ui.adapters
 
 import android.content.Context
 import android.graphics.drawable.Drawable
diff --git a/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt
similarity index 99%
rename from src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailFragment.kt
rename to src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt
index cea18ce9..cee0523f 100644
--- a/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/AppDetailFragment.kt
@@ -1,4 +1,4 @@
-package com.looker.droidify.ui.appDetail
+package com.looker.droidify.ui.fragments
 
 import android.content.ActivityNotFoundException
 import android.content.ComponentName
@@ -25,6 +25,7 @@ import com.looker.droidify.screen.ScreenFragment
 import com.looker.droidify.screen.ScreenshotsFragment
 import com.looker.droidify.service.Connection
 import com.looker.droidify.service.DownloadService
+import com.looker.droidify.ui.adapters.AppDetailAdapter
 import com.looker.droidify.utility.RxUtils
 import com.looker.droidify.utility.Utils
 import com.looker.droidify.utility.Utils.startUpdate
diff --git a/src/main/kotlin/com/looker/droidify/ui/appsList/AppListFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/AppListFragment.kt
similarity index 97%
rename from src/main/kotlin/com/looker/droidify/ui/appsList/AppListFragment.kt
rename to src/main/kotlin/com/looker/droidify/ui/fragments/AppListFragment.kt
index 48598d35..fb6ba6a5 100644
--- a/src/main/kotlin/com/looker/droidify/ui/appsList/AppListFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/AppListFragment.kt
@@ -1,4 +1,4 @@
-package com.looker.droidify.ui.appsList
+package com.looker.droidify.ui.fragments
 
 import android.database.Cursor
 import android.os.Bundle
@@ -16,6 +16,8 @@ import com.looker.droidify.database.CursorOwner
 import com.looker.droidify.database.Database
 import com.looker.droidify.entity.ProductItem
 import com.looker.droidify.screen.BaseFragment
+import com.looker.droidify.ui.adapters.AppListAdapter
+import com.looker.droidify.ui.viewmodels.AppListViewModel
 import com.looker.droidify.utility.RxUtils
 import com.looker.droidify.widget.RecyclerFastScroller
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
diff --git a/src/main/kotlin/com/looker/droidify/ui/appsList/AppListViewModel.kt b/src/main/kotlin/com/looker/droidify/ui/viewmodels/AppListViewModel.kt
similarity index 96%
rename from src/main/kotlin/com/looker/droidify/ui/appsList/AppListViewModel.kt
rename to src/main/kotlin/com/looker/droidify/ui/viewmodels/AppListViewModel.kt
index 7676e4ee..959ce242 100644
--- a/src/main/kotlin/com/looker/droidify/ui/appsList/AppListViewModel.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/viewmodels/AppListViewModel.kt
@@ -1,9 +1,10 @@
-package com.looker.droidify.ui.appsList
+package com.looker.droidify.ui.viewmodels
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.looker.droidify.database.CursorOwner
 import com.looker.droidify.entity.ProductItem
+import com.looker.droidify.ui.fragments.AppListFragment
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch