diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawAdapter.kt b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/drawer/DrawAdapter.kt
similarity index 93%
rename from app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawAdapter.kt
rename to app/src/main/java/com/github/droidworksstudio/launcher/adapter/drawer/DrawAdapter.kt
index f72bfd0..83ad477 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawAdapter.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/drawer/DrawAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.launcher.ui.drawer
+package com.github.droidworksstudio.launcher.adapter.drawer
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -9,6 +9,7 @@ import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.ItemDrawBinding
 import com.github.droidworksstudio.launcher.helper.PreferenceHelper
 import com.github.droidworksstudio.launcher.listener.OnItemClickedListener
+import com.github.droidworksstudio.launcher.ui.drawer.DrawViewHolder
 
 class DrawAdapter(
     private val onAppClickedListener: OnItemClickedListener.OnAppsClickedListener,
diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteAdapter.kt b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/favorite/FavoriteAdapter.kt
similarity index 94%
rename from app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteAdapter.kt
rename to app/src/main/java/com/github/droidworksstudio/launcher/adapter/favorite/FavoriteAdapter.kt
index 0ce0316..2589e8c 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteAdapter.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/favorite/FavoriteAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.launcher.ui.favorite
+package com.github.droidworksstudio.launcher.adapter.favorite
 
 import android.util.Log
 import android.view.LayoutInflater
@@ -10,6 +10,7 @@ import com.github.droidworksstudio.launcher.databinding.ItemFavoriteBinding
 import com.github.droidworksstudio.launcher.helper.PreferenceHelper
 import com.github.droidworksstudio.launcher.listener.OnItemClickedListener
 import com.github.droidworksstudio.launcher.listener.OnItemMoveListener
+import com.github.droidworksstudio.launcher.ui.favorite.FavoriteViewHolder
 
 class FavoriteAdapter(
     private val onAppClickedListener:
diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenAdapter.kt b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/hidden/HiddenAdapter.kt
similarity index 93%
rename from app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenAdapter.kt
rename to app/src/main/java/com/github/droidworksstudio/launcher/adapter/hidden/HiddenAdapter.kt
index 2a24b18..1f8d80b 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenAdapter.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/hidden/HiddenAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.launcher.ui.hidden
+package com.github.droidworksstudio.launcher.adapter.hidden
 
 import android.util.Log
 import android.view.LayoutInflater
@@ -9,6 +9,7 @@ import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.ItemHiddenBinding
 import com.github.droidworksstudio.launcher.helper.PreferenceHelper
 import com.github.droidworksstudio.launcher.listener.OnItemClickedListener
+import com.github.droidworksstudio.launcher.ui.hidden.HiddenViewHolder
 
 class HiddenAdapter(
     private val onAppClickedListener: OnItemClickedListener.OnAppsClickedListener,
diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeAdapter.kt b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/home/HomeAdapter.kt
similarity index 94%
rename from app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeAdapter.kt
rename to app/src/main/java/com/github/droidworksstudio/launcher/adapter/home/HomeAdapter.kt
index 20e8b26..054955d 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeAdapter.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/adapter/home/HomeAdapter.kt
@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.launcher.ui.home
+package com.github.droidworksstudio.launcher.adapter.home
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -9,6 +9,7 @@ import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.ItemHomeBinding
 import com.github.droidworksstudio.launcher.helper.PreferenceHelper
 import com.github.droidworksstudio.launcher.listener.OnItemClickedListener
+import com.github.droidworksstudio.launcher.ui.home.HomeViewHolder
 import javax.inject.Inject
 
 class HomeAdapter @Inject constructor(
diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt
index e7b2230..2c774f4 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt
@@ -24,6 +24,7 @@ import com.github.droidworksstudio.common.searchOnPlayStore
 import com.github.droidworksstudio.common.showKeyboard
 import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
+import com.github.droidworksstudio.launcher.adapter.drawer.DrawAdapter
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.FragmentDrawBinding
 import com.github.droidworksstudio.launcher.helper.AppHelper
diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt
index 782cd5b..a9295ee 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt
@@ -19,6 +19,7 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.github.droidworksstudio.common.launchApp
 import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
+import com.github.droidworksstudio.launcher.adapter.favorite.FavoriteAdapter
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.FragmentFavoriteBinding
 import com.github.droidworksstudio.launcher.helper.AppHelper
diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt
index 16a128d..2188494 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt
@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.github.droidworksstudio.common.launchApp
 import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
+import com.github.droidworksstudio.launcher.adapter.hidden.HiddenAdapter
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.FragmentHiddenBinding
 import com.github.droidworksstudio.launcher.helper.AppHelper
diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt
index 30264d7..ce0d9c2 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt
@@ -31,6 +31,7 @@ import com.github.droidworksstudio.common.openBatteryManager
 import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.accessibility.ActionService
+import com.github.droidworksstudio.launcher.adapter.home.HomeAdapter
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.FragmentHomeBinding
 import com.github.droidworksstudio.launcher.helper.AppHelper