diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
index 97bf1c4f35..c7ed46d688 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
@@ -9,7 +9,7 @@ import info.nightscout.interfaces.profile.Profile
  * Every function has a param from previous chained call
  * Function can limit the value even more and add another reason of restriction
  *
- * see [info.nightscout.implementation.constraints.ConstraintsImpl]
+ * see [info.nightscout.plugins.constraints.ConstraintsImpl]
  * which iterates over all registered plugins with [Constraints] implemented
  *
  * @return updated parameter
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/ItemTouchHelperAdapter.kt b/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/ItemTouchHelperAdapter.kt
similarity index 94%
rename from core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/ItemTouchHelperAdapter.kt
rename to core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/ItemTouchHelperAdapter.kt
index 30cc8ac887..458897a4a2 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/ItemTouchHelperAdapter.kt
+++ b/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/ItemTouchHelperAdapter.kt
@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.dragHelpers
+package info.nightscout.core.ui.dragHelpers
 
 interface ItemTouchHelperAdapter {
 
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/OnStartDragListener.kt b/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/OnStartDragListener.kt
similarity index 85%
rename from core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/OnStartDragListener.kt
rename to core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/OnStartDragListener.kt
index 0fef839133..aef86bc506 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/OnStartDragListener.kt
+++ b/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/OnStartDragListener.kt
@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.dragHelpers
+package info.nightscout.core.ui.dragHelpers
 
 import androidx.recyclerview.widget.RecyclerView
 
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/SimpleItemTouchHelperCallback.kt b/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt
similarity index 97%
rename from core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/SimpleItemTouchHelperCallback.kt
rename to core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt
index cad3cc83d5..cbfde8d04d 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/SimpleItemTouchHelperCallback.kt
+++ b/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt
@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.dragHelpers
+package info.nightscout.core.ui.dragHelpers
 
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_DRAG
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt
index 0a4406b3b1..badbe6fe3d 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt
@@ -36,9 +36,9 @@ import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
-import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter
-import info.nightscout.interfaces.dragHelpers.OnStartDragListener
-import info.nightscout.interfaces.dragHelpers.SimpleItemTouchHelperCallback
+import info.nightscout.core.ui.dragHelpers.ItemTouchHelperAdapter
+import info.nightscout.core.ui.dragHelpers.OnStartDragListener
+import info.nightscout.core.ui.dragHelpers.SimpleItemTouchHelperCallback
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt
index 92a17231c1..3fbc067aa2 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt
@@ -5,6 +5,7 @@ import dagger.Module
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
 import info.nightscout.interfaces.constraints.Constraints
 import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
+import info.nightscout.plugins.constraints.ConstraintsImpl
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
 import info.nightscout.plugins.constraints.versionChecker.VersionCheckerUtilsImpl
 
@@ -23,6 +24,6 @@ abstract class PluginsConstraintsModule {
 
         @Binds fun bindVersionCheckerUtils(versionCheckerUtils: VersionCheckerUtilsImpl): VersionCheckerUtils
         @Binds fun bindBgQualityCheck(bgQualityCheck: BgQualityCheckPlugin): BgQualityCheck
-        @Binds fun bindsConstraints(constraintsImpl: info.nightscout.plugins.constraints.ConstraintsImpl): Constraints
+        @Binds fun bindsConstraints(constraintsImpl: ConstraintsImpl): Constraints
     }
 }
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/versionChecker/AllowedVersions.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersions.kt
similarity index 95%
rename from core/interfaces/src/main/java/info/nightscout/interfaces/constraints/versionChecker/AllowedVersions.kt
rename to plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersions.kt
index 9f4010f86c..1491168093 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/versionChecker/AllowedVersions.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersions.kt
@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.constraints.versionChecker
+package info.nightscout.plugins.constraints.versionChecker
 
 import org.joda.time.LocalDate
 import org.json.JSONArray
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt
index 7c9b507ea5..cdd2b8d0c5 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt
@@ -3,7 +3,6 @@ package info.nightscout.plugins.constraints.versionChecker
 import android.os.Build
 import dagger.Lazy
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.constraints.versionChecker.AllowedVersions
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.interfaces.ui.UiInteraction
diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt
index fb188c95d2..d7bbbf274c 100644
--- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt
+++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.plugins.constraints.versionChecker
 
-import info.nightscout.interfaces.constraints.versionChecker.AllowedVersions
+import info.nightscout.plugins.constraints.versionChecker.AllowedVersions
 import org.joda.time.LocalDate
 import org.json.JSONArray
 import org.json.JSONObject
diff --git a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt
index dd80707759..8635605c11 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt
@@ -22,9 +22,9 @@ import info.nightscout.core.utils.ActionModeHelper
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.wizard.QuickWizard
 import info.nightscout.core.wizard.QuickWizardEntry
-import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter
-import info.nightscout.interfaces.dragHelpers.OnStartDragListener
-import info.nightscout.interfaces.dragHelpers.SimpleItemTouchHelperCallback
+import info.nightscout.core.ui.dragHelpers.ItemTouchHelperAdapter
+import info.nightscout.core.ui.dragHelpers.OnStartDragListener
+import info.nightscout.core.ui.dragHelpers.SimpleItemTouchHelperCallback
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.extensions.toVisibility