diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropGrid.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropGrid.kt
similarity index 99%
rename from app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropGrid.kt
rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropGrid.kt
index 41c59c62..97ac2edc 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropGrid.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropGrid.kt
@@ -1,4 +1,4 @@
-package de.mm20.launcher2.ui.launcher.helper
+package de.mm20.launcher2.ui.component.dragndrop
 
 import androidx.compose.animation.core.VectorConverter
 import androidx.compose.foundation.gestures.*
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropList.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropList.kt
similarity index 99%
rename from app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropList.kt
rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropList.kt
index 84caa51a..b4ce1e3d 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropList.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropList.kt
@@ -1,4 +1,4 @@
-package de.mm20.launcher2.ui.launcher.helper
+package de.mm20.launcher2.ui.component.dragndrop
 
 import androidx.compose.animation.core.VectorConverter
 import androidx.compose.foundation.gestures.*
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt
index 6db1c822..b67de80c 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt
@@ -94,12 +94,12 @@ import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.component.BottomSheetDialog
 import de.mm20.launcher2.ui.component.MissingPermissionBanner
 import de.mm20.launcher2.ui.component.ShapedLauncherIcon
+import de.mm20.launcher2.ui.component.dragndrop.DraggableItem
+import de.mm20.launcher2.ui.component.dragndrop.LazyDragAndDropRow
+import de.mm20.launcher2.ui.component.dragndrop.LazyVerticalDragAndDropGrid
+import de.mm20.launcher2.ui.component.dragndrop.rememberLazyDragAndDropGridState
+import de.mm20.launcher2.ui.component.dragndrop.rememberLazyDragAndDropListState
 import de.mm20.launcher2.ui.ktx.toPixels
-import de.mm20.launcher2.ui.launcher.helper.DraggableItem
-import de.mm20.launcher2.ui.launcher.helper.LazyDragAndDropRow
-import de.mm20.launcher2.ui.launcher.helper.LazyVerticalDragAndDropGrid
-import de.mm20.launcher2.ui.launcher.helper.rememberLazyDragAndDropGridState
-import de.mm20.launcher2.ui.launcher.helper.rememberLazyDragAndDropListState
 import de.mm20.launcher2.ui.locals.LocalGridSettings
 import kotlinx.coroutines.currentCoroutineContext
 import kotlin.math.roundToInt
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt
index ba63390a..c7190cd7 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt
@@ -40,12 +40,12 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import de.mm20.launcher2.searchactions.builders.CustomizableSearchActionBuilder
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.component.SearchActionIcon
+import de.mm20.launcher2.ui.component.dragndrop.DraggableItem
+import de.mm20.launcher2.ui.component.dragndrop.LazyDragAndDropColumn
+import de.mm20.launcher2.ui.component.dragndrop.rememberLazyDragAndDropListState
 import de.mm20.launcher2.ui.component.getSearchActionIconVector
 import de.mm20.launcher2.ui.component.preferences.Preference
 import de.mm20.launcher2.ui.component.preferences.SwitchPreference
-import de.mm20.launcher2.ui.launcher.helper.DraggableItem
-import de.mm20.launcher2.ui.launcher.helper.LazyDragAndDropColumn
-import de.mm20.launcher2.ui.launcher.helper.rememberLazyDragAndDropListState
 import de.mm20.launcher2.ui.locals.LocalNavController
 
 @Composable