diff --git a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
index a36b6e30ec..3fd45eedf4 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
@@ -21,6 +21,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
 import info.nightscout.automation.di.AutomationModule
+import info.nightscout.core.di.CoreModule
 import info.nightscout.database.impl.DatabaseModule
 import info.nightscout.implementation.di.ImplementationModule
 import info.nightscout.plugins.aps.di.ApsModule
@@ -44,11 +45,8 @@ import javax.inject.Singleton
         WizardModule::class,
         ApsModule::class,
         WorkflowModule::class,
-        PreferencesModule::class,
         OverviewModule::class,
-        DataClassesModule::class,
         WorkersModule::class,
-        UiModule::class,
 
         // Gradle modules
         AutomationModule::class,
@@ -60,7 +58,7 @@ import javax.inject.Singleton
         SharedModule::class,
         SharedImplModule::class,
         OpenHumansModule::class,
-        UIModule::class,
+        UiModule::class,
 
         // pumps
         ComboModule::class,
diff --git a/app/src/main/java/info/nightscout/androidaps/di/DataClassesModule.kt b/app/src/main/java/info/nightscout/androidaps/di/DataClassesModule.kt
deleted file mode 100644
index 91a56552a7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/di/DataClassesModule.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package info.nightscout.androidaps.di
-
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-import info.nightscout.core.wizard.BolusWizard
-import info.nightscout.core.wizard.QuickWizardEntry
-
-@Module
-@Suppress("unused")
-abstract class DataClassesModule {
-
-    @ContributesAndroidInjector abstract fun bolusWizardInjector(): BolusWizard
-    @ContributesAndroidInjector abstract fun quickWizardEntryInjector(): QuickWizardEntry
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/di/ObjectivesModule.kt b/app/src/main/java/info/nightscout/androidaps/di/ObjectivesModule.kt
deleted file mode 100644
index 200b83579f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/di/ObjectivesModule.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package info.nightscout.androidaps.di
-
diff --git a/app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt b/app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt
index 36e7e7ea45..1186f5fe8c 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt
@@ -2,9 +2,6 @@ package info.nightscout.androidaps.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.plugins.aps.loop.CarbSuggestionReceiver
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBluetoothStateReceiver
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBroadcastReceiver
 import info.nightscout.androidaps.receivers.AutoStartReceiver
 import info.nightscout.androidaps.receivers.BTReceiver
 import info.nightscout.androidaps.receivers.ChargingStateReceiver
@@ -22,9 +19,6 @@ abstract class ReceiversModule {
     @ContributesAndroidInjector abstract fun contributesChargingStateReceiver(): ChargingStateReceiver
     @ContributesAndroidInjector abstract fun contributesDataReceiver(): DataReceiver
     @ContributesAndroidInjector abstract fun contributesKeepAliveWorker(): KeepAliveWorker
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): RileyLinkBluetoothStateReceiver
     @ContributesAndroidInjector abstract fun contributesSmsReceiver(): SmsReceiver
     @ContributesAndroidInjector abstract fun contributesTimeDateOrTZChangeReceiver(): TimeDateOrTZChangeReceiver
-    @ContributesAndroidInjector abstract fun contributesCarbSuggestionReceiver(): CarbSuggestionReceiver
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBroadcastReceiver(): RileyLinkBroadcastReceiver
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/di/UIModule.kt b/app/src/main/java/info/nightscout/androidaps/di/UIModule.kt
deleted file mode 100644
index 457222578e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/di/UIModule.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package info.nightscout.androidaps.di
-
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-import info.nightscout.ui.widget.WidgetConfigureActivity
-import info.nightscout.plugins.skins.SkinListPreference
-import info.nightscout.ui.widget.Widget
-
-@Module
-@Suppress("unused")
-abstract class UIModule {
-
-    @ContributesAndroidInjector abstract fun skinListPreferenceInjector(): SkinListPreference
-    @ContributesAndroidInjector abstract fun contributesWidget(): Widget
-    @ContributesAndroidInjector abstract fun contributesWidgetConfigureActivity(): WidgetConfigureActivity
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/di/WizardModule.kt b/app/src/main/java/info/nightscout/androidaps/di/WizardModule.kt
index 916b1d9785..ee17fb3b3d 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/WizardModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/WizardModule.kt
@@ -4,7 +4,21 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.setupwizard.SWEventListener
 import info.nightscout.androidaps.setupwizard.SWScreen
-import info.nightscout.androidaps.setupwizard.elements.*
+import info.nightscout.androidaps.setupwizard.elements.SWBreak
+import info.nightscout.androidaps.setupwizard.elements.SWButton
+import info.nightscout.androidaps.setupwizard.elements.SWEditEncryptedPassword
+import info.nightscout.androidaps.setupwizard.elements.SWEditIntNumber
+import info.nightscout.androidaps.setupwizard.elements.SWEditNumber
+import info.nightscout.androidaps.setupwizard.elements.SWEditNumberWithUnits
+import info.nightscout.androidaps.setupwizard.elements.SWEditString
+import info.nightscout.androidaps.setupwizard.elements.SWEditUrl
+import info.nightscout.androidaps.setupwizard.elements.SWFragment
+import info.nightscout.androidaps.setupwizard.elements.SWHtmlLink
+import info.nightscout.androidaps.setupwizard.elements.SWInfoText
+import info.nightscout.androidaps.setupwizard.elements.SWItem
+import info.nightscout.androidaps.setupwizard.elements.SWPlugin
+import info.nightscout.androidaps.setupwizard.elements.SWPreference
+import info.nightscout.androidaps.setupwizard.elements.SWRadioButton
 
 @Module
 @Suppress("unused")
@@ -21,7 +35,7 @@ abstract class WizardModule {
     @ContributesAndroidInjector abstract fun swFragmentInjector(): SWFragment
     @ContributesAndroidInjector abstract fun swPreferenceInjector(): SWPreference
     @ContributesAndroidInjector abstract fun swHtmlLinkInjector(): SWHtmlLink
-    @ContributesAndroidInjector abstract fun swInfotextInjector(): SWInfoText
+    @ContributesAndroidInjector abstract fun swInfoTextInjector(): SWInfoText
     @ContributesAndroidInjector abstract fun swItemInjector(): SWItem
     @ContributesAndroidInjector abstract fun swPluginInjector(): SWPlugin
     @ContributesAndroidInjector abstract fun swRadioButtonInjector(): SWRadioButton
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreDataClassesModule.kt b/core/core-main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
similarity index 71%
rename from core/core-main/src/main/java/info/nightscout/androidaps/di/CoreDataClassesModule.kt
rename to core/core-main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
index d015f32590..83e98adda8 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreDataClassesModule.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
@@ -1,10 +1,12 @@
-package info.nightscout.androidaps.di
+package info.nightscout.core.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.aps.loop.APSResultObject
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
 import info.nightscout.core.profile.ProfileStoreObject
+import info.nightscout.core.wizard.BolusWizard
+import info.nightscout.core.wizard.QuickWizardEntry
 import info.nightscout.interfaces.pump.PumpEnactResult
 
 @Module
@@ -14,6 +16,7 @@ abstract class CoreDataClassesModule {
     @ContributesAndroidInjector abstract fun pumpEnactResultInjector(): PumpEnactResult
     @ContributesAndroidInjector abstract fun apsResultInjector(): APSResultObject
     @ContributesAndroidInjector abstract fun autosensDataInjector(): AutosensDataObject
-
     @ContributesAndroidInjector abstract fun profileStoreInjector(): ProfileStoreObject
+    @ContributesAndroidInjector abstract fun bolusWizardInjector(): BolusWizard
+    @ContributesAndroidInjector abstract fun quickWizardEntryInjector(): QuickWizardEntry
 }
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreFragmentsModule.kt b/core/core-main/src/main/java/info/nightscout/core/di/CoreFragmentsModule.kt
similarity index 95%
rename from core/core-main/src/main/java/info/nightscout/androidaps/di/CoreFragmentsModule.kt
rename to core/core-main/src/main/java/info/nightscout/core/di/CoreFragmentsModule.kt
index 9cb9e059f1..83e35b26d2 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreFragmentsModule.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/di/CoreFragmentsModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.di
+package info.nightscout.core.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreModule.kt b/core/core-main/src/main/java/info/nightscout/core/di/CoreModule.kt
similarity index 84%
rename from core/core-main/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
rename to core/core-main/src/main/java/info/nightscout/core/di/CoreModule.kt
index bb79bc7e9e..9fb8e283e7 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/di/CoreModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.di
+package info.nightscout.core.di
 
 import android.content.Context
 import android.os.Build
@@ -11,7 +11,8 @@ import dagger.Provides
         CoreReceiversModule::class,
         CoreFragmentsModule::class,
         CoreDataClassesModule::class,
-        ValidatorsModule::class
+        ValidatorsModule::class,
+        PreferencesModule::class
     ]
 )
 open class CoreModule {
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreReceiversModule.kt b/core/core-main/src/main/java/info/nightscout/core/di/CoreReceiversModule.kt
similarity index 88%
rename from core/core-main/src/main/java/info/nightscout/androidaps/di/CoreReceiversModule.kt
rename to core/core-main/src/main/java/info/nightscout/core/di/CoreReceiversModule.kt
index ed2bc5af94..f6bc260f71 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/di/CoreReceiversModule.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/di/CoreReceiversModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.di
+package info.nightscout.core.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
diff --git a/app/src/main/java/info/nightscout/androidaps/di/PreferencesModule.kt b/core/core-main/src/main/java/info/nightscout/core/di/PreferencesModule.kt
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/di/PreferencesModule.kt
rename to core/core-main/src/main/java/info/nightscout/core/di/PreferencesModule.kt
index 180accfb95..08c20d4822 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/PreferencesModule.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/di/PreferencesModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.di
+package info.nightscout.core.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/di/ValidatorsModule.kt b/core/core-main/src/main/java/info/nightscout/core/di/ValidatorsModule.kt
similarity index 94%
rename from core/core-main/src/main/java/info/nightscout/androidaps/di/ValidatorsModule.kt
rename to core/core-main/src/main/java/info/nightscout/core/di/ValidatorsModule.kt
index 2626b36c9e..e2903a301a 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/di/ValidatorsModule.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/di/ValidatorsModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.di
+package info.nightscout.core.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/LoopModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/LoopModule.kt
new file mode 100644
index 0000000000..b253e7b8fe
--- /dev/null
+++ b/plugins/main/src/main/java/info/nightscout/plugins/di/LoopModule.kt
@@ -0,0 +1,12 @@
+package info.nightscout.plugins.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.plugins.aps.loop.CarbSuggestionReceiver
+
+@Module
+@Suppress("unused")
+abstract class LoopModule {
+
+    @ContributesAndroidInjector abstract fun contributesCarbSuggestionReceiver(): CarbSuggestionReceiver
+}
\ No newline at end of file
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt
index f5d4d8c7a3..0101840517 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt
@@ -12,7 +12,9 @@ import dagger.Module
         SourceModule::class,
         VirtualPumpModule::class,
         ObjectivesModule::class,
-        SkinsModule::class
+        SkinsModule::class,
+        SkinsUiModule::class,
+        LoopModule::class
     ]
 )
 
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/di/SkinsUiModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/SkinsUiModule.kt
new file mode 100644
index 0000000000..2bb1167ed8
--- /dev/null
+++ b/plugins/main/src/main/java/info/nightscout/plugins/di/SkinsUiModule.kt
@@ -0,0 +1,12 @@
+package info.nightscout.plugins.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.plugins.skins.SkinListPreference
+
+@Module
+@Suppress("unused")
+abstract class SkinsUiModule {
+
+    @ContributesAndroidInjector abstract fun skinListPreferenceInjector(): SkinListPreference
+}
\ No newline at end of file
diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
index ffd25e97ea..11f77f6b8c 100644
--- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
+++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
@@ -13,8 +13,15 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.device.Or
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBluetoothStateReceiver
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBroadcastReceiver
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.*
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.DiscoverGattServicesTask
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.InitializePumpManagerTask
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.PumpTask
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTask
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask
 
 @Module
 @Suppress("unused")
@@ -40,4 +47,6 @@ abstract class RileyLinkModule {
     @ContributesAndroidInjector abstract fun contributesRileyLinkBLEConfigActivity(): RileyLinkBLEConfigActivity
 
     @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBroadcastReceiver(): RileyLinkBroadcastReceiver
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): RileyLinkBluetoothStateReceiver
 }
\ No newline at end of file
diff --git a/ui/src/main/java/info/nightscout/ui/di/UiModule.kt b/ui/src/main/java/info/nightscout/ui/di/UiModule.kt
index 6a625a79a8..04fc9f37d8 100644
--- a/ui/src/main/java/info/nightscout/ui/di/UiModule.kt
+++ b/ui/src/main/java/info/nightscout/ui/di/UiModule.kt
@@ -29,11 +29,16 @@ import info.nightscout.ui.dialogs.TempBasalDialog
 import info.nightscout.ui.dialogs.TempTargetDialog
 import info.nightscout.ui.dialogs.TreatmentDialog
 import info.nightscout.ui.dialogs.WizardInfoDialog
+import info.nightscout.ui.widget.Widget
+import info.nightscout.ui.widget.WidgetConfigureActivity
 
 @Module
 @Suppress("unused")
 abstract class UiModule {
 
+    @ContributesAndroidInjector abstract fun contributesWidget(): Widget
+    @ContributesAndroidInjector abstract fun contributesWidgetConfigureActivity(): WidgetConfigureActivity
+
     @ContributesAndroidInjector abstract fun contributesCalibrationDialog(): CalibrationDialog
     @ContributesAndroidInjector abstract fun contributesCarbsDialog(): CarbsDialog
     @ContributesAndroidInjector abstract fun contributesCareDialog(): CareDialog