diff --git a/.run/Run all tests.run.xml b/.run/Run all tests.run.xml
index 16e5767ada..5579eb8de4 100644
--- a/.run/Run all tests.run.xml	
+++ b/.run/Run all tests.run.xml	
@@ -13,11 +13,12 @@
           <option value="testFullDebugUnitTest" />
         </list>
       </option>
-      <option name="vmOptions" />
+      <option name="vmOptions" value="-Xmx6g -XX:+UseParallelGC" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/app/src/main/kotlin/app/aaps/MainActivity.kt b/app/src/main/kotlin/app/aaps/MainActivity.kt
index 115ffb43c1..e20b577970 100644
--- a/app/src/main/kotlin/app/aaps/MainActivity.kt
+++ b/app/src/main/kotlin/app/aaps/MainActivity.kt
@@ -34,6 +34,8 @@ import app.aaps.activities.PreferencesActivity
 import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
 import app.aaps.configuration.activities.SingleFragmentActivity
 import app.aaps.configuration.setupwizard.SetupWizardActivity
+import app.aaps.core.main.utils.CryptoUtil
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.androidPermissions.AndroidPermission
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
@@ -65,8 +67,6 @@ import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.locale.LocaleHelper
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.CryptoUtil
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.isRunningRealPumpTest
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
index 5a95f5295a..c299c1b0b3 100644
--- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
@@ -8,6 +8,9 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.extensions.toVisibilityKeepSpace
@@ -30,10 +33,7 @@ import com.google.android.material.datepicker.MaterialDatePicker
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
-import info.nightscout.core.events.EventIobCalculationProgress
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
-import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.plugins.general.overview.graphData.GraphData
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt
index e76d845c04..3ee4154540 100644
--- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt
+++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt
@@ -1,5 +1,8 @@
 package app.aaps.activities
 
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.profile.DefaultValueHelper
@@ -11,9 +14,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.overview.OverviewDataImpl
 import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
diff --git a/app/src/main/kotlin/app/aaps/di/AppComponent.kt b/app/src/main/kotlin/app/aaps/di/AppComponent.kt
index 99f5c47718..37d0332e33 100644
--- a/app/src/main/kotlin/app/aaps/di/AppComponent.kt
+++ b/app/src/main/kotlin/app/aaps/di/AppComponent.kt
@@ -2,6 +2,7 @@ package app.aaps.di
 
 import app.aaps.MainApp
 import app.aaps.configuration.di.ConfigurationModule
+import app.aaps.core.main.di.CoreModule
 import app.aaps.shared.impl.di.SharedImplModule
 import dagger.BindsInstance
 import dagger.Component
@@ -16,7 +17,6 @@ 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.core.validators.di.ValidatorsModule
 import info.nightscout.database.impl.DatabaseModule
 import info.nightscout.implementation.di.ImplementationModule
diff --git a/app/src/main/kotlin/app/aaps/di/AppModule.kt b/app/src/main/kotlin/app/aaps/di/AppModule.kt
index bf8aa21803..8c3bdbb559 100644
--- a/app/src/main/kotlin/app/aaps/di/AppModule.kt
+++ b/app/src/main/kotlin/app/aaps/di/AppModule.kt
@@ -2,6 +2,7 @@ package app.aaps.di
 
 import android.content.Context
 import app.aaps.MainApp
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.implementations.ConfigImpl
 import app.aaps.implementations.InstantiatorImpl
 import app.aaps.implementations.UiInteractionImpl
@@ -15,7 +16,6 @@ import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.workflow.CalculationWorkflow
 
 @Suppress("unused")
 @Module(
diff --git a/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt b/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt
index b39b93a777..33c9c1482e 100644
--- a/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt
+++ b/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt
@@ -11,13 +11,13 @@ import app.aaps.activities.HistoryBrowseActivity
 import app.aaps.activities.MyPreferenceFragment
 import app.aaps.activities.PreferencesActivity
 import app.aaps.configuration.activities.SingleFragmentActivity
+import app.aaps.core.main.events.EventNewNotification
 import app.aaps.interfaces.notifications.Notification
 import app.aaps.interfaces.nsclient.NSAlarm
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.ui.UiInteraction
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
 import info.nightscout.ui.activities.BolusProgressHelperActivity
diff --git a/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt b/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt
index d7064ed260..b7669838fe 100644
--- a/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt
+++ b/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt
@@ -10,6 +10,8 @@ import androidx.work.WorkQuery
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import app.aaps.configuration.maintenance.MaintenancePlugin
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.alerts.LocalAlertUtils
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
@@ -27,8 +29,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import com.google.common.util.concurrent.ListenableFuture
 import info.nightscout.androidaps.R
-import info.nightscout.core.profile.ProfileSealed
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.TimeUnit
diff --git a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
index 46c782c230..05d2d6eb9e 100644
--- a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
+++ b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
@@ -7,6 +7,12 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.workflow.CalculationWorkflow
+import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB
+import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION
+import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -22,14 +28,8 @@ import app.aaps.interfaces.rx.events.EventPreferenceChange
 import app.aaps.interfaces.rx.events.EventTherapyEventChange
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.core.utils.worker.then
-import info.nightscout.core.workflow.CalculationWorkflow
-import info.nightscout.core.workflow.CalculationWorkflow.Companion.JOB
-import info.nightscout.core.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION
-import info.nightscout.core.workflow.CalculationWorkflow.Companion.PASS
 import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.workflow.DummyWorker
 import info.nightscout.workflow.InvokeLoopWorker
diff --git a/core/main/build.gradle b/core/main/build.gradle
index e4847899bb..fd9df93b21 100644
--- a/core/main/build.gradle
+++ b/core/main/build.gradle
@@ -38,5 +38,5 @@ dependencies {
 }
 
 android {
-    namespace 'info.nightscout.core.main'
+    namespace 'app.aaps.core.main'
 }
diff --git a/core/main/src/main/java/info/nightscout/core/constraints/ConstraintObject.kt b/core/main/src/main/kotlin/app/aaps/core/main/constraints/ConstraintObject.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/constraints/ConstraintObject.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/constraints/ConstraintObject.kt
index 7eeceeff1b..55f8664b2e 100644
--- a/core/main/src/main/java/info/nightscout/core/constraints/ConstraintObject.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/constraints/ConstraintObject.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.constraints
+package app.aaps.core.main.constraints
 
 import app.aaps.interfaces.constraints.Constraint
 import app.aaps.interfaces.logging.AAPSLogger
diff --git a/core/main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt b/core/main/src/main/kotlin/app/aaps/core/main/di/CoreDataClassesModule.kt
similarity index 77%
rename from core/main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/di/CoreDataClassesModule.kt
index 4e4a571551..a34644ab53 100644
--- a/core/main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/di/CoreDataClassesModule.kt
@@ -1,10 +1,10 @@
-package info.nightscout.core.di
+package app.aaps.core.main.di
 
+import app.aaps.core.main.wizard.BolusWizard
+import app.aaps.core.main.wizard.QuickWizardEntry
 import app.aaps.interfaces.pump.PumpEnactResult
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.core.wizard.BolusWizard
-import info.nightscout.core.wizard.QuickWizardEntry
 
 @Module
 @Suppress("unused")
diff --git a/core/main/src/main/java/info/nightscout/core/di/CoreModule.kt b/core/main/src/main/kotlin/app/aaps/core/main/di/CoreModule.kt
similarity index 94%
rename from core/main/src/main/java/info/nightscout/core/di/CoreModule.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/di/CoreModule.kt
index 5d49cc0571..ed7ab2ba46 100644
--- a/core/main/src/main/java/info/nightscout/core/di/CoreModule.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/di/CoreModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.di
+package app.aaps.core.main.di
 
 import android.content.Context
 import android.os.Build
diff --git a/core/main/src/main/java/info/nightscout/core/di/PreferencesModule.kt b/core/main/src/main/kotlin/app/aaps/core/main/di/PreferencesModule.kt
similarity index 73%
rename from core/main/src/main/java/info/nightscout/core/di/PreferencesModule.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/di/PreferencesModule.kt
index 06a4fe6856..83a040f9a9 100644
--- a/core/main/src/main/java/info/nightscout/core/di/PreferencesModule.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/di/PreferencesModule.kt
@@ -1,8 +1,8 @@
-package info.nightscout.core.di
+package app.aaps.core.main.di
 
+import app.aaps.core.main.utils.CryptoUtil
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.core.utils.CryptoUtil
 
 @Module
 @Suppress("unused")
diff --git a/core/main/src/main/java/info/nightscout/core/events/EventIobCalculationProgress.kt b/core/main/src/main/kotlin/app/aaps/core/main/events/EventIobCalculationProgress.kt
similarity index 81%
rename from core/main/src/main/java/info/nightscout/core/events/EventIobCalculationProgress.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/events/EventIobCalculationProgress.kt
index e07cfdebf6..81703a93d7 100644
--- a/core/main/src/main/java/info/nightscout/core/events/EventIobCalculationProgress.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/events/EventIobCalculationProgress.kt
@@ -1,7 +1,7 @@
-package info.nightscout.core.events
+package app.aaps.core.main.events
 
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.rx.events.Event
-import info.nightscout.core.workflow.CalculationWorkflow
 
 class EventIobCalculationProgress(val pass: CalculationWorkflow.ProgressData, private val progressPct: Int, val cause: Event?) : Event() {
 
diff --git a/core/main/src/main/java/info/nightscout/core/events/EventNewNotification.kt b/core/main/src/main/kotlin/app/aaps/core/main/events/EventNewNotification.kt
similarity index 82%
rename from core/main/src/main/java/info/nightscout/core/events/EventNewNotification.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/events/EventNewNotification.kt
index ba0d336090..95f360768d 100644
--- a/core/main/src/main/java/info/nightscout/core/events/EventNewNotification.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/events/EventNewNotification.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.events
+package app.aaps.core.main.events
 
 import app.aaps.interfaces.notifications.Notification
 import app.aaps.interfaces.rx.events.Event
diff --git a/core/main/src/main/java/info/nightscout/core/extensions/BlockExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/BlockExtension.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/extensions/BlockExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/extensions/BlockExtension.kt
index 7f40ad7a89..ca34179778 100644
--- a/core/main/src/main/java/info/nightscout/core/extensions/BlockExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/BlockExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
diff --git a/core/main/src/main/java/info/nightscout/core/extensions/BolusExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/BolusExtension.kt
similarity index 91%
rename from core/main/src/main/java/info/nightscout/core/extensions/BolusExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/extensions/BolusExtension.kt
index 32fa43ac68..17e43b09cd 100644
--- a/core/main/src/main/java/info/nightscout/core/extensions/BolusExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/BolusExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.insulin.Insulin
 import app.aaps.interfaces.iob.Iob
diff --git a/core/main/src/main/java/info/nightscout/core/extensions/ExtendedBolusExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ExtendedBolusExtension.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/extensions/ExtendedBolusExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/extensions/ExtendedBolusExtension.kt
index 730854d3b1..5bb9ab61a3 100644
--- a/core/main/src/main/java/info/nightscout/core/extensions/ExtendedBolusExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ExtendedBolusExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.insulin.Insulin
diff --git a/core/main/src/main/java/info/nightscout/core/extensions/GlucoseValueExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/GlucoseValueExtension.kt
similarity index 95%
rename from core/main/src/main/java/info/nightscout/core/extensions/GlucoseValueExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/extensions/GlucoseValueExtension.kt
index b4f5a3fbfc..c5abe99dae 100644
--- a/core/main/src/main/java/info/nightscout/core/extensions/GlucoseValueExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/GlucoseValueExtension.kt
@@ -1,10 +1,10 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
+import app.aaps.core.main.R
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.iob.InMemoryGlucoseValue
 import app.aaps.interfaces.utils.DateUtil
-import info.nightscout.core.main.R
 import info.nightscout.database.entities.GlucoseValue
 import org.json.JSONObject
 
diff --git a/core/main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt
similarity index 96%
rename from core/main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt
index 510b2c86d5..107b030d30 100644
--- a/core/main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/ProfileSwitchExtension.kt
@@ -1,12 +1,12 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.profile.PureProfile
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.ProfileSwitch
 import org.json.JSONObject
diff --git a/core/main/src/main/java/info/nightscout/core/extensions/TemporaryBasalExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryBasalExtension.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/extensions/TemporaryBasalExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryBasalExtension.kt
index 24a70e6764..1452f3e112 100644
--- a/core/main/src/main/java/info/nightscout/core/extensions/TemporaryBasalExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryBasalExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.insulin.Insulin
diff --git a/core/main/src/main/java/info/nightscout/core/extensions/TemporaryTargetExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt
similarity index 97%
rename from core/main/src/main/java/info/nightscout/core/extensions/TemporaryTargetExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt
index 1a748ea9b3..401a8c471e 100644
--- a/core/main/src/main/java/info/nightscout/core/extensions/TemporaryTargetExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
diff --git a/core/main/src/main/java/info/nightscout/core/extensions/TherapyEventExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TherapyEventExtension.kt
similarity index 93%
rename from core/main/src/main/java/info/nightscout/core/extensions/TherapyEventExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/extensions/TherapyEventExtension.kt
index 6b36ece442..6bdf2137b8 100644
--- a/core/main/src/main/java/info/nightscout/core/extensions/TherapyEventExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TherapyEventExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.utils.DateUtil
diff --git a/core/main/src/main/java/info/nightscout/core/graph/ActivityGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/ActivityGraph.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/graph/ActivityGraph.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/ActivityGraph.kt
index 80b8607b25..99e98a0474 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/ActivityGraph.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/ActivityGraph.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.graphics.Color
diff --git a/core/main/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt
index 43c568521e..fc24b3aab4 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/core/main/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt
index fed3ace68e..52e96fc83a 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/core/main/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt
index f31618a4d3..1b9a3f850e 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/core/main/src/main/java/info/nightscout/core/graph/OverviewData.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/OverviewData.kt
similarity index 93%
rename from core/main/src/main/java/info/nightscout/core/graph/OverviewData.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/OverviewData.kt
index 967704d78e..6a99b7c192 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/OverviewData.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/OverviewData.kt
@@ -1,9 +1,15 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
+import app.aaps.core.main.graph.data.DataPointWithLabelInterface
+import app.aaps.core.main.graph.data.DeviationDataPoint
+import app.aaps.core.main.graph.data.FixedLineGraphSeries
+import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
+import app.aaps.core.main.graph.data.Scale
+import app.aaps.core.main.graph.data.ScaledDataPoint
 import app.aaps.interfaces.aps.AutosensData
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.iob.CobInfo
@@ -13,12 +19,6 @@ import app.aaps.interfaces.iob.IobTotal
 import com.jjoe64.graphview.series.BarGraphSeries
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
-import info.nightscout.core.graph.data.DataPointWithLabelInterface
-import info.nightscout.core.graph.data.DeviationDataPoint
-import info.nightscout.core.graph.data.FixedLineGraphSeries
-import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
-import info.nightscout.core.graph.data.Scale
-import info.nightscout.core.graph.data.ScaledDataPoint
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TemporaryTarget
 
diff --git a/core/main/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt
similarity index 97%
rename from core/main/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt
index ef59d98016..8d34277c22 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt
@@ -1,15 +1,15 @@
-package info.nightscout.core.graph
+package app.aaps.core.main.graph
 
 import android.content.Context
 import android.util.AttributeSet
+import app.aaps.core.main.graph.data.AreaGraphSeries
+import app.aaps.core.main.graph.data.DoubleDataPoint
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.utils.Round
 import com.jjoe64.graphview.DefaultLabelFormatter
 import com.jjoe64.graphview.GraphView
-import info.nightscout.core.graph.data.AreaGraphSeries
-import info.nightscout.core.graph.data.DoubleDataPoint
 import java.text.NumberFormat
 import kotlin.math.max
 import kotlin.math.min
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/AreaGraphSeries.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/AreaGraphSeries.kt
index 381289f1c2..cd92c0ad2c 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/AreaGraphSeries.kt
@@ -17,7 +17,7 @@
  * with the "Linking Exception" along with this program; if not,
  * write to the author Jonas Gehring <g.jjoe64></g.jjoe64>@gmail.com>.
  */
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.graphics.Canvas
 import android.graphics.Color
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt
similarity index 97%
rename from core/main/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt
index 35798b5ad9..24a4044dcb 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt
similarity index 92%
rename from core/main/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt
index f1b982feb9..df6f8ebd59 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt
@@ -1,9 +1,9 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
+import app.aaps.core.main.R
 import app.aaps.interfaces.resources.ResourceHelper
-import info.nightscout.core.main.R
 import info.nightscout.database.entities.Carbs
 
 class CarbsDataPoint(
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/DataPointWithLabelInterface.kt
similarity index 92%
rename from core/main/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/DataPointWithLabelInterface.kt
index b4bd18b363..c83a77914f 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/DataPointWithLabelInterface.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/DeviationDataPoint.kt
similarity index 73%
rename from core/main/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/DeviationDataPoint.kt
index 8d9b44a2ff..b9d538d10e 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/DeviationDataPoint.kt
@@ -1,3 +1,3 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 class DeviationDataPoint(x: Double, y: Double, var color: Int, scale: Scale) : ScaledDataPoint(x, y, scale)
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/DoubleDataPoint.kt
similarity index 85%
rename from core/main/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/DoubleDataPoint.kt
index 98239258c5..ff4b686a18 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/DoubleDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import com.jjoe64.graphview.series.DataPointInterface
 
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt
similarity index 97%
rename from core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt
index 5ee96e1d88..8b0319493f 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt
similarity index 96%
rename from core/main/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt
index ab79a978da..f1ecde95a4 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/FixedLineGraphSeries.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/FixedLineGraphSeries.kt
index 5b978b32d2..23736be85f 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/FixedLineGraphSeries.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.graphics.Canvas
 import android.graphics.Color
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt
index 3ab19d4d5b..baec123f83 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt
similarity index 95%
rename from core/main/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt
index 15be38e203..2b3cf13871 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt
similarity index 97%
rename from core/main/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt
index 38d4b82d4b..78e4b18cd2 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/PointsWithLabelGraphSeries.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/PointsWithLabelGraphSeries.kt
index 40075fa492..a803a03331 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/PointsWithLabelGraphSeries.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.graphics.Canvas
 import android.graphics.Color
@@ -9,9 +9,9 @@ import android.graphics.PorterDuff
 import android.graphics.Rect
 import android.graphics.Typeface
 import androidx.core.content.ContextCompat
+import app.aaps.core.main.R
 import com.jjoe64.graphview.GraphView
 import com.jjoe64.graphview.series.BaseSeries
-import info.nightscout.core.main.R
 
 /**
  * Series that plots the data as points.
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/Scale.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/Scale.kt
similarity index 80%
rename from core/main/src/main/java/info/nightscout/core/graph/data/Scale.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/Scale.kt
index 8b3d7d66cb..2564680f07 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/Scale.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/Scale.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 class Scale(var shift: Double = 0.0, var multiplier: Double = 1.0) {
 
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ScaledDataPoint.kt
similarity index 93%
rename from core/main/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/ScaledDataPoint.kt
index af545e8c1e..0123ec0c30 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ScaledDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import com.jjoe64.graphview.series.DataPointInterface
 
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt
index 69d9003eb4..4990a3c258 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TimeAsXAxisLabelFormatter.kt
similarity index 88%
rename from core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/graph/data/TimeAsXAxisLabelFormatter.kt
index 277366ee3f..9ac4cef521 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TimeAsXAxisLabelFormatter.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.graph.data
+package app.aaps.core.main.graph.data
 
 import com.jjoe64.graphview.DefaultLabelFormatter
 import java.text.DateFormat
@@ -21,7 +21,7 @@ class TimeAsXAxisLabelFormatter(private val format: String) : DefaultLabelFormat
                 //                Fatal Exception: java.lang.NullPointerException
                 //                Attempt to invoke virtual method 'double com.jjoe64.graphview.Viewport.getMaxY(boolean)' on a null object reference
                 //                com.jjoe64.graphview.DefaultLabelFormatter.formatLabel (DefaultLabelFormatter.java:89)
-                //                info.nightscout.core.graph.data.TimeAsXAxisLabelFormatter.formatLabel (TimeAsXAxisLabelFormatter.java:26)
+                //                app.aaps.core.main.graph.data.TimeAsXAxisLabelFormatter.formatLabel (TimeAsXAxisLabelFormatter.java:26)
                 //                com.jjoe64.graphview.GridLabelRenderer.drawVerticalSteps (GridLabelRenderer.java:1057)
                 //                com.jjoe64.graphview.GridLabelRenderer.draw (GridLabelRenderer.java:866)
                 //                com.jjoe64.graphview.GraphView.onDraw (GraphView.java:296)
diff --git a/core/main/src/main/java/info/nightscout/core/iob/CobInfoExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt
similarity index 96%
rename from core/main/src/main/java/info/nightscout/core/iob/CobInfoExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt
index c017ec1d19..d66b1b6740 100644
--- a/core/main/src/main/java/info/nightscout/core/iob/CobInfoExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.iob
+package app.aaps.core.main.iob
 
 import app.aaps.interfaces.iob.CobInfo
 import app.aaps.interfaces.resources.ResourceHelper
diff --git a/core/main/src/main/java/info/nightscout/core/iob/GlucoseStatusExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/iob/GlucoseStatusExtension.kt
similarity index 96%
rename from core/main/src/main/java/info/nightscout/core/iob/GlucoseStatusExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/iob/GlucoseStatusExtension.kt
index 9a6240e2db..fd3502cd9e 100644
--- a/core/main/src/main/java/info/nightscout/core/iob/GlucoseStatusExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/iob/GlucoseStatusExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.iob
+package app.aaps.core.main.iob
 
 import app.aaps.interfaces.iob.GlucoseStatus
 import app.aaps.interfaces.utils.DecimalFormatter
diff --git a/core/main/src/main/java/info/nightscout/core/iob/IobTotalExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/iob/IobTotalExtension.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/iob/IobTotalExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/iob/IobTotalExtension.kt
index 468a079f97..da8c34cc02 100644
--- a/core/main/src/main/java/info/nightscout/core/iob/IobTotalExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/iob/IobTotalExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.iob
+package app.aaps.core.main.iob
 
 import app.aaps.interfaces.iob.IobTotal
 import app.aaps.interfaces.utils.DateUtil
diff --git a/core/main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt b/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt
similarity index 97%
rename from core/main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt
index e718670190..e69bc9ea8f 100644
--- a/core/main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt
@@ -1,5 +1,12 @@
-package info.nightscout.core.profile
+package app.aaps.core.main.profile
 
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.extensions.blockValueBySeconds
+import app.aaps.core.main.extensions.highTargetBlockValueBySeconds
+import app.aaps.core.main.extensions.lowTargetBlockValueBySeconds
+import app.aaps.core.main.extensions.shiftBlock
+import app.aaps.core.main.extensions.shiftTargetBlock
+import app.aaps.core.main.extensions.targetBlockValueBySeconds
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.notifications.Notification
@@ -12,13 +19,6 @@ import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.events.EventNewNotification
-import info.nightscout.core.extensions.blockValueBySeconds
-import info.nightscout.core.extensions.highTargetBlockValueBySeconds
-import info.nightscout.core.extensions.lowTargetBlockValueBySeconds
-import info.nightscout.core.extensions.shiftBlock
-import info.nightscout.core.extensions.shiftTargetBlock
-import info.nightscout.core.extensions.targetBlockValueBySeconds
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.ProfileSwitch
diff --git a/core/main/src/main/java/info/nightscout/core/pump/PumpEnactResultExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/pump/PumpEnactResultExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt
index 23ba166182..f9ea8195bd 100644
--- a/core/main/src/main/java/info/nightscout/core/pump/PumpEnactResultExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.pump
+package app.aaps.core.main.pump
 
 import app.aaps.interfaces.pump.PumpEnactResult
 import app.aaps.interfaces.resources.ResourceHelper
diff --git a/core/main/src/main/java/info/nightscout/core/pump/PumpTypeExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpTypeExtension.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/pump/PumpTypeExtension.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/pump/PumpTypeExtension.kt
index a8897d60b2..cf398996c9 100644
--- a/core/main/src/main/java/info/nightscout/core/pump/PumpTypeExtension.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpTypeExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.pump
+package app.aaps.core.main.pump
 
 import app.aaps.interfaces.pump.defs.PumpType
 import info.nightscout.database.entities.UserEntry
diff --git a/core/main/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/ActionModeHelper.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/utils/ActionModeHelper.kt
index 8998181f25..53bc485dad 100644
--- a/core/main/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/ActionModeHelper.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.utils
+package app.aaps.core.main.utils
 
 import android.util.SparseArray
 import android.view.ActionMode
@@ -8,8 +8,8 @@ import android.view.MenuItem
 import androidx.core.view.MenuCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import app.aaps.core.main.R
 import app.aaps.interfaces.resources.ResourceHelper
-import info.nightscout.core.main.R
 
 class ActionModeHelper<T>(val rh: ResourceHelper, val activity: FragmentActivity?, val fragment: Fragment?) {
 
diff --git a/core/main/src/main/java/info/nightscout/core/utils/CryptoUtil.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/utils/CryptoUtil.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt
index 8632a5671f..407eec19e5 100644
--- a/core/main/src/main/java/info/nightscout/core/utils/CryptoUtil.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/CryptoUtil.kt
@@ -1,6 +1,7 @@
-package info.nightscout.core.utils
+package app.aaps.core.main.utils
 
 import app.aaps.interfaces.logging.AAPSLogger
+import info.nightscout.core.utils.toHex
 import org.spongycastle.util.encoders.Base64
 import java.nio.ByteBuffer
 import java.security.MessageDigest
diff --git a/core/main/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/HtmlString.kt
similarity index 91%
rename from core/main/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/HtmlString.kt
index f84a150f86..c478905c71 100644
--- a/core/main/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/HtmlString.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.utils.extensions
+package app.aaps.core.main.utils.extensions
 
 import android.content.Context
 import androidx.annotation.AttrRes
diff --git a/core/main/src/main/java/info/nightscout/core/utils/extensions/JSONObjectExt.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/JSONObjectExt.kt
similarity index 97%
rename from core/main/src/main/java/info/nightscout/core/utils/extensions/JSONObjectExt.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/JSONObjectExt.kt
index 72ad0d9f7c..2eb2dec1ae 100644
--- a/core/main/src/main/java/info/nightscout/core/utils/extensions/JSONObjectExt.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/extensions/JSONObjectExt.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.utils.extensions
+package app.aaps.core.main.utils.extensions
 
 import androidx.annotation.StringRes
 import app.aaps.interfaces.resources.ResourceHelper
diff --git a/core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt
similarity index 99%
rename from core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt
index a665a9038a..a15cf0754c 100644
--- a/core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.utils.fabric
+package app.aaps.core.main.utils.fabric
 
 import android.os.Bundle
 import app.aaps.annotations.OpenForTesting
diff --git a/core/main/src/main/java/info/nightscout/core/utils/worker/LoggingWorker.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt
similarity index 91%
rename from core/main/src/main/java/info/nightscout/core/utils/worker/LoggingWorker.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt
index 791f65fc7e..af8af197a2 100644
--- a/core/main/src/main/java/info/nightscout/core/utils/worker/LoggingWorker.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt
@@ -1,12 +1,12 @@
-package info.nightscout.core.utils.worker
+package app.aaps.core.main.utils.worker
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
diff --git a/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt
index 789fe71052..815a33fe2e 100644
--- a/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt
@@ -1,7 +1,12 @@
-package info.nightscout.core.wizard
+package app.aaps.core.main.wizard
 
 import android.content.Context
 import android.text.Spanned
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.extensions.highValueToUnitsToString
+import app.aaps.core.main.extensions.lowValueToUnitsToString
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.utils.extensions.formatColor
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.automation.Automation
 import app.aaps.interfaces.configuration.Config
@@ -33,13 +38,8 @@ import app.aaps.interfaces.utils.Round
 import app.aaps.interfaces.utils.T
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.extensions.highValueToUnitsToString
-import info.nightscout.core.extensions.lowValueToUnitsToString
-import info.nightscout.core.iob.round
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.TemporaryTarget
diff --git a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizard.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizard.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/wizard/QuickWizard.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizard.kt
index c06619ca2b..03b4650f74 100644
--- a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizard.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizard.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.wizard
+package app.aaps.core.main.wizard
 
 import app.aaps.interfaces.sharedPreferences.SP
 import dagger.android.HasAndroidInjector
diff --git a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt
similarity index 98%
rename from core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt
index 5433cb2880..5ffc702ea7 100644
--- a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/QuickWizardEntry.kt
@@ -1,6 +1,8 @@
-package info.nightscout.core.wizard
+package app.aaps.core.main.wizard
 
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.extensions.valueToUnits
+import app.aaps.core.main.iob.round
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.db.PersistenceLayer
 import app.aaps.interfaces.iob.GlucoseStatusProvider
@@ -12,8 +14,6 @@ import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.valueToUnits
-import info.nightscout.core.iob.round
 import info.nightscout.core.utils.JsonHelper.safeGetInt
 import info.nightscout.core.utils.JsonHelper.safeGetString
 import info.nightscout.core.utils.MidnightUtils
diff --git a/core/main/src/main/java/info/nightscout/core/workflow/CalculationWorkflow.kt b/core/main/src/main/kotlin/app/aaps/core/main/workflow/CalculationWorkflow.kt
similarity index 93%
rename from core/main/src/main/java/info/nightscout/core/workflow/CalculationWorkflow.kt
rename to core/main/src/main/kotlin/app/aaps/core/main/workflow/CalculationWorkflow.kt
index ddc6fdcddb..27d32a0edb 100644
--- a/core/main/src/main/java/info/nightscout/core/workflow/CalculationWorkflow.kt
+++ b/core/main/src/main/kotlin/app/aaps/core/main/workflow/CalculationWorkflow.kt
@@ -1,8 +1,8 @@
-package info.nightscout.core.workflow
+package app.aaps.core.main.workflow
 
+import app.aaps.core.main.graph.OverviewData
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.rx.events.Event
-import info.nightscout.core.graph.OverviewData
 
 interface CalculationWorkflow {
     companion object {
diff --git a/core/main/src/test/java/info/nightscout/core/data/ConstraintTest.kt b/core/main/src/test/kotlin/app/aaps/core/main/constraints/ConstraintObjectTest.kt
similarity index 62%
rename from core/main/src/test/java/info/nightscout/core/data/ConstraintTest.kt
rename to core/main/src/test/kotlin/app/aaps/core/main/constraints/ConstraintObjectTest.kt
index 16943880c4..c45fb2f9d3 100644
--- a/core/main/src/test/java/info/nightscout/core/data/ConstraintTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/core/main/constraints/ConstraintObjectTest.kt
@@ -1,14 +1,13 @@
-package info.nightscout.core.data
+package app.aaps.core.main.constraints
 
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Test
 
 /**
  * Created by mike on 19.03.2018.
  */
-class ConstraintTest : TestBase() {
+class ConstraintObjectTest : TestBase() {
 
     @Test fun doTests() {
         val b = ConstraintObject(true, aapsLogger)
@@ -21,30 +20,30 @@ class ConstraintTest : TestBase() {
         assertThat(b.getMostLimitedReasons()).isEmpty()
         b.set(true, "Set true", this)
         assertThat(b.value()).isTrue()
-        assertThat(b.getReasons()).isEqualTo("ConstraintTest: Set true")
-        assertThat(b.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set true")
+        assertThat(b.getReasons()).isEqualTo("ConstraintObjectTest: Set true")
+        assertThat(b.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set true")
         b.set(false, "Set false", this)
         assertThat(b.value()).isFalse()
-        assertThat(b.getReasons()).isEqualTo("ConstraintTest: Set true\nConstraintTest: Set false")
-        assertThat(b.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set true\nConstraintTest: Set false")
+        assertThat(b.getReasons()).isEqualTo("ConstraintObjectTest: Set true\nConstraintObjectTest: Set false")
+        assertThat(b.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set true\nConstraintObjectTest: Set false")
         val d = ConstraintObject(10.0, aapsLogger)
         d.set(5.0, "Set 5d", this)
         assertThat(d.value()).isWithin(0.01).of(5.0)
-        assertThat(d.getReasons()).isEqualTo("ConstraintTest: Set 5d")
-        assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set 5d")
+        assertThat(d.getReasons()).isEqualTo("ConstraintObjectTest: Set 5d")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set 5d")
         d.setIfSmaller(6.0, "Set 6d", this)
         assertThat(d.value()).isWithin(0.01).of(5.0)
-        assertThat(d.getReasons()).isEqualTo("ConstraintTest: Set 5d\nConstraintTest: Set 6d")
-        assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set 5d")
+        assertThat(d.getReasons()).isEqualTo("ConstraintObjectTest: Set 5d\nConstraintObjectTest: Set 6d")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set 5d")
         d.setIfSmaller(4.0, "Set 4d", this)
         assertThat(d.value()).isWithin(0.01).of(4.0)
-        assertThat(d.getReasons()).isEqualTo("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d")
-        assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set 4d")
+        assertThat(d.getReasons()).isEqualTo("ConstraintObjectTest: Set 5d\nConstraintObjectTest: Set 6d\nConstraintObjectTest: Set 4d")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set 4d")
         assertThat(d.originalValue()).isWithin(0.01).of(10.0)
         d.setIfDifferent(7.0, "Set 7d", this)
         assertThat(d.value()).isWithin(0.01).of(7.0)
-        assertThat(d.getReasons()).isEqualTo("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d\nConstraintTest: Set 7d")
-        assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintTest: Set 4d\nConstraintTest: Set 7d")
+        assertThat(d.getReasons()).isEqualTo("ConstraintObjectTest: Set 5d\nConstraintObjectTest: Set 6d\nConstraintObjectTest: Set 4d\nConstraintObjectTest: Set 7d")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("ConstraintObjectTest: Set 4d\nConstraintObjectTest: Set 7d")
         assertThat(d.originalValue()).isWithin(0.01).of(10.0)
     }
 }
diff --git a/core/main/src/test/java/info/nightscout/core/extensions/BlockExtensionKtTest.kt b/core/main/src/test/kotlin/app/aaps/core/main/extensions/BlockExtensionKtTest.kt
similarity index 99%
rename from core/main/src/test/java/info/nightscout/core/extensions/BlockExtensionKtTest.kt
rename to core/main/src/test/kotlin/app/aaps/core/main/extensions/BlockExtensionKtTest.kt
index dd658d5eed..549ebac697 100644
--- a/core/main/src/test/java/info/nightscout/core/extensions/BlockExtensionKtTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/core/main/extensions/BlockExtensionKtTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.extensions
+package app.aaps.core.main.extensions
 
 import app.aaps.interfaces.utils.T
 import com.google.common.truth.Truth.assertThat
diff --git a/core/main/src/test/java/info/nightscout/core/utils/CryptoUtilTest.kt b/core/main/src/test/kotlin/app/aaps/core/main/utils/CryptoUtilTest.kt
similarity index 99%
rename from core/main/src/test/java/info/nightscout/core/utils/CryptoUtilTest.kt
rename to core/main/src/test/kotlin/app/aaps/core/main/utils/CryptoUtilTest.kt
index 09145c37d4..6f63cdd66e 100644
--- a/core/main/src/test/java/info/nightscout/core/utils/CryptoUtilTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/core/main/utils/CryptoUtilTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.utils
+package app.aaps.core.main.utils
 
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
diff --git a/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt b/core/main/src/test/kotlin/app/aaps/core/main/utils/DateUtilImplTest.kt
similarity index 98%
rename from core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt
rename to core/main/src/test/kotlin/app/aaps/core/main/utils/DateUtilImplTest.kt
index 30ef584543..137012df33 100644
--- a/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/core/main/utils/DateUtilImplTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.utils
+package app.aaps.core.main.utils
 
 import android.content.Context
 import app.aaps.interfaces.resources.ResourceHelper
@@ -15,7 +15,7 @@ import java.util.Date
 import java.util.SimpleTimeZone
 import java.util.TimeZone
 
-class DateUtilTest : TestBase() {
+class DateUtilImplTest : TestBase() {
 
     @Mock lateinit var context: Context
     @Mock lateinit var rh: ResourceHelper
diff --git a/core/main/src/test/java/info/nightscout/core/wizard/QuickWizardTest.kt b/core/main/src/test/kotlin/app/aaps/core/main/wizard/QuickWizardTest.kt
similarity index 98%
rename from core/main/src/test/java/info/nightscout/core/wizard/QuickWizardTest.kt
rename to core/main/src/test/kotlin/app/aaps/core/main/wizard/QuickWizardTest.kt
index 7eb4dd2e26..beb8f4b00d 100644
--- a/core/main/src/test/java/info/nightscout/core/wizard/QuickWizardTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/core/main/wizard/QuickWizardTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.wizard
+package app.aaps.core.main.wizard
 
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.profile.ProfileFunction
diff --git a/core/main/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValueDataPointTest.kt
similarity index 94%
rename from core/main/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValueDataPointTest.kt
index 7ad62b96a0..2323166db3 100644
--- a/core/main/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/iob/InMemoryGlucoseValueDataPointTest.kt
@@ -1,9 +1,9 @@
-package info.nightscout.core.graph.data
+package app.aaps.interfaces.iob
 
 import android.content.Context
 import android.graphics.Color
+import app.aaps.core.main.graph.data.InMemoryGlucoseValueDataPoint
 import app.aaps.interfaces.db.GlucoseUnit
-import app.aaps.interfaces.iob.InMemoryGlucoseValue
 import app.aaps.interfaces.profile.DefaultValueHelper
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.resources.ResourceHelper
diff --git a/core/main/src/test/java/info/nightscout/core/data/IobTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTest.kt
similarity index 93%
rename from core/main/src/test/java/info/nightscout/core/data/IobTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTest.kt
index 4f1effc750..abd234cd5d 100644
--- a/core/main/src/test/java/info/nightscout/core/data/IobTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTest.kt
@@ -1,6 +1,5 @@
-package info.nightscout.core.data
+package app.aaps.interfaces.iob
 
-import app.aaps.interfaces.iob.Iob
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/core/main/src/test/java/info/nightscout/core/data/IobTotalTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTotalTest.kt
similarity index 94%
rename from core/main/src/test/java/info/nightscout/core/data/IobTotalTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTotalTest.kt
index 797652978b..1f543cda7f 100644
--- a/core/main/src/test/java/info/nightscout/core/data/IobTotalTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/iob/IobTotalTest.kt
@@ -1,17 +1,16 @@
-package info.nightscout.core.data
+package app.aaps.interfaces.iob
 
 import android.content.Context
-import app.aaps.interfaces.iob.IobTotal
+import app.aaps.core.main.iob.combine
+import app.aaps.core.main.iob.copy
+import app.aaps.core.main.iob.determineBasalJson
+import app.aaps.core.main.iob.json
+import app.aaps.core.main.iob.plus
+import app.aaps.core.main.iob.round
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.shared.impl.utils.DateUtilImpl
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.iob.combine
-import info.nightscout.core.iob.copy
-import info.nightscout.core.iob.determineBasalJson
-import info.nightscout.core.iob.json
-import info.nightscout.core.iob.plus
-import info.nightscout.core.iob.round
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.Mock
diff --git a/core/main/src/test/java/info/nightscout/core/data/MealDataTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/iob/MealDataTest.kt
similarity index 75%
rename from core/main/src/test/java/info/nightscout/core/data/MealDataTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/iob/MealDataTest.kt
index 48961eed13..be23f55663 100644
--- a/core/main/src/test/java/info/nightscout/core/data/MealDataTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/iob/MealDataTest.kt
@@ -1,6 +1,5 @@
-package info.nightscout.core.data
+package app.aaps.interfaces.iob
 
-import app.aaps.interfaces.iob.MealData
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/core/main/src/test/java/info/nightscout/core/interfaces/PluginDescriptionTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/plugin/PluginDescriptionTest.kt
similarity index 94%
rename from core/main/src/test/java/info/nightscout/core/interfaces/PluginDescriptionTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/plugin/PluginDescriptionTest.kt
index eafc78fd27..346e3755ad 100644
--- a/core/main/src/test/java/info/nightscout/core/interfaces/PluginDescriptionTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/plugin/PluginDescriptionTest.kt
@@ -1,8 +1,6 @@
-package info.nightscout.core.interfaces
+package app.aaps.interfaces.plugin
 
 import androidx.fragment.app.Fragment
-import app.aaps.interfaces.plugin.PluginDescription
-import app.aaps.interfaces.plugin.PluginType
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/core/main/src/test/java/info/nightscout/core/data/ProfileTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt
similarity index 98%
rename from core/main/src/test/java/info/nightscout/core/data/ProfileTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt
index 7eafcfda94..6d559458c3 100644
--- a/core/main/src/test/java/info/nightscout/core/data/ProfileTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt
@@ -1,6 +1,8 @@
-package info.nightscout.core.data
+package app.aaps.interfaces.profile
 
 import android.content.Context
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.resources.ResourceHelper
@@ -13,8 +15,6 @@ import app.aaps.shared.tests.TestBase
 import app.aaps.shared.tests.TestPumpPlugin
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import org.json.JSONObject
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -27,7 +27,7 @@ import java.util.Calendar
 /**
  * Created by mike on 18.03.2018.
  */
-class ProfileTest : TestBase() {
+class ProfileSealedTest : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
     @Mock lateinit var rh: ResourceHelper
diff --git a/core/main/src/test/java/info/nightscout/core/data/DetailedBolusInfoTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoTest.kt
similarity index 98%
rename from core/main/src/test/java/info/nightscout/core/data/DetailedBolusInfoTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoTest.kt
index 281cf22b88..0cb8d11eb3 100644
--- a/core/main/src/test/java/info/nightscout/core/data/DetailedBolusInfoTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/pump/DetailedBolusInfoTest.kt
@@ -1,7 +1,6 @@
-package info.nightscout.core.data
+package app.aaps.interfaces.pump
 
 import android.content.Context
-import app.aaps.interfaces.pump.DetailedBolusInfo
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import com.google.gson.Gson
diff --git a/core/main/src/test/java/info/nightscout/core/interfaces/PumpDescriptionTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/pump/defs/PumpDescriptionTest.kt
similarity index 91%
rename from core/main/src/test/java/info/nightscout/core/interfaces/PumpDescriptionTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/pump/defs/PumpDescriptionTest.kt
index b1378c25ce..15e9e95f51 100644
--- a/core/main/src/test/java/info/nightscout/core/interfaces/PumpDescriptionTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/pump/defs/PumpDescriptionTest.kt
@@ -1,9 +1,5 @@
-package info.nightscout.core.interfaces
+package app.aaps.interfaces.pump.defs
 
-import app.aaps.interfaces.pump.defs.PumpCapability
-import app.aaps.interfaces.pump.defs.PumpDescription
-import app.aaps.interfaces.pump.defs.PumpTempBasalType
-import app.aaps.interfaces.pump.defs.PumpType
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/core/main/src/test/java/info/nightscout/core/utils/MidnightTimeTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/utils/MidnightTimeTest.kt
similarity index 95%
rename from core/main/src/test/java/info/nightscout/core/utils/MidnightTimeTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/utils/MidnightTimeTest.kt
index fe977a652d..2bef9e91bc 100644
--- a/core/main/src/test/java/info/nightscout/core/utils/MidnightTimeTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/utils/MidnightTimeTest.kt
@@ -1,6 +1,5 @@
-package info.nightscout.core.utils
+package app.aaps.interfaces.utils
 
-import app.aaps.interfaces.utils.MidnightTime
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 import java.util.Calendar
diff --git a/core/main/src/test/java/info/nightscout/core/utils/RoundTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/utils/RoundTest.kt
similarity index 95%
rename from core/main/src/test/java/info/nightscout/core/utils/RoundTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/utils/RoundTest.kt
index 553a2bf628..95e841ff26 100644
--- a/core/main/src/test/java/info/nightscout/core/utils/RoundTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/utils/RoundTest.kt
@@ -1,6 +1,5 @@
-package info.nightscout.core.utils
+package app.aaps.interfaces.utils
 
-import app.aaps.interfaces.utils.Round
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/core/main/src/test/java/info/nightscout/core/utils/TTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/utils/TTest.kt
similarity index 95%
rename from core/main/src/test/java/info/nightscout/core/utils/TTest.kt
rename to core/main/src/test/kotlin/app/aaps/interfaces/utils/TTest.kt
index 15c28226ee..28841f289d 100644
--- a/core/main/src/test/java/info/nightscout/core/utils/TTest.kt
+++ b/core/main/src/test/kotlin/app/aaps/interfaces/utils/TTest.kt
@@ -1,6 +1,5 @@
-package info.nightscout.core.utils
+package app.aaps.interfaces.utils
 
-import app.aaps.interfaces.utils.T
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 import kotlin.math.abs
diff --git a/core/main/src/test/java/info/nightscout/core/utils/JsonHelperTest.kt b/core/utils/src/test/kotlin/app/aaps/core/utils/JsonHelperTest.kt
similarity index 97%
rename from core/main/src/test/java/info/nightscout/core/utils/JsonHelperTest.kt
rename to core/utils/src/test/kotlin/app/aaps/core/utils/JsonHelperTest.kt
index cd99713311..126649cfd8 100644
--- a/core/main/src/test/java/info/nightscout/core/utils/JsonHelperTest.kt
+++ b/core/utils/src/test/kotlin/app/aaps/core/utils/JsonHelperTest.kt
@@ -1,6 +1,7 @@
-package info.nightscout.core.utils
+package app.aaps.core.utils
 
 import com.google.common.truth.Truth.assertThat
+import info.nightscout.core.utils.JsonHelper
 import org.json.JSONObject
 import org.junit.jupiter.api.Test
 
diff --git a/core/main/src/test/java/info/nightscout/core/utils/StringUtilsTest.kt b/core/utils/src/test/kotlin/app/aaps/core/utils/receivers/StringUtilsTest.kt
similarity index 96%
rename from core/main/src/test/java/info/nightscout/core/utils/StringUtilsTest.kt
rename to core/utils/src/test/kotlin/app/aaps/core/utils/receivers/StringUtilsTest.kt
index 3b0f005ddc..8acc041dea 100644
--- a/core/main/src/test/java/info/nightscout/core/utils/StringUtilsTest.kt
+++ b/core/utils/src/test/kotlin/app/aaps/core/utils/receivers/StringUtilsTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.utils
+package app.aaps.core.utils.receivers
 
 import com.google.common.truth.Truth.assertThat
 import info.nightscout.core.utils.receivers.StringUtils
diff --git a/core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.kt b/core/utils/src/test/kotlin/app/aaps/pump/common/utils/DateTimeUtilUTest.kt
similarity index 90%
rename from core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.kt
rename to core/utils/src/test/kotlin/app/aaps/pump/common/utils/DateTimeUtilUTest.kt
index 5da3ef3e6d..8d2d3342d6 100644
--- a/core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.kt
+++ b/core/utils/src/test/kotlin/app/aaps/pump/common/utils/DateTimeUtilUTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.core.pump.common.utils
+package app.aaps.pump.common.utils
 
 import com.google.common.truth.Truth.assertThat
 import info.nightscout.core.utils.DateTimeUtil
diff --git a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt
index 751d0579cd..fe7de3c24f 100644
--- a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt
@@ -1,5 +1,6 @@
 package info.nightscout.implementation
 
+import app.aaps.core.main.events.EventNewNotification
 import app.aaps.interfaces.alerts.LocalAlertUtils
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants
@@ -16,7 +17,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.smsCommunicator.SmsCommunicator
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.events.EventNewNotification
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry.Action
diff --git a/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt b/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt
index b6bf5b0a4f..cae0c379dc 100644
--- a/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt
@@ -1,5 +1,6 @@
 package info.nightscout.implementation.di
 
+import app.aaps.core.main.graph.OverviewData
 import app.aaps.interfaces.alerts.LocalAlertUtils
 import app.aaps.interfaces.db.PersistenceLayer
 import app.aaps.interfaces.iob.GlucoseStatusProvider
@@ -34,7 +35,6 @@ import app.aaps.interfaces.utils.TrendCalculator
 import dagger.Binds
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.core.graph.OverviewData
 import info.nightscout.implementation.DefaultValueHelperImpl
 import info.nightscout.implementation.HardLimitsImpl
 import info.nightscout.implementation.LocalAlertUtilsImpl
diff --git a/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt b/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt
index af39ba9075..c1fb5151ea 100644
--- a/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt
@@ -1,6 +1,8 @@
 package info.nightscout.implementation.iob
 
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.iob.asRounded
+import app.aaps.core.main.iob.log
 import app.aaps.interfaces.iob.GlucoseStatus
 import app.aaps.interfaces.iob.GlucoseStatusProvider
 import app.aaps.interfaces.iob.IobCobCalculator
@@ -9,8 +11,6 @@ import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.Reusable
-import info.nightscout.core.iob.asRounded
-import info.nightscout.core.iob.log
 import javax.inject.Inject
 import kotlin.math.roundToLong
 
diff --git a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt b/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt
index 5a8fbb26a6..1bafd0d724 100644
--- a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt
@@ -4,6 +4,20 @@ import android.content.Context
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
+import app.aaps.core.main.R
+import app.aaps.core.main.extensions.convertedToPercent
+import app.aaps.core.main.extensions.isInProgress
+import app.aaps.core.main.extensions.toStringFull
+import app.aaps.core.main.extensions.toStringShort
+import app.aaps.core.main.extensions.valueToUnits
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.DataPointWithLabelInterface
+import app.aaps.core.main.graph.data.DeviationDataPoint
+import app.aaps.core.main.graph.data.FixedLineGraphSeries
+import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
+import app.aaps.core.main.graph.data.Scale
+import app.aaps.core.main.graph.data.ScaledDataPoint
+import app.aaps.core.main.iob.round
 import app.aaps.interfaces.aps.AutosensData
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.iob.CobInfo
@@ -22,20 +36,6 @@ import app.aaps.interfaces.utils.T
 import com.jjoe64.graphview.series.BarGraphSeries
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
-import info.nightscout.core.extensions.convertedToPercent
-import info.nightscout.core.extensions.isInProgress
-import info.nightscout.core.extensions.toStringFull
-import info.nightscout.core.extensions.toStringShort
-import info.nightscout.core.extensions.valueToUnits
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.graph.data.DataPointWithLabelInterface
-import info.nightscout.core.graph.data.DeviationDataPoint
-import info.nightscout.core.graph.data.FixedLineGraphSeries
-import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
-import info.nightscout.core.graph.data.Scale
-import info.nightscout.core.graph.data.ScaledDataPoint
-import info.nightscout.core.iob.round
-import info.nightscout.core.main.R
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TemporaryTarget
diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
index 9ac7ab2821..f275ea9af0 100644
--- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
@@ -1,5 +1,8 @@
 package info.nightscout.implementation.profile
 
+import app.aaps.core.main.extensions.fromConstant
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.logging.AAPSLogger
@@ -17,9 +20,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.fromConstant
-import info.nightscout.core.profile.ProfileSealed
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.ProfileSwitch
 import info.nightscout.database.impl.AppRepository
diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt
index bfe594a6c9..b65bee5ca9 100644
--- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt
@@ -1,6 +1,8 @@
 package info.nightscout.implementation.profile
 
 import androidx.collection.ArrayMap
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.plugin.ActivePlugin
@@ -11,8 +13,6 @@ import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.HardLimits
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.JsonHelper
 import org.json.JSONException
 import org.json.JSONObject
diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt b/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt
index 20abde4276..0c4d7565b7 100644
--- a/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt
@@ -11,13 +11,13 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.TextView
 import androidx.annotation.StringRes
+import app.aaps.core.main.R
+import app.aaps.core.main.utils.CryptoUtil
 import app.aaps.interfaces.protection.PasswordCheck
 import app.aaps.interfaces.sharedPreferences.SP
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.Reusable
-import info.nightscout.core.main.R
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.CryptoUtil
 import javax.inject.Inject
 
 @Reusable
diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt
index 13f82440fe..a24949be01 100644
--- a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt
@@ -1,5 +1,9 @@
 package info.nightscout.implementation.pump
 
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.pump.fromDbPumpType
+import app.aaps.core.main.pump.toDbPumpType
+import app.aaps.core.main.pump.toDbSource
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.logging.UserEntryLogger
@@ -15,10 +19,6 @@ import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.events.EventNewNotification
-import info.nightscout.core.pump.fromDbPumpType
-import info.nightscout.core.pump.toDbPumpType
-import info.nightscout.core.pump.toDbSource
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.Carbs
diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt
index 9679ed9841..9c2598d03b 100644
--- a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt
@@ -1,10 +1,10 @@
 package info.nightscout.implementation.pump
 
 import android.widget.TextView
+import app.aaps.core.main.extensions.isOlderThan
 import app.aaps.interfaces.pump.WarnColors
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.utils.DateUtil
-import info.nightscout.core.extensions.isOlderThan
 import info.nightscout.database.entities.TherapyEvent
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
index a62d504d00..999406ff9b 100644
--- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
@@ -8,6 +8,11 @@ import android.os.SystemClock
 import android.text.Spanned
 import androidx.appcompat.app.AppCompatActivity
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.extensions.getCustomizedName
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.androidPermissions.AndroidPermission
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.ConstraintsChecker
@@ -39,12 +44,7 @@ import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.events.EventNewNotification
-import info.nightscout.core.extensions.getCustomizedName
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.ProfileSwitch
diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt
index 112e9db10e..b6e1fa4dd1 100644
--- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt
@@ -39,7 +39,7 @@ class CommandBolus(
 
     override fun log(): String {
         return (if (detailedBolusInfo.insulin > 0) "BOLUS " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, detailedBolusInfo.insulin) else "") +
-            if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(info.nightscout.core.main.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
+            if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(app.aaps.core.main.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
     }
 
     override fun cancel() {
diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt
index c97bf5a7f1..bef59632f9 100644
--- a/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt
@@ -21,6 +21,6 @@ class IconsProviderImplementation @Inject constructor(private val config: Config
         when {
             config.NSCLIENT    -> R.drawable.ic_notif_nsclient
             config.PUMPCONTROL -> R.drawable.ic_notif_pumpcontrol
-            else               -> info.nightscout.core.main.R.drawable.ic_notif_aaps
+            else               -> app.aaps.core.main.R.drawable.ic_notif_aaps
         }
 }
\ No newline at end of file
diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt
index d5d2c17de7..08e7fe20b0 100644
--- a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt
@@ -18,10 +18,10 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.ContextCompat
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.resources.ResourceHelper
 import info.nightscout.core.ui.getThemeColor
 import info.nightscout.core.ui.locale.LocaleHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import java.util.Locale
 import javax.inject.Inject
 
diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt
index d0177dbb38..9171ef2a52 100644
--- a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt
@@ -53,7 +53,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, dateUtil: Da
             if (includeCarbs)
                 row.addView(TextView(context).apply {
                     gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(
-                    info.nightscout.core.main.R.string.format_carbs, carbs
+                    app.aaps.core.main.R.string.format_carbs, carbs
                         .toInt()
                 )
                 })
@@ -87,7 +87,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, days: Int, i
             if (includeCarbs)
                 row.addView(TextView(context).apply {
                     gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(
-                    info.nightscout.core.main.R.string.format_carbs, carbs
+                    app.aaps.core.main.R.string.format_carbs, carbs
                         .toInt()
                 )
                 })
diff --git a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt
index 3a6e7294f5..efdf7b2a86 100644
--- a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt
@@ -1,6 +1,7 @@
 package info.nightscout.implementation.userEntry
 
 import android.text.Spanned
+import app.aaps.core.main.R
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.profile.ProfileUtil
@@ -10,7 +11,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.Translator
 import dagger.Reusable
-import info.nightscout.core.main.R
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
diff --git a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt b/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
index 2b0ed6d57c..a91ff460f5 100644
--- a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.implementation.iob
 
+import app.aaps.core.main.iob.asRounded
+import app.aaps.core.main.iob.log
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.iob.GlucoseStatus
 import app.aaps.interfaces.iob.InMemoryGlucoseValue
@@ -7,8 +9,6 @@ import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.utils.T
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.iob.asRounded
-import info.nightscout.core.iob.log
 import info.nightscout.database.entities.GlucoseValue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt
index 85610f9f4a..a16b7ca950 100644
--- a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt
@@ -3,6 +3,8 @@ package info.nightscout.implementation.queue
 import android.content.Context
 import android.os.Handler
 import android.os.PowerManager
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.androidPermissions.AndroidPermission
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.ConstraintsChecker
@@ -28,8 +30,6 @@ import app.aaps.shared.tests.TestPumpPlugin
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.impl.AppRepository
diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt
index e0d508fe29..5573ee4b12 100644
--- a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.implementation.queue
 
 import android.content.Context
 import android.os.PowerManager
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.androidPermissions.AndroidPermission
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.db.PersistenceLayer
@@ -14,7 +15,6 @@ import app.aaps.shared.tests.TestPumpPlugin
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute
 import org.junit.jupiter.api.BeforeEach
diff --git a/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt b/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt
index d7e1eb0ce1..a52d97b67c 100644
--- a/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.implementation.wizard
 
+import app.aaps.core.main.wizard.BolusWizard
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.constraints.Constraint
@@ -12,7 +13,6 @@ import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.wizard.BolusWizard
 import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
 import org.junit.jupiter.api.Test
 import org.mockito.Mock
diff --git a/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt b/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt
index e1df15c949..f63d1293bf 100644
--- a/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt
+++ b/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt
@@ -1,11 +1,11 @@
 package info.nightscout.interfaces.pump
 
+import app.aaps.core.main.pump.toHtml
 import app.aaps.interfaces.pump.PumpEnactResult
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.pump.toHtml
 import info.nightscout.plugins.aps.loop.extensions.json
 import info.nightscout.pump.virtual.extensions.toText
 import org.json.JSONObject
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index eb10caa972..555aecb6af 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -19,6 +19,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import app.aaps.core.main.utils.fabric.FabricPrivacy;
 import app.aaps.interfaces.queue.Callback;
 import app.aaps.interfaces.queue.CommandQueue;
 import app.aaps.interfaces.resources.ResourceHelper;
@@ -36,7 +37,6 @@ import info.nightscout.androidaps.plugins.pump.insight.descriptors.CartridgeStat
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.TotalDailyDose;
 import info.nightscout.androidaps.plugins.pump.insight.events.EventLocalInsightUpdateGUI;
-import info.nightscout.core.utils.fabric.FabricPrivacy;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
 public class LocalInsightFragment extends DaggerFragment implements View.OnClickListener {
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 8005652076..5f0c047870 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -26,6 +26,7 @@ import java.util.TimeZone;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import app.aaps.core.main.events.EventNewNotification;
 import app.aaps.interfaces.configuration.Config;
 import app.aaps.interfaces.constraints.Constraint;
 import app.aaps.interfaces.constraints.PluginConstraints;
@@ -131,7 +132,6 @@ import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_erro
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ParameterBlockUtil;
-import info.nightscout.core.events.EventNewNotification;
 
 @Singleton
 public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, PluginConstraints, OwnDatabasePlugin,
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt
index 642f507b04..1cc52cb350 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt
@@ -1,6 +1,8 @@
 package info.nightscout.plugins.aps
 
 import android.text.Spanned
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.convertedToPercent
 import app.aaps.interfaces.aps.APSResult
 import app.aaps.interfaces.constraints.Constraint
 import app.aaps.interfaces.constraints.ConstraintsChecker
@@ -16,8 +18,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.convertedToPercent
 import info.nightscout.core.ui.R
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.database.entities.GlucoseValue
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt
index 923f87d6aa..860412c7d2 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt
@@ -13,6 +13,7 @@ import android.view.ViewGroup
 import androidx.core.view.MenuCompat
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -22,7 +23,6 @@ import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.aps.databinding.OpenapsFragmentBinding
 import info.nightscout.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.plugins.aps.events.EventResetOpenAPSGui
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt
index 9d17bb1cf7..b1f0bc0d45 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt
@@ -12,6 +12,9 @@ import android.view.ViewGroup
 import androidx.core.view.MenuCompat
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.pump.toHtml
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.resources.ResourceHelper
@@ -23,10 +26,7 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.pump.toHtml
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.aps.R
 import info.nightscout.plugins.aps.databinding.LoopFragmentBinding
 import info.nightscout.plugins.aps.loop.events.EventLoopSetLastRunGui
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
index a1cef0afa8..b221c0e52b 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
@@ -13,6 +13,13 @@ import android.os.HandlerThread
 import android.os.SystemClock
 import androidx.core.app.NotificationCompat
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.convertedToPercent
+import app.aaps.core.main.extensions.plannedRemainingMinutes
+import app.aaps.core.main.iob.json
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.APSResult
 import app.aaps.interfaces.aps.ApsMode
 import app.aaps.interfaces.aps.Loop
@@ -56,13 +63,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.events.EventNewNotification
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.convertedToPercent
-import info.nightscout.core.extensions.plannedRemainingMinutes
-import info.nightscout.core.iob.json
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.DeviceStatus
 import info.nightscout.database.entities.OfflineEvent
@@ -111,7 +111,7 @@ class LoopPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.LOOP)
         .fragmentClass(LoopFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_loop_closed_white)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_loop_closed_white)
         .pluginName(info.nightscout.core.ui.R.string.loop)
         .shortName(R.string.loop_shortname)
         .preferencesId(R.xml.pref_loop)
@@ -340,15 +340,15 @@ class LoopPlugin @Inject constructor(
                                 val intentAction5m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction5m.putExtra("ignoreDuration", 5)
                                 val pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
-                                val actionIgnore5m = NotificationCompat.Action(info.nightscout.core.main.R.drawable.ic_notif_aaps, rh.gs(R.string.ignore5m, "Ignore 5m"), pendingIntent5m)
+                                val actionIgnore5m = NotificationCompat.Action(app.aaps.core.main.R.drawable.ic_notif_aaps, rh.gs(R.string.ignore5m, "Ignore 5m"), pendingIntent5m)
                                 val intentAction15m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction15m.putExtra("ignoreDuration", 15)
                                 val pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
-                                val actionIgnore15m = NotificationCompat.Action(info.nightscout.core.main.R.drawable.ic_notif_aaps, rh.gs(R.string.ignore15m, "Ignore 15m"), pendingIntent15m)
+                                val actionIgnore15m = NotificationCompat.Action(app.aaps.core.main.R.drawable.ic_notif_aaps, rh.gs(R.string.ignore15m, "Ignore 15m"), pendingIntent15m)
                                 val intentAction30m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction30m.putExtra("ignoreDuration", 30)
                                 val pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
-                                val actionIgnore30m = NotificationCompat.Action(info.nightscout.core.main.R.drawable.ic_notif_aaps, rh.gs(R.string.ignore30m, "Ignore 30m"), pendingIntent30m)
+                                val actionIgnore30m = NotificationCompat.Action(app.aaps.core.main.R.drawable.ic_notif_aaps, rh.gs(R.string.ignore30m, "Ignore 30m"), pendingIntent30m)
                                 val builder = NotificationCompat.Builder(context, CHANNEL_ID)
                                 builder.setSmallIcon(info.nightscout.core.ui.R.drawable.notif_icon)
                                     .setContentTitle(rh.gs(R.string.carbs_suggestion))
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
index 75790ca3f2..634a9479a8 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
@@ -1,5 +1,8 @@
 package info.nightscout.plugins.aps.openAPSAMA
 
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.getPassedDurationToTimeInMinutes
+import app.aaps.core.main.extensions.plannedRemainingMinutes
 import app.aaps.interfaces.aps.DetermineBasalAdapter
 import app.aaps.interfaces.aps.SMBDefaults
 import app.aaps.interfaces.constraints.ConstraintsChecker
@@ -14,9 +17,6 @@ import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.sharedPreferences.SP
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
-import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.plugins.aps.APSResultObject
 import info.nightscout.plugins.aps.R
 import info.nightscout.plugins.aps.logger.LoggerCallback
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
index 5e2337e141..ab04a2c075 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
@@ -2,6 +2,9 @@ package info.nightscout.plugins.aps.openAPSAMA
 
 import android.content.Context
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.extensions.target
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.APS
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.aps.DetermineBasalAdapter
@@ -26,10 +29,7 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.Round
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.extensions.target
 import info.nightscout.core.utils.MidnightUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.plugins.aps.OpenAPSFragment
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
index 43ef64a361..a47353c281 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
@@ -1,5 +1,8 @@
 package info.nightscout.plugins.aps.openAPSSMB
 
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.getPassedDurationToTimeInMinutes
+import app.aaps.core.main.extensions.plannedRemainingMinutes
 import app.aaps.interfaces.aps.DetermineBasalAdapter
 import app.aaps.interfaces.aps.SMBDefaults
 import app.aaps.interfaces.constraints.ConstraintsChecker
@@ -16,9 +19,6 @@ import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.SafeParse
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
-import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.plugins.aps.APSResultObject
 import info.nightscout.plugins.aps.R
 import info.nightscout.plugins.aps.logger.LoggerCallback
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
index c30984cbb7..8db7ed8c27 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
@@ -3,6 +3,8 @@ package info.nightscout.plugins.aps.openAPSSMB
 import android.content.Context
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.extensions.target
 import app.aaps.interfaces.aps.APS
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.aps.DetermineBasalAdapter
@@ -30,8 +32,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.Round
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.extensions.target
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
index b389af99bb..827a5f6201 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
@@ -1,5 +1,8 @@
 package info.nightscout.plugins.aps.openAPSSMBDynamicISF
 
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.getPassedDurationToTimeInMinutes
+import app.aaps.core.main.extensions.plannedRemainingMinutes
 import app.aaps.interfaces.aps.DetermineBasalAdapter
 import app.aaps.interfaces.aps.SMBDefaults
 import app.aaps.interfaces.db.GlucoseUnit
@@ -17,9 +20,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.Round
 import app.aaps.interfaces.utils.SafeParse
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
-import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.plugins.aps.R
 import info.nightscout.plugins.aps.logger.LoggerCallback
 import info.nightscout.plugins.aps.openAPSSMB.DetermineBasalResultSMB
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt
index daaeac7c04..75095b2c50 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt
@@ -17,6 +17,8 @@ import android.widget.ArrayAdapter
 import android.widget.TableLayout
 import android.widget.TableRow
 import android.widget.TextView
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.extensions.runOnUiThread
@@ -39,10 +41,8 @@ import app.aaps.interfaces.utils.Round
 import app.aaps.interfaces.utils.SafeParse
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.elements.WeekDay
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.plugins.aps.R
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt
index 3dee5bc63b..aa9a87765d 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt
@@ -1,5 +1,10 @@
 package info.nightscout.plugins.general.autotune
 
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.durationInMinutes
+import app.aaps.core.main.extensions.toJson
+import app.aaps.core.main.extensions.toTemporaryBasal
+import app.aaps.core.main.iob.round
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.iob.Iob
 import app.aaps.interfaces.iob.IobTotal
@@ -11,11 +16,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.Round
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.durationInMinutes
-import info.nightscout.core.extensions.toJson
-import info.nightscout.core.extensions.toTemporaryBasal
-import info.nightscout.core.iob.round
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.Carbs
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt
index 8558b1de85..d694072c54 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt
@@ -3,6 +3,8 @@
 package info.nightscout.plugins.general.autotune
 
 import android.view.View
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.autotune.Autotune
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.insulin.Insulin
@@ -24,8 +26,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.MidnightTime
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.elements.WeekDay
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.UserEntry
@@ -68,7 +68,7 @@ class AutotunePlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.GENERAL)
         .fragmentClass(AutotuneFragment::class.qualifiedName)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_autotune)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_autotune)
         .pluginName(info.nightscout.core.ui.R.string.autotune)
         .shortName(info.nightscout.core.ui.R.string.autotune_shortname)
         .preferencesId(R.xml.pref_autotune)
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt
index fd302192ba..b22cfc33a6 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt
@@ -1,5 +1,8 @@
 package info.nightscout.plugins.general.autotune.data
 
+import app.aaps.core.main.extensions.blockValueBySeconds
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.insulin.Insulin
@@ -19,9 +22,6 @@ import app.aaps.interfaces.utils.Round
 import app.aaps.interfaces.utils.SafeParse
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.blockValueBySeconds
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.database.entities.data.Block
 import org.json.JSONArray
diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt
index d442a838cd..8cf89baa2d 100644
--- a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt
+++ b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.plugins.aps.loop
 
 import android.app.NotificationManager
 import android.content.Context
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.ApsMode
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.ConstraintsChecker
@@ -21,7 +22,6 @@ import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.pump.virtual.VirtualPumpPlugin
 import info.nightscout.sdk.interfaces.RunningConfiguration
diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt
index 1b46875a65..0bee3679ad 100644
--- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt
+++ b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt
@@ -1,12 +1,12 @@
 package info.nightscout.plugins.general.autotune
 
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.profile.PureProfile
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.data.Block
 import info.nightscout.database.entities.data.TargetBlock
diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt
index ad4f71bec2..db28f20eef 100644
--- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt
+++ b/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.plugins.general.autotune
 
+import app.aaps.core.main.extensions.shiftBlock
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.iob.IobTotal
 import app.aaps.interfaces.logging.AAPSLogger
@@ -10,8 +12,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.extensions.shiftBlock
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.Carbs
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 760e6da9e8..b625633637 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt
@@ -22,6 +22,8 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.UserEntryLogger
 import app.aaps.interfaces.resources.ResourceHelper
@@ -39,9 +41,7 @@ import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.dragHelpers.ItemTouchHelperAdapter
 import info.nightscout.core.ui.dragHelpers.OnStartDragListener
 import info.nightscout.core.ui.dragHelpers.SimpleItemTouchHelperCallback
-import info.nightscout.core.utils.ActionModeHelper
 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 io.reactivex.rxjava3.disposables.CompositeDisposable
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
index a4c2e7cfa0..4932f28273 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
@@ -5,6 +5,7 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.os.SystemClock
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.automation.Automation
 import app.aaps.interfaces.automation.AutomationEvent
@@ -66,7 +67,6 @@ import info.nightscout.automation.triggers.TriggerTime
 import info.nightscout.automation.triggers.TriggerTimeRange
 import info.nightscout.automation.triggers.TriggerWifiSsid
 import info.nightscout.automation.ui.TimerUtil
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONArray
@@ -99,7 +99,7 @@ class AutomationPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.GENERAL)
         .fragmentClass(AutomationFragment::class.qualifiedName)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_automation)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_automation)
         .pluginName(R.string.automation)
         .shortName(R.string.automation_short)
         .showInList(config.APS)
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt
index 557036b805..7bfe684693 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt
@@ -34,7 +34,7 @@ class ActionAlarm(injector: HasAndroidInjector) : Action(injector) {
 
     override fun friendlyName(): Int = info.nightscout.core.ui.R.string.alarm
     override fun shortDescription(): String = rh.gs(R.string.alarm_message, text.value)
-    @DrawableRes override fun icon(): Int = info.nightscout.core.main.R.drawable.ic_access_alarm_24dp
+    @DrawableRes override fun icon(): Int = app.aaps.core.main.R.drawable.ic_access_alarm_24dp
 
     override fun isValid(): Boolean = true // empty alarm will show app name
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt
index ad7c19c3bb..63b49255cc 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt
@@ -2,6 +2,7 @@ package info.nightscout.automation.actions
 
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
+import app.aaps.core.main.extensions.fromConstant
 import app.aaps.interfaces.iob.GlucoseStatusProvider
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.logging.UserEntryLogger
@@ -16,7 +17,6 @@ import info.nightscout.automation.elements.InputDuration
 import info.nightscout.automation.elements.InputString
 import info.nightscout.automation.elements.LabelWithElement
 import info.nightscout.automation.elements.LayoutBuilder
-import info.nightscout.core.extensions.fromConstant
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt
index 49dae90599..b594905597 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt
@@ -2,6 +2,7 @@ package info.nightscout.automation.actions
 
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
+import app.aaps.core.main.events.EventNewNotification
 import app.aaps.interfaces.notifications.NotificationUserMessage
 import app.aaps.interfaces.pump.PumpEnactResult
 import app.aaps.interfaces.queue.Callback
@@ -12,7 +13,6 @@ import info.nightscout.automation.R
 import info.nightscout.automation.elements.InputString
 import info.nightscout.automation.elements.LabelWithElement
 import info.nightscout.automation.elements.LayoutBuilder
-import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt
index dc6e8eec36..cb047769ac 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt
@@ -2,6 +2,7 @@ package info.nightscout.automation.actions
 
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
+import app.aaps.core.main.extensions.friendlyDescription
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.logging.LTag
@@ -20,7 +21,6 @@ import info.nightscout.automation.elements.InputTempTarget
 import info.nightscout.automation.elements.LabelWithElement
 import info.nightscout.automation.elements.LayoutBuilder
 import info.nightscout.automation.triggers.TriggerTempTarget
-import info.nightscout.core.extensions.friendlyDescription
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.core.utils.JsonHelper.safeGetDouble
 import info.nightscout.database.entities.TemporaryTarget
@@ -55,7 +55,7 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
 
     override fun friendlyName(): Int = R.string.starttemptarget
     override fun shortDescription(): String = rh.gs(R.string.starttemptarget) + ": " + tt().friendlyDescription(value.units, rh, profileUtil)
-    @DrawableRes override fun icon(): Int = info.nightscout.core.main.R.drawable.ic_temptarget_high
+    @DrawableRes override fun icon(): Int = app.aaps.core.main.R.drawable.ic_temptarget_high
 
     override fun doAction(callback: Callback) {
         disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(tt()))
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt
index 85d96cf0dd..dbb4b6f8fa 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt
@@ -9,6 +9,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
@@ -24,7 +25,6 @@ import info.nightscout.automation.events.EventAutomationUpdateAction
 import info.nightscout.automation.events.EventAutomationUpdateGui
 import info.nightscout.automation.events.EventAutomationUpdateTrigger
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt
index 932094a04a..9967efbe3a 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import dagger.android.HasAndroidInjector
@@ -15,7 +16,6 @@ import info.nightscout.automation.events.EventTriggerRemove
 import info.nightscout.automation.triggers.Trigger
 import info.nightscout.automation.triggers.TriggerConnector
 import info.nightscout.automation.triggers.TriggerDummy
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.json.JSONObject
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt
index 37047a0c55..44b4e2513a 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt
@@ -36,10 +36,10 @@ class InputCarePortalMenu(private val rh: ResourceHelper) : Element {
             }
         @get:DrawableRes val drawableRes: Int
             get() = when (this) {
-                NOTE         -> info.nightscout.core.main.R.drawable.ic_cp_note
-                EXERCISE     -> info.nightscout.core.main.R.drawable.ic_cp_exercise
-                QUESTION     -> info.nightscout.core.main.R.drawable.ic_cp_question
-                ANNOUNCEMENT -> info.nightscout.core.main.R.drawable.ic_cp_announcement
+                NOTE         -> app.aaps.core.main.R.drawable.ic_cp_note
+                EXERCISE     -> app.aaps.core.main.R.drawable.ic_cp_exercise
+                QUESTION     -> app.aaps.core.main.R.drawable.ic_cp_question
+                ANNOUNCEMENT -> app.aaps.core.main.R.drawable.ic_cp_announcement
             }
 
         companion object {
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt b/plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt
index 23c852e336..38fadd050f 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt
@@ -14,6 +14,7 @@ import android.os.Binder
 import android.os.Bundle
 import android.os.IBinder
 import androidx.core.app.ActivityCompat
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.notifications.NotificationHolder
@@ -26,7 +27,6 @@ import com.google.android.gms.location.LocationServices
 import dagger.android.DaggerService
 import info.nightscout.automation.R
 import info.nightscout.automation.events.EventLocationChange
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt
index adc726aedb..6e9dd43169 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt
@@ -122,7 +122,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
             layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
                 gravity = Gravity.CENTER
             }
-            setImageResource(info.nightscout.core.main.R.drawable.ic_add)
+            setImageResource(app.aaps.core.main.R.drawable.ic_add)
             contentDescription = rh.gs(R.string.add_short)
             setOnClickListener {
                 scanForActivity(context)?.supportFragmentManager?.let {
@@ -144,7 +144,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
             layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
                 gravity = Gravity.CENTER
             }
-            setImageResource(info.nightscout.core.main.R.drawable.ic_remove)
+            setImageResource(app.aaps.core.main.R.drawable.ic_remove)
             contentDescription = rh.gs(R.string.delete_short)
             setOnClickListener {
                 rxBus.send(EventTriggerRemove(trigger))
@@ -158,7 +158,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
                 gravity = Gravity.CENTER
             }
             layoutParams = params
-            setImageResource(info.nightscout.core.main.R.drawable.ic_clone)
+            setImageResource(app.aaps.core.main.R.drawable.ic_clone)
             contentDescription = rh.gs(R.string.copy_short)
             setOnClickListener {
                 rxBus.send(EventTriggerClone(trigger))
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt
index ee179b3c95..14d4666235 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt
@@ -85,7 +85,7 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
             rh.gs(if (bg.units == GlucoseUnit.MGDL) R.string.glucosecomparedmgdl else R.string.glucosecomparedmmol, rh.gs(comparator.value.stringRes), bg.value, bg.units)
     }
 
-    override fun icon(): Optional<Int> = Optional.of(info.nightscout.core.main.R.drawable.ic_cp_bgcheck)
+    override fun icon(): Optional<Int> = Optional.of(app.aaps.core.main.R.drawable.ic_cp_bgcheck)
 
     override fun duplicate(): Trigger = TriggerBg(injector, this)
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt
index 96315fa040..5dabfdb5e0 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt
@@ -75,7 +75,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         rh.gs(R.string.lastboluscompared, rh.gs(comparator.value.stringRes), minutesAgo.getMinutes())
 
-    override fun icon(): Optional<Int> = Optional.of(info.nightscout.core.main.R.drawable.ic_bolus)
+    override fun icon(): Optional<Int> = Optional.of(app.aaps.core.main.R.drawable.ic_bolus)
 
     override fun duplicate(): Trigger = TriggerBolusAgo(injector, this)
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt
index b8324e215f..f23d2f50f4 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt
@@ -73,7 +73,7 @@ class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         rh.gs(R.string.cobcompared, rh.gs(comparator.value.stringRes), cob.value)
 
-    override fun icon(): Optional<Int> = Optional.of(info.nightscout.core.main.R.drawable.ic_cp_bolus_carbs)
+    override fun icon(): Optional<Int> = Optional.of(app.aaps.core.main.R.drawable.ic_cp_bolus_carbs)
 
     override fun duplicate(): Trigger = TriggerCOB(injector, this)
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt
index 8b41ecf7d6..da555c180a 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt
@@ -60,7 +60,7 @@ class TriggerHeartRate(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         rh.gs(R.string.triggerHeartRateDesc, rh.gs(comparator.value.stringRes), heartRate.value)
 
-    override fun icon(): Optional<Int> = Optional.of(info.nightscout.core.main.R.drawable.ic_cp_heart_rate)
+    override fun icon(): Optional<Int> = Optional.of(app.aaps.core.main.R.drawable.ic_cp_heart_rate)
 
     override fun duplicate(): Trigger {
         return TriggerHeartRate(injector).also { o ->
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt
index 18ba191d14..b70e46aa24 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt
@@ -1,6 +1,7 @@
 package info.nightscout.automation.triggers
 
 import android.widget.LinearLayout
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.logging.LTag
 import com.google.common.base.Optional
 import dagger.android.HasAndroidInjector
@@ -10,7 +11,6 @@ import info.nightscout.automation.elements.InputPercent
 import info.nightscout.automation.elements.LabelWithElement
 import info.nightscout.automation.elements.LayoutBuilder
 import info.nightscout.automation.elements.StaticLabel
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.JsonHelper
 import org.json.JSONObject
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt
index 7d5e749768..1dc456140a 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt
@@ -73,7 +73,7 @@ class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector
     override fun friendlyDescription(): String =
         rh.gs(R.string.automation_trigger_pump_last_connection_compared, rh.gs(comparator.value.stringRes), minutesAgo.value)
 
-    override fun icon(): Optional<Int> = Optional.of(info.nightscout.core.main.R.drawable.ic_remove)
+    override fun icon(): Optional<Int> = Optional.of(app.aaps.core.main.R.drawable.ic_remove)
 
     override fun duplicate(): Trigger = TriggerPumpLastConnection(injector, this)
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt
index 88ac9b3f3d..cb8b1e9910 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt
@@ -86,7 +86,7 @@ class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
         return if (counter == 0) rh.gs(R.string.never) else sb.toString()
     }
 
-    override fun icon(): Optional<Int> = Optional.of(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp)
+    override fun icon(): Optional<Int> = Optional.of(app.aaps.core.main.R.drawable.ic_access_alarm_24dp)
 
     override fun duplicate(): Trigger = TriggerRecurringTime(injector, this)
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt
index c0a54fdb47..07b4a8fbb1 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt
@@ -55,7 +55,7 @@ class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         rh.gs(R.string.atspecifiedtime, dateUtil.dateAndTimeString(time.value))
 
-    override fun icon(): Optional<Int> = Optional.of(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp)
+    override fun icon(): Optional<Int> = Optional.of(app.aaps.core.main.R.drawable.ic_access_alarm_24dp)
 
     override fun duplicate(): Trigger = TriggerTime(injector, time.value)
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt
index 102b89d880..4c85193fbb 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt
@@ -66,7 +66,7 @@ class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         rh.gs(R.string.timerange_value, dateUtil.timeString(toMills(range.start)), dateUtil.timeString(toMills(range.end)))
 
-    override fun icon(): Optional<Int> = Optional.of(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp)
+    override fun icon(): Optional<Int> = Optional.of(app.aaps.core.main.R.drawable.ic_access_alarm_24dp)
 
     override fun duplicate(): Trigger = TriggerTimeRange(injector, range.start, range.end)
 
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt
index 8cfe0e02ca..de40515d71 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt
@@ -1,6 +1,7 @@
 package info.nightscout.automation
 
 import android.content.Context
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.ConstraintsChecker
@@ -17,7 +18,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.automation.services.LocationServiceHelper
 import info.nightscout.automation.triggers.Trigger
 import info.nightscout.automation.ui.TimerUtil
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt
index 3866046456..5fb8a75490 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt
@@ -1,6 +1,7 @@
 package info.nightscout.automation
 
 import android.content.Context
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.ConstraintsChecker
@@ -17,7 +18,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.automation.services.LocationServiceHelper
 import info.nightscout.automation.triggers.Trigger
 import info.nightscout.automation.ui.TimerUtil
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt
index 38056ef521..9b382915b0 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt
@@ -63,7 +63,7 @@ class ActionAlarmTest : TestBase() {
     }
 
     @Test fun iconTest() {
-        Assertions.assertEquals(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp, sut.icon())
+        Assertions.assertEquals(app.aaps.core.main.R.drawable.ic_access_alarm_24dp, sut.icon())
     }
 
     @Test fun doActionTest() {
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt
index ebfc399d81..7ac4a69ea6 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt
@@ -43,7 +43,7 @@ class ActionCarePortalEventTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assertions.assertEquals(info.nightscout.core.main.R.drawable.ic_cp_note, sut.icon())
+        Assertions.assertEquals(app.aaps.core.main.R.drawable.ic_cp_note, sut.icon())
     }
 
     @Test fun doActionTest() {
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt
index d477d29c0d..b3cce15f5a 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStartTempTargetTest.kt
@@ -38,7 +38,7 @@ class ActionStartTempTargetTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assertions.assertEquals(info.nightscout.core.main.R.drawable.ic_temptarget_high, sut.icon())
+        Assertions.assertEquals(app.aaps.core.main.R.drawable.ic_temptarget_high, sut.icon())
     }
 
     @Test fun doActionTest() {
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt
index 5b4ce5da69..3e4eaae013 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt
@@ -1,5 +1,6 @@
 package info.nightscout.automation.actions
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.ConfigBuilder
 import app.aaps.interfaces.constraints.Constraint
@@ -19,7 +20,6 @@ import app.aaps.shared.tests.TestBaseWithProfile
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.automation.triggers.Trigger
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.impl.AppRepository
 import org.junit.jupiter.api.BeforeEach
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt
index de99cf30ba..eec54ddace 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBgTest.kt
@@ -74,7 +74,7 @@ class TriggerBgTest : TriggerTestBase() {
 
     @Test
     fun iconTest() {
-        Assertions.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_cp_bgcheck), TriggerBg(injector).icon())
+        Assertions.assertEquals(Optional.of(app.aaps.core.main.R.drawable.ic_cp_bgcheck), TriggerBg(injector).icon())
     }
 
     private fun generateOneCurrentRecordBgData(): MutableList<InMemoryGlucoseValue> {
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBolusAgoTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBolusAgoTest.kt
index a82cf7e7ba..2e3c09f82b 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBolusAgoTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBolusAgoTest.kt
@@ -86,6 +86,6 @@ class TriggerBolusAgoTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assertions.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_bolus), TriggerBolusAgo(injector).icon())
+        Assertions.assertEquals(Optional.of(app.aaps.core.main.R.drawable.ic_bolus), TriggerBolusAgo(injector).icon())
     }
 }
\ No newline at end of file
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt
index 0e4f51463b..7b3fa6fce6 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerCOBTest.kt
@@ -58,6 +58,6 @@ class TriggerCOBTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assertions.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_cp_bolus_carbs), TriggerCOB(injector).icon())
+        Assertions.assertEquals(Optional.of(app.aaps.core.main.R.drawable.ic_cp_bolus_carbs), TriggerCOB(injector).icon())
     }
 }
\ No newline at end of file
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerPumpLastConnectionTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerPumpLastConnectionTest.kt
index 18abc50c27..ab8ca46e28 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerPumpLastConnectionTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerPumpLastConnectionTest.kt
@@ -53,7 +53,7 @@ class TriggerPumpLastConnectionTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assertions.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_remove), TriggerPumpLastConnection(injector).icon())
+        Assertions.assertEquals(Optional.of(app.aaps.core.main.R.drawable.ic_remove), TriggerPumpLastConnection(injector).icon())
     }
 
     @Test fun friendlyNameTest() {
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt
index 8382bae5a0..fed7344391 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeRangeTest.kt
@@ -66,6 +66,6 @@ class TriggerTimeRangeTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assertions.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp), TriggerTimeRange(injector).icon())
+        Assertions.assertEquals(Optional.of(app.aaps.core.main.R.drawable.ic_access_alarm_24dp), TriggerTimeRange(injector).icon())
     }
 }
\ No newline at end of file
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt
index 7ad766684c..6b6233ffa9 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt
@@ -62,6 +62,6 @@ class TriggerTimeTest : TriggerTestBase() {
 
     @Test
     fun iconTest() {
-        Assertions.assertEquals(Optional.of(info.nightscout.core.main.R.drawable.ic_access_alarm_24dp), TriggerTime(injector).icon())
+        Assertions.assertEquals(Optional.of(app.aaps.core.main.R.drawable.ic_access_alarm_24dp), TriggerTime(injector).icon())
     }
 }
\ No newline at end of file
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt
index b9fc41ae2f..143251d1da 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import app.aaps.configuration.R
 import app.aaps.configuration.configBuilder.events.EventConfigBuilderUpdateGui
 import app.aaps.configuration.databinding.ConfigbuilderFragmentBinding
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.ConfigBuilder
 import app.aaps.interfaces.extensions.toVisibility
@@ -18,7 +19,6 @@ import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.ui.UiInteraction
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt
index 6578870f86..9eeae2fa5d 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt
@@ -27,6 +27,7 @@ import app.aaps.configuration.maintenance.data.PrefsFormat
 import app.aaps.configuration.maintenance.data.PrefsStatusImpl
 import app.aaps.configuration.maintenance.dialogs.PrefImportSummaryDialog
 import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.androidPermissions.AndroidPermission
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.db.PersistenceLayer
@@ -58,7 +59,6 @@ import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.dialogs.TwoMessagesAlertDialog
 import info.nightscout.core.ui.dialogs.WarningDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt
index 3b7736dc2b..1ce7700260 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt
@@ -9,6 +9,8 @@ import androidx.core.text.toSpanned
 import app.aaps.configuration.R
 import app.aaps.configuration.databinding.MaintenanceFragmentBinding
 import app.aaps.configuration.maintenance.activities.LogSettingActivity
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.db.PersistenceLayer
 import app.aaps.interfaces.extensions.runOnUiThread
 import app.aaps.interfaces.extensions.toVisibility
@@ -29,10 +31,8 @@ import app.aaps.interfaces.rx.events.EventPreferenceChange
 import app.aaps.interfaces.sync.DataSyncSelectorXdrip
 import app.aaps.interfaces.ui.UiInteraction
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.ui.dialogs.OKDialog
 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 io.reactivex.rxjava3.core.Completable
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt
index fc045d5fbc..411b45ecf2 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt
@@ -9,12 +9,12 @@ import app.aaps.configuration.maintenance.data.PrefMetadataMap
 import app.aaps.configuration.maintenance.data.Prefs
 import app.aaps.configuration.maintenance.data.PrefsFormat
 import app.aaps.configuration.maintenance.data.PrefsStatusImpl
+import app.aaps.core.main.utils.CryptoUtil
 import app.aaps.interfaces.maintenance.PrefMetadata
 import app.aaps.interfaces.maintenance.PrefsMetadataKey
 import app.aaps.interfaces.maintenance.PrefsStatus
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.storage.Storage
-import info.nightscout.core.utils.CryptoUtil
 import info.nightscout.core.utils.hexStringToByteArray
 import info.nightscout.core.utils.toHex
 import org.json.JSONException
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt
index 1e3974b013..9720933e63 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt
@@ -20,6 +20,8 @@ import app.aaps.configuration.setupwizard.elements.SWInfoText
 import app.aaps.configuration.setupwizard.elements.SWPlugin
 import app.aaps.configuration.setupwizard.elements.SWPreference
 import app.aaps.configuration.setupwizard.elements.SWRadioButton
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.CryptoUtil
 import app.aaps.interfaces.androidPermissions.AndroidPermission
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
@@ -45,8 +47,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.HardLimits
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.profile.ProfileSealed
-import info.nightscout.core.utils.CryptoUtil
 import info.nightscout.core.utils.isRunningTest
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt
index 43419088ff..58eda5c4ff 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt
@@ -13,6 +13,7 @@ import app.aaps.configuration.R
 import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
 import app.aaps.configuration.databinding.ActivitySetupwizardBinding
 import app.aaps.configuration.setupwizard.elements.SWItem
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.events.EventProfileStoreChanged
 import app.aaps.interfaces.rx.events.EventProfileSwitchChanged
@@ -25,7 +26,6 @@ import app.aaps.interfaces.ui.UiInteraction
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.locale.LocaleHelper.update
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt
index 63bdf90d61..686e43dd4d 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt
@@ -9,9 +9,9 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
+import app.aaps.core.main.utils.CryptoUtil
 import app.aaps.interfaces.extensions.toVisibility
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.CryptoUtil
 
 class SWEditEncryptedPassword(injector: HasAndroidInjector, private val cryptoUtil: CryptoUtil) : SWItem(injector, Type.STRING) {
 
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt
index 1f2b7a42a6..5ea2a60122 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt
@@ -4,13 +4,13 @@ import android.widget.LinearLayout
 import androidx.annotation.StringRes
 import app.aaps.configuration.configBuilder.events.EventConfigBuilderUpdateGui
 import app.aaps.configuration.setupwizard.SWDefinition
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.ConfigBuilder
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.plugin.PluginType
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.ui.UiInteraction
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import java.security.InvalidParameterException
diff --git a/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt b/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt
index 06188c8cf7..36adfef25b 100644
--- a/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt
+++ b/plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt
@@ -5,11 +5,11 @@ import app.aaps.configuration.maintenance.data.PrefFormatError
 import app.aaps.configuration.maintenance.data.Prefs
 import app.aaps.configuration.maintenance.data.PrefsFormat
 import app.aaps.configuration.maintenance.data.PrefsStatusImpl
+import app.aaps.core.main.utils.CryptoUtil
 import app.aaps.interfaces.maintenance.PrefMetadata
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.TruthJUnit.assume
-import info.nightscout.core.utils.CryptoUtil
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt
index 3065a1c5ba..dcda9e4c5c 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt
@@ -1,12 +1,12 @@
 package info.nightscout.plugins.constraints
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.Constraint
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.constraints.PluginConstraints
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.profile.Profile
-import info.nightscout.core.constraints.ConstraintObject
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
index 3aa717f150..86000b726a 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
@@ -1,6 +1,7 @@
 package info.nightscout.plugins.constraints.bgQualityCheck
 
 import androidx.annotation.DrawableRes
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.bgQualityCheck.BgQualityCheck
 import app.aaps.interfaces.constraints.Constraint
 import app.aaps.interfaces.constraints.PluginConstraints
@@ -18,7 +19,6 @@ import app.aaps.interfaces.rx.events.EventBucketedDataCreated
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.constraints.R
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt
index cef2a3875e..475b4e6e4c 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt
@@ -16,6 +16,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.UserEntryLogger
 import app.aaps.interfaces.receivers.ReceiverStatusStore
@@ -29,7 +30,6 @@ import app.aaps.interfaces.utils.DateUtil
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.ui.dialogs.OKDialog
 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.database.entities.ValueWithUnit
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
index 714a5a3219..abead4ff4f 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
@@ -5,6 +5,7 @@ import android.os.SystemClock
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.resources.ResourceHelper
@@ -12,7 +13,6 @@ import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNtpStatus
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.constraints.databinding.DialogNtpProgressBinding
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt
index ac44e3d166..22268af9b3 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt
@@ -1,11 +1,11 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.PluginConstraints
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.profile.ProfileFunction
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.plugins.constraints.R
 import javax.inject.Inject
 
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
index 34901bc6d4..ce1a2e8751 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
@@ -1,9 +1,9 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.plugins.constraints.R
 import info.nightscout.plugins.constraints.safety.SafetyPlugin
 import javax.inject.Inject
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
index f30a659a93..f32ab4d1c4 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
@@ -1,5 +1,12 @@
 package info.nightscout.plugins.constraints.safety
 
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.extensions.putDouble
+import app.aaps.core.main.utils.extensions.putInt
+import app.aaps.core.main.utils.extensions.putString
+import app.aaps.core.main.utils.extensions.storeDouble
+import app.aaps.core.main.utils.extensions.storeInt
+import app.aaps.core.main.utils.extensions.storeString
 import app.aaps.interfaces.aps.ApsMode
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.Constraint
@@ -23,13 +30,6 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.Round
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.utils.extensions.putDouble
-import info.nightscout.core.utils.extensions.putInt
-import info.nightscout.core.utils.extensions.putString
-import info.nightscout.core.utils.extensions.storeDouble
-import info.nightscout.core.utils.extensions.storeInt
-import info.nightscout.core.utils.extensions.storeString
 import info.nightscout.plugins.constraints.R
 import org.json.JSONObject
 import javax.inject.Inject
diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
index 5689924f48..5897dff875 100644
--- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
+++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.plugins.constraints.bgQualityCheck
 
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.bgQualityCheck.BgQualityCheck
 import app.aaps.interfaces.iob.InMemoryGlucoseValue
@@ -12,8 +14,6 @@ import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.plugins.constraints.R
 import org.junit.jupiter.api.BeforeEach
diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt
index 22360e49cd..0119693d19 100644
--- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt
+++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.plugins.constraints.objectives
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.Objectives
 import app.aaps.interfaces.plugin.ActivePlugin
@@ -10,7 +11,6 @@ import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.plugins.constraints.R
 import info.nightscout.plugins.constraints.objectives.objectives.Objective
 import org.junit.jupiter.api.BeforeEach
diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt
index 1dfb87bbe7..a677352ff4 100644
--- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt
+++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.plugins.constraints.safety
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.aps.ApsMode
 import app.aaps.interfaces.bgQualityCheck.BgQualityCheck
 import app.aaps.interfaces.constraints.Constraint
@@ -15,7 +16,6 @@ import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt
index 52fe9ed167..78ec8201bc 100644
--- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt
+++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.plugins.constraints.storage
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.ui.UiInteraction
@@ -7,7 +8,6 @@ import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.Mock
diff --git a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefFreePeakPlugin.kt b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefFreePeakPlugin.kt
index acc8cc66ae..0faf8c891b 100644
--- a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefFreePeakPlugin.kt
+++ b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinOrefFreePeakPlugin.kt
@@ -1,5 +1,7 @@
 package info.nightscout.insulin
 
+import app.aaps.core.main.utils.extensions.putInt
+import app.aaps.core.main.utils.extensions.storeInt
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.insulin.Insulin
 import app.aaps.interfaces.logging.AAPSLogger
@@ -10,8 +12,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.HardLimits
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.extensions.putInt
-import info.nightscout.core.utils.extensions.storeInt
 import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/plugins/insulin/src/main/res/layout/insulin_fragment.xml b/plugins/insulin/src/main/res/layout/insulin_fragment.xml
index 4d07600c91..7ee8581409 100644
--- a/plugins/insulin/src/main/res/layout/insulin_fragment.xml
+++ b/plugins/insulin/src/main/res/layout/insulin_fragment.xml
@@ -30,7 +30,7 @@
             android:layout_margin="10dp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <info.nightscout.core.graph.ActivityGraph
+        <app.aaps.core.main.graph.ActivityGraph
             android:id="@+id/graph"
             android:layout_width="match_parent"
             android:layout_height="200dip"
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt
index 4da7cf669c..22e182ed8f 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt
@@ -7,6 +7,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
+import app.aaps.core.main.extensions.toStringMedium
+import app.aaps.core.main.extensions.toStringShort
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
@@ -32,12 +35,9 @@ import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.extensions.toStringMedium
-import info.nightscout.core.extensions.toStringShort
 import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.elements.SingleClickButton
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
@@ -276,7 +276,7 @@ class ActionsFragment : DaggerFragment() {
         val isPatchPump = pump.pumpDescription.isPatchPump
         binding.status.apply {
             cannulaOrPatch.text = if (cannulaOrPatch.text.isEmpty()) "" else if (isPatchPump) rh.gs(R.string.patch_pump) else rh.gs(R.string.cannula)
-            val imageResource = if (isPatchPump) info.nightscout.core.main.R.drawable.ic_patch_pump_outline else R.drawable.ic_cp_age_cannula
+            val imageResource = if (isPatchPump) app.aaps.core.main.R.drawable.ic_patch_pump_outline else R.drawable.ic_cp_age_cannula
             cannulaOrPatch.setCompoundDrawablesWithIntrinsicBounds(imageResource, 0, 0, 0)
             batteryLayout.visibility = (!isPatchPump || pump.pumpDescription.useHardwareLink).toVisibility()
             cannulaUsageLabel.visibility = isPatchPump.not().toVisibility()
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt
index b0e5509d7d..155f56780f 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt
@@ -24,7 +24,7 @@ class ActionsPlugin @Inject constructor(
         .fragmentClass(ActionsFragment::class.qualifiedName)
         .enableByDefault(config.APS || config.PUMPCONTROL)
         .visibleByDefault(config.APS || config.PUMPCONTROL)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_action)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_action)
         .pluginName(R.string.actions)
         .shortName(R.string.actions_shortname)
         .description(R.string.description_actions),
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt
index 00d2628c77..0c94371ff8 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt
@@ -11,6 +11,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -24,7 +25,6 @@ import app.aaps.interfaces.ui.UiInteraction
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.Food
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt
index 4b136bbd15..f51e51be58 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt
@@ -19,7 +19,7 @@ class FoodPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.GENERAL)
         .fragmentClass(FoodFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_food)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_food)
         .pluginName(R.string.food)
         .shortName(R.string.food_short)
         .description(R.string.description_food),
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt
index bc3e43a2dd..6b2e1ba6ae 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt
@@ -24,6 +24,13 @@ import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.core.text.toSpanned
 import androidx.recyclerview.widget.LinearLayoutManager
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.extensions.directionToIcon
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.iob.displayText
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.wizard.QuickWizard
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.aps.VariableSensitivityResult
 import app.aaps.interfaces.automation.Automation
@@ -79,18 +86,11 @@ import app.aaps.interfaces.utils.TrendCalculator
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.extensions.directionToIcon
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.iob.displayText
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.elements.SingleClickButton
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.JsonHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.wizard.QuickWizard
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.interfaces.end
@@ -543,7 +543,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             if (quickWizardEntry != null && lastBG != null && profile != null && pump.isInitialized() && !pump.isSuspended() && !loop.isDisconnected) {
                 binding.buttonsLayout.quickWizardButton.visibility = View.VISIBLE
                 val wizard = quickWizardEntry.doCalc(profile, profileName, lastBG)
-                binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + rh.gs(info.nightscout.core.main.R.string.format_carbs, quickWizardEntry.carbs()) +
+                binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + rh.gs(app.aaps.core.main.R.string.format_carbs, quickWizardEntry.carbs()) +
                     " " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.calculatedTotalInsulin)
                 if (wizard.calculatedTotalInsulin <= 0) binding.buttonsLayout.quickWizardButton.visibility = View.GONE
             } else binding.buttonsLayout.quickWizardButton.visibility = View.GONE
@@ -590,7 +590,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 }
                 binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.cgmDexColor))
             } else if (xDripIsBgSource) {
-                binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(info.nightscout.core.main.R.drawable.ic_xdrip), null, null)
+                binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(app.aaps.core.main.R.drawable.ic_xdrip), null, null)
                 for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) {
                     drawable?.mutate()
                     drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, info.nightscout.core.ui.R.attr.cgmXdripColor), PorterDuff.Mode.SRC_IN)
@@ -688,7 +688,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     }
 
                     (loop as PluginBase).isEnabled() && closedLoopEnabled.value()               -> {
-                        binding.infoLayout.apsMode.setImageResource(info.nightscout.core.main.R.drawable.ic_loop_closed)
+                        binding.infoLayout.apsMode.setImageResource(app.aaps.core.main.R.drawable.ic_loop_closed)
                         apsModeSetA11yLabel(info.nightscout.core.ui.R.string.closedloop)
                         binding.infoLayout.apsModeText.visibility = View.GONE
                     }
@@ -891,7 +891,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         val pump = activePlugin.activePump
         val isPatchPump = pump.pumpDescription.isPatchPump
         binding.statusLightsLayout.apply {
-            cannulaOrPatch.setImageResource(if (isPatchPump) info.nightscout.core.main.R.drawable.ic_patch_pump_outline else R.drawable.ic_cp_age_cannula)
+            cannulaOrPatch.setImageResource(if (isPatchPump) app.aaps.core.main.R.drawable.ic_patch_pump_outline else R.drawable.ic_cp_age_cannula)
             cannulaOrPatch.contentDescription = rh.gs(if (isPatchPump) R.string.statuslights_patch_pump_age else R.string.statuslights_cannula_age)
             insulinAge.visibility = isPatchPump.not().toVisibility()
             batteryLayout.visibility = (!isPatchPump || pump.pumpDescription.useHardwareLink).toVisibility()
@@ -1091,9 +1091,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (config.NSCLIENT && sp.getBoolean(info.nightscout.core.utils.R.string.key_used_autosens_on_main_phone, false) ||
             !config.NSCLIENT && constraintChecker.isAutosensModeEnabled().value()
         ) {
-            binding.infoLayout.sensitivityIcon.setImageResource(info.nightscout.core.main.R.drawable.ic_swap_vert_black_48dp_green)
+            binding.infoLayout.sensitivityIcon.setImageResource(app.aaps.core.main.R.drawable.ic_swap_vert_black_48dp_green)
         } else {
-            binding.infoLayout.sensitivityIcon.setImageResource(info.nightscout.core.main.R.drawable.ic_x_swap_vert)
+            binding.infoLayout.sensitivityIcon.setImageResource(app.aaps.core.main.R.drawable.ic_x_swap_vert)
         }
 
         binding.infoLayout.sensitivity.text =
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt
index b52e210085..33d4bbb721 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt
@@ -10,6 +10,7 @@ import android.widget.ImageButton
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.PopupMenu
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.logging.AAPSLogger
@@ -20,7 +21,6 @@ import app.aaps.interfaces.rx.events.EventRefreshOverview
 import app.aaps.interfaces.rx.events.EventScale
 import app.aaps.interfaces.sharedPreferences.SP
 import com.google.gson.Gson
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.R
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt
index 3ea5da2ea7..8fa836cfd4 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt
@@ -4,6 +4,17 @@ import android.content.Context
 import androidx.annotation.StringRes
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.utils.extensions.putDouble
+import app.aaps.core.main.utils.extensions.putInt
+import app.aaps.core.main.utils.extensions.putString
+import app.aaps.core.main.utils.extensions.storeBoolean
+import app.aaps.core.main.utils.extensions.storeDouble
+import app.aaps.core.main.utils.extensions.storeInt
+import app.aaps.core.main.utils.extensions.storeString
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.AAPSLogger
@@ -22,18 +33,7 @@ import app.aaps.interfaces.rx.events.EventUpdateOverviewCalcProgress
 import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.shared.impl.rx.bus.RxBusImpl
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.events.EventIobCalculationProgress
-import info.nightscout.core.events.EventNewNotification
-import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.extensions.putDouble
-import info.nightscout.core.utils.extensions.putInt
-import info.nightscout.core.utils.extensions.putString
-import info.nightscout.core.utils.extensions.storeBoolean
-import info.nightscout.core.utils.extensions.storeDouble
-import info.nightscout.core.utils.extensions.storeInt
-import info.nightscout.core.utils.extensions.storeString
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.validators.ValidatingEditTextPreference
 import info.nightscout.plugins.R
 import info.nightscout.plugins.general.overview.notifications.NotificationStore
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt
index 52c4680ba8..ff175db2f6 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt
@@ -3,6 +3,11 @@ package info.nightscout.plugins.general.overview.graphData
 import android.content.Context
 import android.graphics.DashPathEffect
 import android.graphics.Paint
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.BolusDataPoint
+import app.aaps.core.main.graph.data.EffectiveProfileSwitchDataPoint
+import app.aaps.core.main.graph.data.GlucoseValueDataPoint
+import app.aaps.core.main.graph.data.TimeAsXAxisLabelFormatter
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.profile.DefaultValueHelper
@@ -14,11 +19,6 @@ import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
 import com.jjoe64.graphview.series.Series
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.graph.data.BolusDataPoint
-import info.nightscout.core.graph.data.EffectiveProfileSwitchDataPoint
-import info.nightscout.core.graph.data.GlucoseValueDataPoint
-import info.nightscout.core.graph.data.TimeAsXAxisLabelFormatter
 import info.nightscout.core.ui.toast.ToastUtils
 import javax.inject.Inject
 import kotlin.math.abs
@@ -63,10 +63,10 @@ class GraphData(
 
     fun addInRangeArea(fromTime: Long, toTime: Long, lowLine: Double, highLine: Double) {
         val inRangeAreaDataPoints = arrayOf(
-            info.nightscout.core.graph.data.DoubleDataPoint(fromTime.toDouble(), lowLine, highLine),
-            info.nightscout.core.graph.data.DoubleDataPoint(toTime.toDouble(), lowLine, highLine)
+            app.aaps.core.main.graph.data.DoubleDataPoint(fromTime.toDouble(), lowLine, highLine),
+            app.aaps.core.main.graph.data.DoubleDataPoint(toTime.toDouble(), lowLine, highLine)
         )
-        addSeries(info.nightscout.core.graph.data.AreaGraphSeries(inRangeAreaDataPoints).also {
+        addSeries(app.aaps.core.main.graph.data.AreaGraphSeries(inRangeAreaDataPoints).also {
             it.color = 0
             it.isDrawBackground = true
             it.backgroundColor = rh.gac(graph.context, info.nightscout.core.ui.R.attr.inRangeBackground)
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt
index 3f3471e77c..85dee19241 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/DummyService.kt
@@ -5,6 +5,7 @@ import android.app.Service
 import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.notifications.NotificationHolder
@@ -12,7 +13,6 @@ import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventAppExit
 import dagger.android.DaggerService
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
 
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
index f0331b9e57..436643f0b7 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@@ -6,6 +6,10 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
 import androidx.core.app.RemoteInput
+import app.aaps.core.main.extensions.toStringShort
+import app.aaps.core.main.iob.generateCOBString
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.iob.GlucoseStatusProvider
 import app.aaps.interfaces.iob.IobCobCalculator
@@ -27,10 +31,6 @@ import app.aaps.interfaces.rx.events.EventRefreshOverview
 import app.aaps.interfaces.ui.IconsProvider
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.toStringShort
-import info.nightscout.core.iob.generateCOBString
-import info.nightscout.core.iob.round
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.R
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
index 3d01e88cb9..cf6d22e95f 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.smsCommunicator.Sms
@@ -11,7 +12,6 @@ import app.aaps.interfaces.smsCommunicator.SmsCommunicator
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.databinding.SmscommunicatorFragmentBinding
 import info.nightscout.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui
 import io.reactivex.rxjava3.disposables.CompositeDisposable
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index b0c26581b1..dad9497b0e 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -10,6 +10,12 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.iob.generateCOBString
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.aps.ApsMode
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
@@ -47,13 +53,7 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.SafeParse
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.events.EventNewNotification
-import info.nightscout.core.iob.generateCOBString
-import info.nightscout.core.iob.round
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.core.validators.ValidatingEditTextPreference
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.TemporaryTarget
@@ -112,7 +112,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.GENERAL)
         .fragmentClass(SmsCommunicatorFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_sms)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_sms)
         .pluginName(R.string.smscommunicator)
         .shortName(R.string.smscommunicator_shortname)
         .preferencesId(R.xml.pref_smscommunicator)
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
index abb35e8984..667e610a80 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
@@ -10,6 +10,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.view.WindowManager
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.UserEntryLogger
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.smsCommunicator.SmsCommunicator
@@ -18,7 +19,6 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.plugins.R
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt
index 19af240286..399245e1f3 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.maintenance.ImportExportPrefs
@@ -21,7 +22,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.R
 import info.nightscout.plugins.databinding.WearFragmentBinding
 import info.nightscout.plugins.general.wear.activities.CwfInfosActivity
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt
index 3bcb24fd9f..fe14ee53ee 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt
@@ -1,6 +1,7 @@
 package info.nightscout.plugins.general.wear
 
 import android.content.Context
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.plugin.PluginBase
 import app.aaps.interfaces.plugin.PluginDescription
@@ -21,7 +22,6 @@ import app.aaps.interfaces.rx.weardata.CwfMetadataKey
 import app.aaps.interfaces.rx.weardata.EventData
 import app.aaps.interfaces.sharedPreferences.SP
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.R
 import info.nightscout.plugins.general.wear.wearintegration.DataHandlerMobile
 import info.nightscout.plugins.general.wear.wearintegration.DataLayerListenerServiceMobileHelper
@@ -47,7 +47,7 @@ class WearPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.GENERAL)
         .fragmentClass(WearFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_watch)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_watch)
         .pluginName(info.nightscout.core.ui.R.string.wear)
         .shortName(R.string.wear_shortname)
         .preferencesId(R.xml.pref_wear)
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt
index 282111719c..7e0c2bd153 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.resources.ResourceHelper
@@ -23,7 +24,6 @@ import app.aaps.interfaces.rx.weardata.ZipWatchfaceFormat
 import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.versionChecker.VersionCheckerUtils
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.R
 import info.nightscout.plugins.databinding.CwfInfosActivityBinding
 import info.nightscout.plugins.databinding.CwfInfosActivityPrefItemBinding
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt
index 3e9dbf0a0f..6dbf81866f 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt
@@ -2,6 +2,17 @@ package info.nightscout.plugins.general.wear.wearintegration
 
 import android.app.NotificationManager
 import android.content.Context
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.toStringShort
+import app.aaps.core.main.extensions.valueToUnits
+import app.aaps.core.main.graph.data.GlucoseValueDataPoint
+import app.aaps.core.main.iob.generateCOBString
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.wizard.BolusWizard
+import app.aaps.core.main.wizard.QuickWizard
+import app.aaps.core.main.wizard.QuickWizardEntry
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants
@@ -40,18 +51,7 @@ import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.T
 import app.aaps.interfaces.utils.TrendCalculator
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.toStringShort
-import info.nightscout.core.extensions.valueToUnits
-import info.nightscout.core.graph.data.GlucoseValueDataPoint
-import info.nightscout.core.iob.generateCOBString
-import info.nightscout.core.iob.round
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.wizard.BolusWizard
-import info.nightscout.core.wizard.QuickWizard
-import info.nightscout.core.wizard.QuickWizardEntry
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
index 9247355009..f122e9be83 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
@@ -3,6 +3,7 @@ package info.nightscout.plugins.general.wear.wearintegration
 import android.os.Binder
 import android.os.Handler
 import android.os.HandlerThread
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.iob.IobCobCalculator
@@ -30,7 +31,6 @@ import com.google.android.gms.wearable.PutDataMapRequest
 import com.google.android.gms.wearable.Wearable
 import com.google.android.gms.wearable.WearableListenerService
 import dagger.android.AndroidInjection
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.plugins.R
 import info.nightscout.plugins.general.wear.WearPlugin
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
index 44e38158cf..66d54cde98 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
@@ -2,6 +2,17 @@ package info.nightscout.plugins.iob.iobCobCalculator
 
 import androidx.collection.LongSparseArray
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.iobCalc
+import app.aaps.core.main.extensions.toTemporaryBasal
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.iob.combine
+import app.aaps.core.main.iob.copy
+import app.aaps.core.main.iob.determineBasalJson
+import app.aaps.core.main.iob.plus
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.aps.AutosensData
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.aps.AutosensResult
@@ -34,17 +45,6 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.MidnightTime
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.iobCalc
-import info.nightscout.core.extensions.toTemporaryBasal
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.iob.combine
-import info.nightscout.core.iob.copy
-import info.nightscout.core.iob.determineBasalJson
-import info.nightscout.core.iob.plus
-import info.nightscout.core.iob.round
-import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.ExtendedBolus
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt
index d73e0a6331..034722f6db 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt
@@ -8,6 +8,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
@@ -28,9 +30,7 @@ import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.SafeParse
 import com.google.android.material.tabs.TabLayout
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.plugins.R
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
index e7979a18a3..26ec96f47d 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
@@ -2,6 +2,9 @@ package info.nightscout.plugins.profile
 
 import androidx.fragment.app.FragmentActivity
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.extensions.blockFromJsonArray
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
@@ -28,9 +31,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.HardLimits
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.blockFromJsonArray
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.JsonHelper
@@ -63,7 +63,7 @@ class ProfilePlugin @Inject constructor(
         .mainType(PluginType.PROFILE)
         .fragmentClass(ProfileFragment::class.java.name)
         .enableByDefault(true)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_local_profile)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_local_profile)
         .pluginName(R.string.localprofile)
         .shortName(R.string.localprofile_shortname)
         .description(R.string.description_profile_local)
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt
index 9ae43e2168..3f6bea322c 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt
@@ -93,7 +93,7 @@ class TimeListEdit(
         val factor = layout.context.resources.displayMetrics.density
         ImageView(context).also {
             this.finalAdd = it
-            it.setImageResource(info.nightscout.core.main.R.drawable.ic_add)
+            it.setImageResource(app.aaps.core.main.R.drawable.ic_add)
             it.contentDescription = layout.context.resources.getString(info.nightscout.plugins.R.string.a11y_add_new_to_list)
             layout.addView(it)
             it.layoutParams = LinearLayout.LayoutParams((35.0 * factor).toInt(), (35 * factor).toInt()).also { llp ->
diff --git a/plugins/main/src/main/res/layout/profile_fragment.xml b/plugins/main/src/main/res/layout/profile_fragment.xml
index b1936437f4..ac08cc9fda 100644
--- a/plugins/main/src/main/res/layout/profile_fragment.xml
+++ b/plugins/main/src/main/res/layout/profile_fragment.xml
@@ -198,7 +198,7 @@
 
                 </LinearLayout>
 
-                <info.nightscout.core.graph.ActivityGraph
+                <app.aaps.core.main.graph.ActivityGraph
                     android:id="@+id/insulin_graph"
                     android:layout_width="match_parent"
                     android:layout_height="100dip"
@@ -219,7 +219,7 @@
                     android:layout_marginBottom="10dp"
                     android:orientation="vertical" />
 
-                <info.nightscout.core.graph.IcProfileGraph
+                <app.aaps.core.main.graph.IcProfileGraph
                     android:id="@+id/ic_graph"
                     android:layout_width="match_parent"
                     android:layout_height="100dip"
@@ -240,7 +240,7 @@
                     android:layout_marginBottom="10dp"
                     android:orientation="vertical" />
 
-                <info.nightscout.core.graph.IsfProfileGraph
+                <app.aaps.core.main.graph.IsfProfileGraph
                     android:id="@+id/isf_graph"
                     android:layout_width="match_parent"
                     android:layout_height="100dip"
@@ -261,7 +261,7 @@
                     android:layout_marginBottom="10dp"
                     android:orientation="vertical" />
 
-                <info.nightscout.core.graph.BasalProfileGraph
+                <app.aaps.core.main.graph.BasalProfileGraph
                     android:id="@+id/basal_graph"
                     android:layout_width="match_parent"
                     android:layout_height="100dip"
@@ -282,7 +282,7 @@
                     android:layout_marginBottom="10dp"
                     android:orientation="vertical" />
 
-                <info.nightscout.core.graph.TargetBgProfileGraph
+                <app.aaps.core.main.graph.TargetBgProfileGraph
                     android:id="@+id/target_graph"
                     android:layout_width="match_parent"
                     android:layout_height="100dip"
diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt
index 56a4cdd5c4..5d04c5a09a 100644
--- a/plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/core/extensions/BolusExtensionKtTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.core.extensions
 
+import app.aaps.core.main.extensions.iobCalc
 import app.aaps.interfaces.insulin.Insulin
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.ui.UiInteraction
diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt
index 984865010c..81a4a1e5f8 100644
--- a/plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/core/extensions/ExtendedBolusExtensionKtTest.kt
@@ -1,5 +1,8 @@
 package info.nightscout.core.extensions
 
+import app.aaps.core.main.extensions.iobCalc
+import app.aaps.core.main.extensions.isInProgress
+import app.aaps.core.main.extensions.toTemporaryBasal
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.aps.SMBDefaults
 import app.aaps.interfaces.insulin.Insulin
diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/GlucoseValueExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/GlucoseValueExtensionKtTest.kt
index 54f35542e9..95edef938f 100644
--- a/plugins/main/src/test/java/info/nightscout/core/extensions/GlucoseValueExtensionKtTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/core/extensions/GlucoseValueExtensionKtTest.kt
@@ -1,10 +1,12 @@
 package info.nightscout.core.extensions
 
+import app.aaps.core.main.R
+import app.aaps.core.main.extensions.directionToIcon
+import app.aaps.core.main.extensions.valueToUnits
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.iob.InMemoryGlucoseValue
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.main.R
 import info.nightscout.database.entities.GlucoseValue
 import org.junit.jupiter.api.Test
 
diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt
index d40e3304e3..f92e5c0af4 100644
--- a/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryBasalExtensionKtTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.core.extensions
 
+import app.aaps.core.main.extensions.iobCalc
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.aps.SMBDefaults
 import app.aaps.interfaces.insulin.Insulin
diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryTargetExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryTargetExtensionKtTest.kt
index e6d8f4275e..0db2e971df 100644
--- a/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryTargetExtensionKtTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/core/extensions/TemporaryTargetExtensionKtTest.kt
@@ -1,5 +1,8 @@
 package info.nightscout.core.extensions
 
+import app.aaps.core.main.extensions.highValueToUnitsToString
+import app.aaps.core.main.extensions.lowValueToUnitsToString
+import app.aaps.core.main.extensions.target
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
diff --git a/plugins/main/src/test/java/info/nightscout/core/extensions/TherapyEventExtensionKtTest.kt b/plugins/main/src/test/java/info/nightscout/core/extensions/TherapyEventExtensionKtTest.kt
index 5206096f49..293328a51e 100644
--- a/plugins/main/src/test/java/info/nightscout/core/extensions/TherapyEventExtensionKtTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/core/extensions/TherapyEventExtensionKtTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.core.extensions
 
+import app.aaps.core.main.extensions.isOlderThan
 import app.aaps.interfaces.utils.T
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
diff --git a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index eaf1f48d3a..81435b06b3 100644
--- a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -1,6 +1,7 @@
 package info.nightscout.plugins.general.smsCommunicator
 
 import android.telephony.SmsManager
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.aps.ApsMode
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.aps.Loop
@@ -23,7 +24,6 @@ import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
diff --git a/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt
index 6a8812477d..e9b43bcddf 100644
--- a/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/AidexPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.source
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.logging.AAPSLogger
@@ -15,7 +16,6 @@ import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.source.BgSource
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CgmSourceTransaction
@@ -34,7 +34,7 @@ class AidexPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon((info.nightscout.core.main.R.drawable.ic_blooddrop_48))
+        .pluginIcon((app.aaps.core.main.R.drawable.ic_blooddrop_48))
         .preferencesId(R.xml.pref_bgsource)
         .pluginName(R.string.aidex)
         .shortName(R.string.aidex_short)
diff --git a/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt b/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt
index c819bc4419..baa7701871 100644
--- a/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt
@@ -13,6 +13,9 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.extensions.directionToIcon
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.extensions.toVisibilityKeepSpace
 import app.aaps.interfaces.logging.AAPSLogger
@@ -29,10 +32,7 @@ import app.aaps.interfaces.rx.events.EventNewBG
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.extensions.directionToIcon
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.ActionModeHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
diff --git a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
index 33ddf88a04..3c4daff687 100644
--- a/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/DexcomPlugin.kt
@@ -6,6 +6,8 @@ import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.extensions.fromConstant
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -22,9 +24,7 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import app.aaps.shared.impl.extensions.safeGetInstalledPackages
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.fromConstant
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry.Action
@@ -51,7 +51,7 @@ class DexcomPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_dexcom_g6)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_dexcom_g6)
         .preferencesId(R.xml.pref_dexcom)
         .pluginName(R.string.dexcom_app_patched)
         .shortName(R.string.dexcom_short)
diff --git a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt
index 6854b9344a..6d53c6b30d 100644
--- a/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/EversensePlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.source
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.PluginBase
@@ -13,7 +14,6 @@ import app.aaps.interfaces.source.BgSource
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.impl.AppRepository
@@ -34,7 +34,7 @@ class EversensePlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_eversense)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_eversense)
         .preferencesId(R.xml.pref_bgsource)
         .pluginName(R.string.eversense)
         .shortName(R.string.eversense_shortname)
diff --git a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
index b9dfc92e89..0dfccdd979 100644
--- a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.PluginBase
@@ -12,7 +13,6 @@ import app.aaps.interfaces.plugin.PluginType
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.source.BgSource
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CgmSourceTransaction
@@ -31,7 +31,7 @@ class GlimpPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_glimp)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_glimp)
         .preferencesId(R.xml.pref_bgsource)
         .pluginName(R.string.glimp)
         .description(R.string.description_source_glimp),
diff --git a/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt
index d5edc64225..3d57b9f3d5 100644
--- a/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/GlunovoPlugin.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.Uri
 import android.os.Handler
 import android.os.HandlerThread
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -17,7 +18,6 @@ import app.aaps.interfaces.source.BgSource
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
@@ -44,7 +44,7 @@ class GlunovoPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_glunovo)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_glunovo)
         .preferencesId(R.xml.pref_bgsource)
         .pluginName(R.string.glunovo)
         .shortName(R.string.glunovo)
diff --git a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt
index 3e81bd444a..93342787c5 100644
--- a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt
@@ -6,6 +6,7 @@ import android.net.Uri
 import android.os.Handler
 import android.os.HandlerThread
 import android.util.Log
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -20,7 +21,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import app.aaps.shared.impl.extensions.safeGetInstalledPackages
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
diff --git a/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt
index 0ee9018503..1208849e70 100644
--- a/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/MM640gPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.source
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.PluginBase
@@ -12,7 +13,6 @@ import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.source.BgSource
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CgmSourceTransaction
@@ -33,7 +33,7 @@ class MM640gPlugin @Inject constructor(
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
         .preferencesId(R.xml.pref_bgsource)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_generic_cgm)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_generic_cgm)
         .pluginName(R.string.mm640g)
         .description(R.string.description_source_mm640g),
     aapsLogger, rh, injector
diff --git a/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt
index e72e9a59b9..93449ffe3d 100644
--- a/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/NSClientSourcePlugin.kt
@@ -23,7 +23,7 @@ class NSClientSourcePlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_nsclient_bg)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_nsclient_bg)
         .pluginName(R.string.ns_client_bg)
         .shortName(R.string.ns_client_bg_short)
         .description(R.string.description_source_ns_client)
diff --git a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
index 266c9563c3..8a28a33b41 100644
--- a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.source
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.logging.AAPSLogger
@@ -14,7 +15,6 @@ import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.source.BgSource
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.JsonHelper.safeGetString
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CgmSourceTransaction
@@ -34,7 +34,7 @@ class PoctechPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_poctech)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_poctech)
         .preferencesId(R.xml.pref_bgsource)
         .pluginName(R.string.poctech)
         .description(R.string.description_source_poctech),
diff --git a/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt
index c2f36765ee..0dd38fb555 100644
--- a/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/TomatoPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.source
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.PluginBase
@@ -12,7 +13,6 @@ import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.source.BgSource
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CgmSourceTransaction
@@ -30,7 +30,7 @@ class TomatoPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_sensor)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_sensor)
         .preferencesId(R.xml.pref_bgsource)
         .pluginName(R.string.tomato)
         .shortName(R.string.tomato_short)
diff --git a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt b/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt
index 3d8636cc24..b7e4eeea0a 100644
--- a/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/XdripSourcePlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.source
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.PluginBase
@@ -14,7 +15,6 @@ import app.aaps.interfaces.source.BgSource
 import app.aaps.interfaces.source.XDripSource
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CgmSourceTransaction
@@ -32,7 +32,7 @@ class XdripSourcePlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
-        .pluginIcon((info.nightscout.core.main.R.drawable.ic_blooddrop_48))
+        .pluginIcon((app.aaps.core.main.R.drawable.ic_blooddrop_48))
         .preferencesId(R.xml.pref_bgsource)
         .pluginName(R.string.source_xdrip)
         .description(R.string.description_source_xdrip),
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt
index b43cdfc35c..0ac1fdb0f7 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt
@@ -4,6 +4,10 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.ResolveInfo
 import android.os.Bundle
+import app.aaps.core.main.extensions.durationInMinutes
+import app.aaps.core.main.extensions.toStringFull
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.iob.GlucoseStatusProvider
@@ -30,10 +34,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.shared.impl.extensions.safeQueryBroadcastReceivers
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.durationInMinutes
-import info.nightscout.core.extensions.toStringFull
-import info.nightscout.core.iob.round
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.R
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt
index 2168e064e1..f95d8eea46 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt
@@ -16,6 +16,7 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.db.PersistenceLayer
 import app.aaps.interfaces.logging.AAPSLogger
@@ -33,7 +34,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.plugins.sync.R
 import info.nightscout.plugins.sync.databinding.NsClientFragmentBinding
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt
index 473d827c38..d0eb3a09c2 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt
@@ -8,6 +8,8 @@ import android.os.IBinder
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreference
+import app.aaps.core.main.extensions.toJson
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.logging.AAPSLogger
@@ -33,8 +35,6 @@ import app.aaps.interfaces.sync.Sync
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.toJson
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.R
 import info.nightscout.plugins.sync.nsShared.NSClientFragment
 import info.nightscout.plugins.sync.nsShared.events.EventNSClientStatus
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
index 74427ece40..51a84d3075 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
@@ -1,6 +1,7 @@
 package info.nightscout.plugins.sync.nsclient
 
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.receivers.ReceiverStatusStore
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.AapsSchedulers
@@ -9,7 +10,6 @@ import app.aaps.interfaces.rx.events.EventChargingState
 import app.aaps.interfaces.rx.events.EventNetworkChange
 import app.aaps.interfaces.rx.events.EventPreferenceChange
 import app.aaps.interfaces.sharedPreferences.SP
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.R
 import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged
 import io.reactivex.rxjava3.disposables.CompositeDisposable
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt
index 4e22df861d..6d4b3014c0 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt
@@ -1,9 +1,9 @@
 package info.nightscout.plugins.sync.nsclient.extensions
 
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.utils.DateUtil
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.embedments.InterfaceIDs
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt
index 6282cd4599..52074f864a 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt
@@ -1,9 +1,9 @@
 package info.nightscout.plugins.sync.nsclient.extensions
 
+import app.aaps.core.main.extensions.toTemporaryBasal
 import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.toTemporaryBasal
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.embedments.InterfaceIDs
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt
index b60ffd8a86..4e43a032f0 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt
@@ -1,13 +1,13 @@
 package info.nightscout.plugins.sync.nsclient.extensions
 
+import app.aaps.core.main.extensions.fromConstant
+import app.aaps.core.main.extensions.getCustomizedName
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.fromConstant
-import info.nightscout.core.extensions.getCustomizedName
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.ProfileSwitch
 import info.nightscout.database.entities.TherapyEvent
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt
index 73106d676e..6a79042ccd 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt
@@ -1,9 +1,9 @@
 package info.nightscout.plugins.sync.nsclient.extensions
 
+import app.aaps.core.main.extensions.convertedToAbsolute
 import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.database.entities.TemporaryBasal.Type.Companion.fromString
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt
index c6bed4adb3..63e666daae 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt
@@ -10,6 +10,8 @@ import android.os.IBinder
 import android.os.PowerManager
 import android.os.SystemClock
 import androidx.work.OneTimeWorkRequest
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -30,10 +32,8 @@ import com.google.gson.GsonBuilder
 import com.google.gson.JsonDeserializer
 import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.utils.JsonHelper.safeGetString
 import info.nightscout.core.utils.JsonHelper.safeGetStringAllowNull
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.plugins.sync.R
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
index 99a488290e..41fa01bf14 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.SystemClock
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.nsclient.StoreDataForDb
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
@@ -25,7 +26,6 @@ import app.aaps.interfaces.sync.DataSyncSelector.PairTemporaryTarget
 import app.aaps.interfaces.sync.DataSyncSelector.PairTherapyEvent
 import info.nightscout.core.utils.notifyAll
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.plugins.sync.R
 import info.nightscout.plugins.sync.nsclient.acks.NSAddAck
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt
index b1b593d60f..321b59410c 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt
@@ -3,6 +3,7 @@ package info.nightscout.plugins.sync.nsclient.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.nsclient.StoreDataForDb
@@ -14,7 +15,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.Carbs
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt
index 752726e881..f4580c34c2 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt
@@ -3,11 +3,11 @@ package info.nightscout.plugins.sync.nsclient.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.nsclient.StoreDataForDb
 import app.aaps.interfaces.sharedPreferences.SP
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsclient.data.NSMbg
 import info.nightscout.plugins.sync.nsclient.extensions.therapyEventFromNsMbg
 import kotlinx.coroutines.Dispatchers
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
index 7dc64785af..4bcdad456d 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
@@ -3,6 +3,7 @@ package info.nightscout.plugins.sync.nsclient.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNSClientNewLog
@@ -20,7 +21,6 @@ import app.aaps.interfaces.sync.DataSyncSelector.PairTemporaryTarget
 import app.aaps.interfaces.sync.DataSyncSelector.PairTherapyEvent
 import info.nightscout.core.utils.notifyAll
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.plugins.sync.nsclient.acks.NSUpdateAck
 import kotlinx.coroutines.Dispatchers
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
index e7ffb92a1d..94503c0e25 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
@@ -12,6 +12,7 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.logging.AAPSLogger
@@ -50,7 +51,6 @@ import app.aaps.interfaces.utils.T
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.interfaces.TraceableDBEntry
 import info.nightscout.database.impl.AppRepository
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt
index 264a77619e..ce3c68e9a5 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt
@@ -1,9 +1,9 @@
 package info.nightscout.plugins.sync.nsclientV3.extensions
 
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.embedments.InterfaceIDs
 import info.nightscout.plugins.sync.nsclient.extensions.fromConstant
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt
index f42039ad37..519616c918 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt
@@ -1,8 +1,8 @@
 package info.nightscout.plugins.sync.nsclientV3.extensions
 
+import app.aaps.core.main.extensions.toTemporaryBasal
 import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.toTemporaryBasal
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.embedments.InterfaceIDs
 import info.nightscout.sdk.localmodel.treatment.EventType
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt
index 6bded18053..120479d552 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt
@@ -1,13 +1,13 @@
 package info.nightscout.plugins.sync.nsclientV3.extensions
 
+import app.aaps.core.main.extensions.fromConstant
+import app.aaps.core.main.extensions.getCustomizedName
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.fromConstant
-import info.nightscout.core.extensions.getCustomizedName
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.database.entities.ProfileSwitch
 import info.nightscout.database.entities.embedments.InterfaceIDs
 import info.nightscout.sdk.localmodel.treatment.EventType
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt
index 5864c5b40a..a9db5b6bd4 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt
@@ -1,8 +1,8 @@
 package info.nightscout.plugins.sync.nsclientV3.extensions
 
+import app.aaps.core.main.extensions.convertedToAbsolute
 import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.database.entities.embedments.InterfaceIDs
 import info.nightscout.sdk.localmodel.treatment.EventType
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
index 4c26f7501d..9ed3976901 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
@@ -3,10 +3,10 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNSClientNewLog
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import kotlinx.coroutines.Dispatchers
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt
index 6e1004f3ed..faffea4a41 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt
@@ -3,6 +3,7 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.nsclient.StoreDataForDb
 import app.aaps.interfaces.rx.bus.RxBus
@@ -11,7 +12,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.source.NSClientSource
 import app.aaps.interfaces.sync.NsClient
 import app.aaps.interfaces.utils.DateUtil
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import info.nightscout.sdk.interfaces.NSAndroidClient
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt
index f2203783a5..323ef04492 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt
@@ -3,12 +3,12 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNSClientNewLog
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import kotlinx.coroutines.Dispatchers
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt
index 18f36d695d..c628e9aa6b 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadFoodsWorker.kt
@@ -3,12 +3,12 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.nsclient.StoreDataForDb
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNSClientNewLog
 import app.aaps.interfaces.utils.DateUtil
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import info.nightscout.sdk.localmodel.food.NSFood
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt
index 123c3a1daf..8b539d6dd7 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt
@@ -3,10 +3,10 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNSClientNewLog
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt
index 08870b0c01..c2cb84747b 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadProfileStoreWorker.kt
@@ -3,6 +3,7 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNSClientNewLog
@@ -10,7 +11,6 @@ import app.aaps.interfaces.sync.NsClient
 import app.aaps.interfaces.utils.DateUtil
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import info.nightscout.sdk.interfaces.NSAndroidClient
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt
index 386c48c55d..87834005b1 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt
@@ -3,10 +3,10 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNSClientNewLog
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsShared.events.EventNSClientUpdateGuiStatus
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import kotlinx.coroutines.Dispatchers
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt
index ec1b60fe9a..75783d782b 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt
@@ -3,13 +3,13 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.nsclient.StoreDataForDb
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventNSClientNewLog
 import app.aaps.interfaces.sync.NsClient
 import app.aaps.interfaces.utils.DateUtil
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.nsShared.NsIncomingDataProcessor
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import info.nightscout.sdk.interfaces.NSAndroidClient
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt
index d2541def99..52ac89ff4b 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt
@@ -11,12 +11,12 @@ import android.widget.ScrollView
 import androidx.core.view.MenuCompat
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.sharedPreferences.SP
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.R
 import info.nightscout.plugins.sync.databinding.TidepoolFragmentBinding
 import info.nightscout.plugins.sync.tidepool.comm.TidepoolUploader
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt
index db0b8710fd..09f8e2f324 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.text.Spanned
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -24,7 +25,6 @@ import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.R
 import info.nightscout.plugins.sync.nsShared.events.EventConnectivityOptionChanged
 import info.nightscout.plugins.sync.nsclient.ReceiverDelegate
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt
index 6c342fbded..b8b2e4298f 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt
@@ -1,9 +1,9 @@
 package info.nightscout.plugins.sync.tidepool.elements
 
+import app.aaps.core.main.extensions.convertedToAbsolute
 import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.utils.DateUtil
 import com.google.gson.annotations.Expose
-import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.database.entities.TemporaryBasal
 import java.util.UUID
 
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt
index 60ed812531..5af12fc676 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt
@@ -1,10 +1,10 @@
 package info.nightscout.plugins.sync.tidepool.elements
 
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.profile.Profile
 import app.aaps.interfaces.profile.ProfileUtil
 import app.aaps.interfaces.utils.DateUtil
 import com.google.gson.annotations.Expose
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.plugins.sync.tidepool.comm.TidepoolUploader
 import java.util.UUID
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt
index 1fffc38229..87c35782fd 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt
@@ -12,6 +12,7 @@ import android.view.ViewGroup
 import androidx.core.view.MenuCompat
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.plugin.PluginBase
@@ -22,7 +23,6 @@ import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.sharedPreferences.SP
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.R
 import info.nightscout.plugins.sync.databinding.XdripFragmentBinding
 import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt
index 893d02bbf4..5f207d3f05 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt
@@ -10,6 +10,10 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import app.aaps.core.main.extensions.toStringShort
+import app.aaps.core.main.iob.generateCOBString
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
@@ -41,12 +45,8 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.shared.impl.extensions.safeQueryBroadcastReceivers
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.toStringShort
-import info.nightscout.core.iob.generateCOBString
-import info.nightscout.core.iob.round
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.R
 import info.nightscout.plugins.sync.nsclient.extensions.toJson
 import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI
@@ -86,7 +86,7 @@ class XdripPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.SYNC)
         .fragmentClass(XdripFragment::class.java.name)
-        .pluginIcon((info.nightscout.core.main.R.drawable.ic_blooddrop_48))
+        .pluginIcon((app.aaps.core.main.R.drawable.ic_blooddrop_48))
         .pluginName(R.string.xdrip)
         .shortName(R.string.xdrip_shortname)
         .preferencesId(R.xml.pref_xdrip)
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt
index 2df07dc18c..025dc46e71 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt
@@ -3,10 +3,10 @@ package info.nightscout.plugins.sync.xdrip.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventXdripNewLog
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.plugins.sync.xdrip.DataSyncSelectorXdripImpl
 import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI
 import kotlinx.coroutines.Dispatchers
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt
index 9166b54efc..6ce7f5385e 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.plugins.sync.nsclient
 
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.receivers.ReceiverStatusStore
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.events.EventChargingState
@@ -7,7 +8,6 @@ import app.aaps.interfaces.rx.events.EventNetworkChange
 import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.R
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt
index fb51a78d5d..ba17a2d059 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3PluginTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.plugins.sync.nsclientV3
 
+import app.aaps.core.main.extensions.fromConstant
 import app.aaps.interfaces.insulin.Insulin
 import app.aaps.interfaces.logging.UserEntryLogger
 import app.aaps.interfaces.nsclient.StoreDataForDb
@@ -12,7 +13,6 @@ import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.fromConstant
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.Carbs
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt
index 8503cb8d17..21b0e8a9fa 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtensionKtTest.kt
@@ -1,9 +1,9 @@
 package info.nightscout.plugins.sync.nsclientV3.extensions
 
+import app.aaps.core.main.extensions.fromConstant
 import app.aaps.interfaces.insulin.Insulin
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.extensions.fromConstant
 import info.nightscout.database.entities.ProfileSwitch
 import info.nightscout.database.entities.embedments.InsulinConfiguration
 import info.nightscout.database.entities.embedments.InterfaceIDs
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt
index ebc400fe11..8903ea5b0f 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt
@@ -3,13 +3,13 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 import android.content.Context
 import androidx.work.ListenableWorker.Result.Success
 import androidx.work.testing.TestListenableWorkerBuilder
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.sync.NsClient
 import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import kotlinx.coroutines.ExperimentalCoroutinesApi
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
index 6f90a07e56..d094bb3428 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
@@ -6,6 +6,7 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkContinuation
 import androidx.work.WorkManager
 import androidx.work.testing.TestListenableWorkerBuilder
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.nsclient.StoreDataForDb
 import app.aaps.interfaces.receivers.ReceiverStatusStore
@@ -19,7 +20,6 @@ import app.aaps.shared.tests.TestBase
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.embedments.InterfaceIDs
diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt
index de706cf66e..7d652ee8ce 100644
--- a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt
+++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.queue.Callback
 import app.aaps.interfaces.queue.CommandQueue
 import app.aaps.interfaces.resources.ResourceHelper
@@ -15,7 +16,6 @@ import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventQueueChanged
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.combo.data.ComboErrorUtil
 import info.nightscout.pump.combo.data.ComboErrorUtil.DisplayType
 import info.nightscout.pump.combo.databinding.CombopumpFragmentBinding
diff --git a/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt b/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt
index 323d8ae633..fb6db4eeb1 100644
--- a/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt
+++ b/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt
@@ -1,6 +1,7 @@
 package info.nightscout.pump.combo
 
 import android.content.Context
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.plugin.PluginType
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.pump.PumpEnactResult
@@ -13,7 +14,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.shared.tests.TestBase
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.combo.ruffyscripter.RuffyScripter
 import info.nightscout.pump.combo.ruffyscripter.history.Bolus
 import org.junit.jupiter.api.Assertions
diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
index 85d15e15a8..0c23d0beee 100644
--- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
+++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
@@ -8,6 +8,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.androidPermissions.AndroidPermission
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.Constraint
@@ -58,7 +59,6 @@ import info.nightscout.comboctl.parser.AlertScreenContent
 import info.nightscout.comboctl.parser.AlertScreenException
 import info.nightscout.comboctl.parser.BatteryState
 import info.nightscout.comboctl.parser.ReservoirState
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.pump.combov2.activities.ComboV2PairingActivity
diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt
index c278009fc2..39575a3bac 100644
--- a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt
+++ b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt
@@ -9,6 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -35,7 +36,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.dana.activities.DanaHistoryActivity
 import info.nightscout.pump.dana.activities.DanaUserOptionsActivity
 import info.nightscout.pump.dana.databinding.DanarFragmentBinding
diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt
index 0e704a2abe..b61b794a68 100644
--- a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt
+++ b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt
@@ -8,6 +8,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.ActivePlugin
@@ -25,7 +26,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.dana.R
 import info.nightscout.pump.dana.comm.RecordTypes
 import info.nightscout.pump.dana.database.DanaHistoryRecord
diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt
index 655b7bca18..a7ca8015fe 100644
--- a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt
+++ b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt
@@ -2,6 +2,7 @@ package info.nightscout.pump.dana.activities
 
 import android.content.Context
 import android.os.Bundle
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -15,7 +16,6 @@ import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventInitializationChanged
 import app.aaps.interfaces.ui.UiInteraction
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.dana.R
 import info.nightscout.pump.dana.databinding.DanarUserOptionsActivityBinding
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
index 39c25c07c0..b01e7aa6d8 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
@@ -6,6 +6,8 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
 import app.aaps.annotations.OpenForTesting
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -32,8 +34,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin
 import info.nightscout.androidaps.danar.R
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.dana.database.DanaHistoryDatabase
 import io.reactivex.rxjava3.kotlin.plusAssign
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
index fe0410abeb..06fba41f84 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
@@ -12,6 +12,8 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import app.aaps.annotations.OpenForTesting;
+import app.aaps.core.main.constraints.ConstraintObject;
+import app.aaps.core.main.utils.fabric.FabricPrivacy;
 import app.aaps.interfaces.constraints.ConstraintsChecker;
 import app.aaps.interfaces.logging.AAPSLogger;
 import app.aaps.interfaces.logging.LTag;
@@ -39,8 +41,6 @@ import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
 import info.nightscout.androidaps.danar.R;
-import info.nightscout.core.constraints.ConstraintObject;
-import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.pump.dana.DanaPump;
 import info.nightscout.pump.dana.database.DanaHistoryDatabase;
 
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
index 18390be172..542b3e0bde 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import app.aaps.core.main.constraints.ConstraintObject;
 import app.aaps.interfaces.constraints.Constraint;
 import app.aaps.interfaces.constraints.ConstraintsChecker;
 import app.aaps.interfaces.constraints.PluginConstraints;
@@ -37,7 +38,6 @@ import app.aaps.interfaces.utils.DecimalFormatter;
 import app.aaps.interfaces.utils.Round;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService;
-import info.nightscout.core.constraints.ConstraintObject;
 import info.nightscout.pump.dana.DanaFragment;
 import info.nightscout.pump.dana.DanaPump;
 import info.nightscout.pump.dana.comm.RecordTypes;
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
index 4a27f95c01..bff3d49598 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
@@ -12,6 +12,8 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import app.aaps.annotations.OpenForTesting;
+import app.aaps.core.main.constraints.ConstraintObject;
+import app.aaps.core.main.utils.fabric.FabricPrivacy;
 import app.aaps.interfaces.constraints.ConstraintsChecker;
 import app.aaps.interfaces.logging.AAPSLogger;
 import app.aaps.interfaces.logging.LTag;
@@ -35,8 +37,6 @@ import app.aaps.interfaces.utils.DecimalFormatter;
 import app.aaps.interfaces.utils.Round;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danar.services.DanaRExecutionService;
-import info.nightscout.core.constraints.ConstraintObject;
-import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.pump.dana.DanaPump;
 import info.nightscout.pump.dana.database.DanaHistoryDatabase;
 
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
index 8d3ed373e5..70bf51dd47 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.danar.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.logging.LTag
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 
 class MsgBolusStart(
     injector: HasAndroidInjector,
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
index 58603e9a71..1a213e810a 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.danar.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.logging.LTag
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 
 class MsgBolusStartWithSpeed(
     injector: HasAndroidInjector,
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
index dd84ab27b1..38801a3ae3 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.danar.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.logging.LTag
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 
 class MsgSetExtendedBolusStart(
     injector: HasAndroidInjector,
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
index 7b08cf7cf5..b73cc03307 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
@@ -20,6 +20,7 @@ import java.util.UUID;
 
 import javax.inject.Inject;
 
+import app.aaps.core.main.utils.fabric.FabricPrivacy;
 import app.aaps.interfaces.logging.AAPSLogger;
 import app.aaps.interfaces.logging.LTag;
 import app.aaps.interfaces.notifications.Notification;
@@ -55,7 +56,6 @@ import info.nightscout.androidaps.danar.comm.MsgHistorySuspend;
 import info.nightscout.androidaps.danar.comm.MsgPCCommStart;
 import info.nightscout.androidaps.danar.comm.MsgPCCommStop;
 import info.nightscout.core.ui.toast.ToastUtils;
-import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.pump.dana.DanaPump;
 import info.nightscout.pump.dana.comm.RecordTypes;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt
index 31569a16d5..27ff4eaa3b 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.pump.danaR
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.objects.Instantiator
 import app.aaps.interfaces.plugin.PluginType
@@ -10,7 +11,6 @@ import app.aaps.shared.tests.TestBaseWithProfile
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.dana.database.DanaHistoryDatabase
 import org.junit.jupiter.api.Assertions
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MessageHashTableRTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MessageHashTableRTest.kt
index 7b40464bec..d2112044db 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MessageHashTableRTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaR.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import info.nightscout.androidaps.danar.comm.MessageHashTableR
-import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartTest.kt
index 2369557048..1816f80694 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaR.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import info.nightscout.androidaps.danar.comm.MsgBolusStart
-import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.`when`
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
index 6bbba7a377..1d5c6abe4a 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaR.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import info.nightscout.androidaps.danar.comm.MsgBolusStartWithSpeed
-import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
index ae76035dd2..124752a91d 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaR.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStart
-import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.`when`
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt
index a3a5995322..639d718232 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.pump.danaRKorean
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.objects.Instantiator
 import app.aaps.interfaces.plugin.PluginType
@@ -10,7 +11,6 @@ import app.aaps.shared.tests.TestBaseWithProfile
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.dana.database.DanaHistoryDatabase
 import org.junit.jupiter.api.Assertions
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index 1e0b6c756b..1542430877 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaRKorean.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.danaR.comm.DanaRTestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt
index e1012095a2..61fa692861 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.pump.danaRv2
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.objects.Instantiator
 import app.aaps.interfaces.plugin.PluginType
@@ -12,7 +13,6 @@ import app.aaps.shared.tests.TestBaseWithProfile
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.dana.database.DanaHistoryDatabase
 import org.junit.jupiter.api.Assertions
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/comm/MessageHashTableRv2Test.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/comm/MessageHashTableRv2Test.kt
index 2ac52af714..b72b351f80 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/comm/MessageHashTableRv2Test.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/comm/MessageHashTableRv2Test.kt
@@ -1,9 +1,9 @@
 package info.nightscout.pump.danaRv2.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import info.nightscout.androidaps.danaRv2.comm.MessageHashTableRv2
 import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.danaR.comm.DanaRTestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
index de08a59fee..0f96772a93 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
@@ -7,6 +7,8 @@ import android.content.ServiceConnection
 import android.os.IBinder
 import android.text.format.DateFormat
 import androidx.preference.Preference
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.constraints.Constraint
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.constraints.PluginConstraints
@@ -44,9 +46,7 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.Round
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.dana.DanaFragment
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.dana.comm.RecordTypes
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt
index 6a1cccc85d..c5e33dfc7f 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt
@@ -2,6 +2,7 @@ package info.nightscout.pump.danars.activities
 
 import android.os.Bundle
 import android.util.Base64
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
@@ -9,7 +10,6 @@ import app.aaps.interfaces.rx.events.EventPumpStatusChanged
 import app.aaps.interfaces.sharedPreferences.SP
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.hexStringToByteArray
 import info.nightscout.core.validators.DefaultEditTextValidator
 import info.nightscout.core.validators.EditTextValidator
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
index f754e2c2bb..89413274c6 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
@@ -1,10 +1,10 @@
 package info.nightscout.pump.danars.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.LTag
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.encryption.BleEncryption
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.dana.DanaPump
 import javax.inject.Inject
 
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt
index 6e1c5c2d6e..62ccebc9f9 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt
@@ -9,11 +9,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.AapsSchedulers
 import app.aaps.interfaces.rx.bus.RxBus
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.danars.activities.PairingHelperActivity
 import info.nightscout.pump.danars.databinding.DanarsPairingProgressDialogBinding
 import info.nightscout.pump.danars.events.EventDanaRSPairingSuccess
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt
index cfe1dfad54..530975c4b6 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import android.os.SystemClock
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.AAPSLogger
@@ -34,7 +35,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.dana.R
 import info.nightscout.pump.dana.comm.RecordTypes
diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt
index 484672440b..16318199a1 100644
--- a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt
+++ b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.pump.danars
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.plugin.PluginType
 import app.aaps.interfaces.pump.DetailedBolusInfoStorage
@@ -7,7 +8,6 @@ import app.aaps.interfaces.pump.PumpSync
 import app.aaps.interfaces.pump.TemporaryBasalStorage
 import app.aaps.interfaces.queue.CommandQueue
 import dagger.android.AndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.dana.database.DanaHistoryDatabase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt
index 17e61a5895..f164cb10f1 100644
--- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt
+++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt
@@ -1,10 +1,10 @@
 package info.nightscout.pump.danars.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.encryption.BleEncryption
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.danars.DanaRSTestBase
 import org.junit.jupiter.api.Assertions
diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
index 7417071393..552e4e8eba 100644
--- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
+++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.pump.danars.comm
 
+import app.aaps.core.main.constraints.ConstraintObject
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.pump.DetailedBolusInfoStorage
 import app.aaps.interfaces.pump.PumpSync
@@ -7,7 +8,6 @@ import app.aaps.interfaces.pump.TemporaryBasalStorage
 import app.aaps.interfaces.queue.CommandQueue
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.dana.database.DanaHistoryDatabase
 import info.nightscout.pump.danars.DanaRSTestBase
 import org.junit.jupiter.api.Assertions
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt
index 2d0e75bc9e..a7f2868956 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt
@@ -8,6 +8,7 @@ import android.os.HandlerThread
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.ActivePlugin
@@ -27,7 +28,6 @@ import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.diaconn.activities.DiaconnG8HistoryActivity
 import info.nightscout.pump.diaconn.activities.DiaconnG8UserOptionsActivity
 import info.nightscout.pump.diaconn.databinding.DiaconnG8FragmentBinding
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt
index 87f2b127db..62533c3d63 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt
@@ -8,6 +8,8 @@ import android.os.IBinder
 import android.text.format.DateFormat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.constraints.Constraint
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.constraints.PluginConstraints
@@ -47,9 +49,7 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.Round
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase
 import info.nightscout.pump.diaconn.events.EventDiaconnG8DeviceChange
 import info.nightscout.pump.diaconn.service.DiaconnG8Service
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt
index 58531bef91..24cfa76a8a 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt
@@ -9,6 +9,7 @@ import android.widget.ArrayAdapter
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.queue.Callback
@@ -21,7 +22,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.diaconn.R
 import info.nightscout.pump.diaconn.common.RecordTypes
 import info.nightscout.pump.diaconn.database.DiaconnHistoryRecord
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt
index d160ceb66c..2058dbd041 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.ActivePlugin
@@ -15,7 +16,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.ui.UiInteraction
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.diaconn.DiaconnG8Pump
 import info.nightscout.pump.diaconn.R
 import info.nightscout.pump.diaconn.databinding.DiaconnG8UserOptionsActivityBinding
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt
index db79125487..7ea22239f4 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import android.os.SystemClock
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -33,7 +34,6 @@ import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.diaconn.DiaconnG8Plugin
 import info.nightscout.pump.diaconn.DiaconnG8Pump
 import info.nightscout.pump.diaconn.R
diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt
index e18ad7de20..7b89f434e6 100644
--- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt
+++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.eopatch
 
 import android.os.SystemClock
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.notifications.Notification
@@ -39,7 +40,6 @@ import info.nightscout.androidaps.plugins.pump.eopatch.code.BolusExDuration
 import info.nightscout.androidaps.plugins.pump.eopatch.code.SettingKeys
 import info.nightscout.androidaps.plugins.pump.eopatch.ui.EopatchOverviewFragment
 import info.nightscout.androidaps.plugins.pump.eopatch.vo.TempBasal
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.functions.Consumer
 import io.reactivex.rxjava3.kotlin.plusAssign
diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt
index b02a2750c7..f21a25d429 100644
--- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt
+++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.eopatch.alarm
 
 import android.content.Context
 import android.content.Intent
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.notifications.Notification
@@ -29,7 +30,6 @@ import info.nightscout.androidaps.plugins.pump.eopatch.event.EventEoPatchAlarm
 import info.nightscout.androidaps.plugins.pump.eopatch.extension.takeOne
 import info.nightscout.androidaps.plugins.pump.eopatch.ui.AlarmHelperActivity
 import info.nightscout.androidaps.plugins.pump.eopatch.vo.Alarms
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.disposables.CompositeDisposable
diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index 0ea8c27e36..f11ebe6209 100644
--- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -8,6 +8,7 @@ import android.os.HandlerThread
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.plugin.ActivePlugin
@@ -40,7 +41,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPu
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.common.defs.PumpDeviceState
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
index 2ba7fd702e..29bc5f8643 100644
--- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
+++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
@@ -6,6 +6,7 @@ import android.content.ServiceConnection
 import android.os.IBinder
 import android.os.SystemClock
 import androidx.preference.Preference
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.notifications.Notification
@@ -66,7 +67,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.Companion.isSame
 import info.nightscout.core.utils.DateTimeUtil
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.common.data.PumpStatus
 import info.nightscout.pump.common.defs.PumpDriverState
 import info.nightscout.pump.common.sync.PumpDbEntryTBR
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
index 8b95c129d4..cc22262086 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
@@ -11,6 +11,8 @@ import android.text.format.DateFormat
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceFragmentCompat
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -45,10 +47,8 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import app.aaps.interfaces.utils.TimeChangeType
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.validators.ValidatingEditTextPreference
 import info.nightscout.pump.medtrum.comm.enums.MedtrumPumpState
 import info.nightscout.pump.medtrum.services.MedtrumService
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
index f2f6686bf7..4742c5e6c9 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import android.os.SystemClock
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -33,7 +34,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.medtrum.MedtrumPlugin
 import info.nightscout.pump.medtrum.MedtrumPump
 import info.nightscout.pump.medtrum.R
diff --git a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumPumpTest.kt b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumPumpTest.kt
index e903183058..83f78e41af 100644
--- a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumPumpTest.kt
+++ b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/MedtrumPumpTest.kt
@@ -1,12 +1,12 @@
 package info.nightscout.pump.medtrum
 
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.pump.DetailedBolusInfo
 import app.aaps.interfaces.pump.PumpSync
 import app.aaps.interfaces.pump.defs.PumpType
 import app.aaps.interfaces.rx.events.EventOverviewBolusProgress
 import app.aaps.interfaces.utils.T
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.pump.medtrum.comm.enums.BasalType
 import info.nightscout.pump.medtrum.util.MedtrumSnUtil
 import org.json.JSONObject
diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index 7a2531f710..f998748c9c 100644
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash
 import android.os.Handler
 import android.os.HandlerThread
 import android.text.format.DateFormat
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.notifications.Notification
@@ -73,7 +74,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.OmnipodDashOvervi
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.Constants
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram
 import info.nightscout.core.utils.DateTimeUtil
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.disposables.CompositeDisposable
diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
index ff150b2e33..20536b03c0 100644
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.queue.Callback
 import app.aaps.interfaces.queue.CommandQueue
@@ -21,7 +22,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index f845dfaffe..2b0c17046f 100644
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -8,6 +8,7 @@ import android.os.SystemClock
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.notifications.Notification
@@ -42,7 +43,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
 import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.apache.commons.lang3.StringUtils
diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
index a0d74fd3a1..07d8f06b38 100644
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action
 
 import androidx.annotation.StringRes
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.notifications.Notification
@@ -26,7 +27,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.Resolve
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.Constants
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.I8n
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.kotlin.subscribeBy
diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
index 11d453edfd..dd4d177d6a 100644
--- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
+++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
@@ -30,6 +30,7 @@ import java.util.function.Supplier;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import app.aaps.core.main.utils.fabric.FabricPrivacy;
 import app.aaps.interfaces.logging.AAPSLogger;
 import app.aaps.interfaces.logging.LTag;
 import app.aaps.interfaces.notifications.Notification;
@@ -109,7 +110,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodErosOvervi
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil;
 import info.nightscout.core.utils.DateTimeUtil;
-import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.pump.common.defs.TempBasalPair;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
index 4f790c148e..b6063e59fd 100644
--- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
+++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.HandlerThread
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.queue.Callback
@@ -34,7 +35,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.ErosPodDeactivationWizardActivity
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
index fd74b90735..b7010a8634 100644
--- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
+++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
@@ -8,6 +8,7 @@ import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.notifications.Notification
 import app.aaps.interfaces.plugin.ActivePlugin
@@ -49,7 +50,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.Comman
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import org.apache.commons.lang3.StringUtils
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt
index 0a7eba89ac..6bfd0fd002 100644
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt
+++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.text.format.DateFormat
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.constraints.PluginConstraints
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -32,7 +33,6 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.common.data.PumpStatus
 import info.nightscout.pump.common.defs.PumpDriverState
 import info.nightscout.pump.common.sync.PumpDbEntryCarbs
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt
index 73e51ad17a..30acbfc4ad 100644
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt
+++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ble/BondStateReceiver.kt
@@ -29,7 +29,6 @@ class BondStateReceiver(
     @Inject lateinit var rxBus: RxBus
 
     var gson = Gson()
-    var applicationContext: Context? = null
 
     override fun onReceive(context: Context, intent: Intent) {
         super.onReceive(context, intent)
diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt
index 060a945373..77434113a3 100644
--- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt
+++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt
@@ -6,6 +6,8 @@ import android.os.HandlerThread
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.extensions.toStringFull
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.pump.defs.DoseStepSize
@@ -20,8 +22,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.extensions.toStringFull
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.pump.virtual.databinding.VirtualPumpFragmentBinding
 import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui
 import io.reactivex.rxjava3.disposables.CompositeDisposable
diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt
index 4406bd2a34..0c5d184486 100644
--- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt
+++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt
@@ -3,6 +3,10 @@ package info.nightscout.pump.virtual
 import android.os.SystemClock
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
+import app.aaps.core.main.events.EventNewNotification
+import app.aaps.core.main.extensions.convertedToAbsolute
+import app.aaps.core.main.extensions.plannedRemainingMinutes
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.db.PersistenceLayer
 import app.aaps.interfaces.iob.IobCobCalculator
@@ -35,10 +39,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import app.aaps.interfaces.utils.TimeChangeType
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.events.EventNewNotification
-import info.nightscout.core.extensions.convertedToAbsolute
-import info.nightscout.core.extensions.plannedRemainingMinutes
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.fabric.InstanceId
 import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui
 import info.nightscout.pump.virtual.extensions.toText
@@ -71,7 +71,7 @@ open class VirtualPumpPlugin @Inject constructor(
     PluginDescription()
         .mainType(PluginType.PUMP)
         .fragmentClass(VirtualPumpFragment::class.java.name)
-        .pluginIcon(info.nightscout.core.main.R.drawable.ic_virtual_pump)
+        .pluginIcon(app.aaps.core.main.R.drawable.ic_virtual_pump)
         .pluginName(info.nightscout.core.ui.R.string.virtual_pump)
         .shortName(R.string.virtual_pump_shortname)
         .preferencesId(R.xml.pref_virtual_pump)
diff --git a/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt b/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt
index e3003994ee..9586fb10bc 100644
--- a/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt
+++ b/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.pump.virtual
 
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.db.PersistenceLayer
 import app.aaps.interfaces.iob.IobCobCalculator
@@ -13,7 +14,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.shared.tests.TestBase
 import dagger.android.AndroidInjector
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt
index e26fc3721c..56ce97de9a 100644
--- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt
+++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt
@@ -1,6 +1,9 @@
 package app.aaps.shared.tests
 
 import android.content.Context
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.iob.IobCobCalculator
@@ -16,9 +19,6 @@ import app.aaps.interfaces.utils.HardLimits
 import app.aaps.shared.impl.utils.DateUtilImpl
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.profile.ProfileSealed
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.entities.embedments.InsulinConfiguration
 import info.nightscout.implementation.profile.ProfileStoreObject
diff --git a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
index 778415aa40..705b91f486 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
@@ -6,6 +6,8 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.widget.ArrayAdapter
 import android.widget.TextView
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.profile.ProfileFunction
@@ -20,11 +22,9 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import com.google.android.material.tabs.TabLayout
 import com.google.common.collect.Lists
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.ui.R
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 d35ef77d6b..1a180a948d 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt
@@ -16,6 +16,10 @@ import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.wizard.QuickWizard
+import app.aaps.core.main.wizard.QuickWizardEntry
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.AapsSchedulers
@@ -27,10 +31,6 @@ import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.dragHelpers.ItemTouchHelperAdapter
 import info.nightscout.core.ui.dragHelpers.OnStartDragListener
 import info.nightscout.core.ui.dragHelpers.SimpleItemTouchHelperCallback
-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.ui.R
 import info.nightscout.ui.databinding.ActivityQuickwizardListBinding
 import info.nightscout.ui.databinding.QuickwizardListItemBinding
@@ -74,15 +74,15 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag
             holder.binding.from.text = dateUtil.timeString(entry.validFromDate())
             holder.binding.to.text = dateUtil.timeString(entry.validToDate())
             holder.binding.buttonText.text = entry.buttonText()
-            holder.binding.carbs.text = rh.gs(info.nightscout.core.main.R.string.format_carbs, entry.carbs())
+            holder.binding.carbs.text = rh.gs(app.aaps.core.main.R.string.format_carbs, entry.carbs())
             if (entry.device() == QuickWizardEntry.DEVICE_ALL) {
                 holder.binding.device.visibility = View.GONE
             } else {
                 holder.binding.device.visibility = View.VISIBLE
                 holder.binding.device.setImageResource(
                     when (quickWizard[position].device()) {
-                        QuickWizardEntry.DEVICE_WATCH -> info.nightscout.core.main.R.drawable.ic_watch
-                        else                          -> info.nightscout.core.main.R.drawable.ic_smartphone
+                        QuickWizardEntry.DEVICE_WATCH -> app.aaps.core.main.R.drawable.ic_watch
+                        else                          -> app.aaps.core.main.R.drawable.ic_smartphone
                     }
                 )
                 holder.binding.device.contentDescription = when (quickWizard[position].device()) {
@@ -156,7 +156,7 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag
         }
         addMenuProvider(object : MenuProvider {
             override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-                menuInflater.inflate(info.nightscout.core.main.R.menu.menu_actions, menu)
+                menuInflater.inflate(app.aaps.core.main.R.menu.menu_actions, menu)
             }
 
             override fun onMenuItemSelected(menuItem: MenuItem): Boolean =
@@ -194,7 +194,7 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag
     private fun getConfirmationText(selectedItems: SparseArray<QuickWizardEntry>): String {
         if (selectedItems.size() == 1) {
             val entry = selectedItems.valueAt(0)
-            return "${rh.gs(info.nightscout.core.ui.R.string.remove_button)} ${entry.buttonText()} ${rh.gs(info.nightscout.core.main.R.string.format_carbs, entry.carbs())}\n" +
+            return "${rh.gs(info.nightscout.core.ui.R.string.remove_button)} ${entry.buttonText()} ${rh.gs(app.aaps.core.main.R.string.format_carbs, entry.carbs())}\n" +
                 "${dateUtil.timeString(entry.validFromDate())} - ${dateUtil.timeString(entry.validToDate())}"
         }
         return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size())
diff --git a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt
index c6f90dfb6b..80d3ef1fea 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.HandlerThread
 import android.widget.TextView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.UserEntryLogger
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.AapsSchedulers
@@ -13,7 +14,6 @@ import app.aaps.interfaces.stats.TddCalculator
 import app.aaps.interfaces.stats.TirCalculator
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.ui.dialogs.OKDialog
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.impl.AppRepository
diff --git a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt
index f4a94fc965..dffc740ba1 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt
@@ -14,6 +14,7 @@ import android.widget.EditText
 import android.widget.TableLayout
 import android.widget.TableRow
 import android.widget.TextView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.profile.ProfileFunction
@@ -29,7 +30,6 @@ import app.aaps.interfaces.sharedPreferences.SP
 import app.aaps.interfaces.utils.SafeParse
 import app.aaps.interfaces.utils.T
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.TotalDailyDose
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.ui.databinding.ActivityTddStatsBinding
diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt
index 2be8a0be92..68d26e8534 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt
@@ -15,6 +15,9 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.extensions.iobCalc
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
@@ -31,11 +34,8 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import com.google.gson.Gson
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.extensions.iobCalc
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.ActionModeHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.Carbs
@@ -266,7 +266,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider {
             holder.binding.carbsLayout.visibility = (ml.carbs != null && (ml.carbs.isValid || showInvalidated)).toVisibility()
             ml.carbs?.let { carbs ->
                 holder.binding.carbsTime.text = dateUtil.timeString(carbs.timestamp)
-                holder.binding.carbs.text = rh.gs(info.nightscout.core.main.R.string.format_carbs, carbs.amount.toInt())
+                holder.binding.carbs.text = rh.gs(app.aaps.core.main.R.string.format_carbs, carbs.amount.toInt())
                 holder.binding.carbsDuration.text = if (carbs.duration > 0) rh.gs(info.nightscout.core.ui.R.string.format_mins, T.msecs(carbs.duration).mins().toInt()) else ""
                 holder.binding.carbsNs.visibility = (carbs.interfaceIDs.nightscoutId != null).toVisibility()
                 holder.binding.carbsPump.visibility = carbs.interfaceIDs.isPumpHistory().toVisibility()
@@ -419,7 +419,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider {
                     rh.gs(info.nightscout.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(bolus.timestamp)
             val carbs = mealLink.carbs
             if (carbs != null)
-                return rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbs.amount.toInt()) + "\n" +
+                return rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(app.aaps.core.main.R.string.format_carbs, carbs.amount.toInt()) + "\n" +
                     rh.gs(info.nightscout.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(carbs.timestamp)
         }
         return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size())
diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt
index 38e7a5599b..de5add1cf1 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt
@@ -13,6 +13,8 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
@@ -29,8 +31,6 @@ import app.aaps.interfaces.utils.Translator
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.ActionModeHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt
index 029dfc3b90..e562f95fc3 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt
@@ -14,6 +14,10 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.extensions.iobCalc
+import app.aaps.core.main.extensions.isInProgress
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.logging.LTag
@@ -27,12 +31,8 @@ import app.aaps.interfaces.rx.events.EventExtendedBolusChange
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.extensions.iobCalc
-import info.nightscout.core.extensions.isInProgress
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.ActionModeHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt
index 5cc9b14b2c..db0f9d8507 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt
@@ -15,6 +15,10 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.extensions.getCustomizedName
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
@@ -33,12 +37,8 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.extensions.getCustomizedName
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.ActionModeHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt
index c0d9a05da1..20c7c50d21 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt
@@ -14,6 +14,11 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.extensions.friendlyDescription
+import app.aaps.core.main.extensions.highValueToUnitsToString
+import app.aaps.core.main.extensions.lowValueToUnitsToString
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.AAPSLogger
@@ -30,13 +35,8 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import app.aaps.interfaces.utils.Translator
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.extensions.friendlyDescription
-import info.nightscout.core.extensions.highValueToUnitsToString
-import info.nightscout.core.extensions.lowValueToUnitsToString
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.ActionModeHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry.Action
diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
index adda3c9b08..567dda7cc8 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
@@ -14,6 +14,11 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.extensions.iobCalc
+import app.aaps.core.main.extensions.toStringFull
+import app.aaps.core.main.extensions.toTemporaryBasal
+import app.aaps.core.main.utils.ActionModeHelper
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.iob.IobTotal
 import app.aaps.interfaces.logging.AAPSLogger
@@ -29,13 +34,8 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import dagger.android.support.DaggerFragment
-import info.nightscout.core.extensions.iobCalc
-import info.nightscout.core.extensions.toStringFull
-import info.nightscout.core.extensions.toTemporaryBasal
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.ActionModeHelper
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.TemporaryBasal
diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt
index 4d01ca2c30..13eb8b8d2b 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt
@@ -11,6 +11,7 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.logging.UserEntryLogger
 import app.aaps.interfaces.maintenance.ImportExportPrefs
@@ -25,7 +26,6 @@ import app.aaps.interfaces.utils.T
 import dagger.android.support.DaggerFragment
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
diff --git a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt
index 48458dfbf6..664094b782 100644
--- a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt
+++ b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt
@@ -1,11 +1,11 @@
 package info.nightscout.ui.defaultProfile
 
+import app.aaps.core.main.extensions.pureProfileFromJson
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.profile.ProfileUtil
 import app.aaps.interfaces.profile.PureProfile
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.Round
-import info.nightscout.core.extensions.pureProfileFromJson
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.Locale
diff --git a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt
index bf4d5d708b..4bd1a7c244 100644
--- a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt
+++ b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt
@@ -1,11 +1,11 @@
 package info.nightscout.ui.defaultProfile
 
+import app.aaps.core.main.extensions.pureProfileFromJson
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.profile.ProfileUtil
 import app.aaps.interfaces.profile.PureProfile
 import app.aaps.interfaces.utils.DateUtil
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.pureProfileFromJson
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.Locale
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
index 3b44f489f0..715ed5bdf1 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
@@ -7,6 +7,8 @@ import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.extensions.formatColor
 import app.aaps.interfaces.automation.Automation
 import app.aaps.interfaces.configuration.Constants.CARBS_FAV1_DEFAULT
 import app.aaps.interfaces.configuration.Constants.CARBS_FAV2_DEFAULT
@@ -30,11 +32,9 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
@@ -284,7 +284,7 @@ class CarbsDialog : DialogFragmentWithDate() {
                 rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "<font color='" + rh.gac(
                     context,
                     info.nightscout.core.ui.R.attr.carbsColor
-                ) + "'>" + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraints) + "</font>"
+                ) + "'>" + rh.gs(app.aaps.core.main.R.string.format_carbs, carbsAfterConstraints) + "</font>"
             )
             if (carbsAfterConstraints != carbs)
                 actions.add("<font color='" + rh.gac(context, info.nightscout.core.ui.R.attr.warningColor) + "'>" + rh.gs(R.string.carbs_constraint_applied) + "</font>")
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
index 0a20fbac11..41ccdb522b 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.StringRes
+import app.aaps.core.main.extensions.fromConstant
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.iob.GlucoseStatusProvider
@@ -21,7 +22,6 @@ import app.aaps.interfaces.utils.T
 import app.aaps.interfaces.utils.Translator
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.fromConstant
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.database.entities.TherapyEvent
@@ -90,13 +90,13 @@ class CareDialog : DialogFragmentWithDate() {
 
         binding.icon.setImageResource(
             when (options) {
-                UiInteraction.EventType.BGCHECK        -> info.nightscout.core.main.R.drawable.ic_cp_bgcheck
-                UiInteraction.EventType.SENSOR_INSERT  -> info.nightscout.core.main.R.drawable.ic_cp_cgm_insert
-                UiInteraction.EventType.BATTERY_CHANGE -> info.nightscout.core.main.R.drawable.ic_cp_pump_battery
-                UiInteraction.EventType.NOTE           -> info.nightscout.core.main.R.drawable.ic_cp_note
-                UiInteraction.EventType.EXERCISE       -> info.nightscout.core.main.R.drawable.ic_cp_exercise
-                UiInteraction.EventType.QUESTION       -> info.nightscout.core.main.R.drawable.ic_cp_question
-                UiInteraction.EventType.ANNOUNCEMENT   -> info.nightscout.core.main.R.drawable.ic_cp_announcement
+                UiInteraction.EventType.BGCHECK        -> app.aaps.core.main.R.drawable.ic_cp_bgcheck
+                UiInteraction.EventType.SENSOR_INSERT  -> app.aaps.core.main.R.drawable.ic_cp_cgm_insert
+                UiInteraction.EventType.BATTERY_CHANGE -> app.aaps.core.main.R.drawable.ic_cp_pump_battery
+                UiInteraction.EventType.NOTE           -> app.aaps.core.main.R.drawable.ic_cp_note
+                UiInteraction.EventType.EXERCISE       -> app.aaps.core.main.R.drawable.ic_cp_exercise
+                UiInteraction.EventType.QUESTION       -> app.aaps.core.main.R.drawable.ic_cp_question
+                UiInteraction.EventType.ANNOUNCEMENT   -> app.aaps.core.main.R.drawable.ic_cp_announcement
             }
         )
         binding.title.text = rh.gs(
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt
index f32d6064f3..93674a8f2f 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt
@@ -7,6 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
+import app.aaps.core.main.wizard.QuickWizard
+import app.aaps.core.main.wizard.QuickWizardEntry
 import app.aaps.interfaces.logging.AAPSLogger
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.sharedPreferences.SP
@@ -19,8 +21,6 @@ import dagger.android.support.DaggerDialogFragment
 import info.nightscout.core.ui.extensions.selectedItemPosition
 import info.nightscout.core.ui.extensions.setEnableForChildren
 import info.nightscout.core.ui.extensions.setSelection
-import info.nightscout.core.wizard.QuickWizard
-import info.nightscout.core.wizard.QuickWizardEntry
 import info.nightscout.ui.R
 import info.nightscout.ui.databinding.DialogEditQuickwizardBinding
 import info.nightscout.ui.events.EventQuickWizardChange
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt
index b2784dd6b0..c59fba09e8 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.extensions.formatColor
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.logging.UserEntryLogger
@@ -17,11 +19,9 @@ import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.SafeParse
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.ui.R
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt
index 89293702b9..7bdf0b4ceb 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.extensions.formatColor
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.logging.UserEntryLogger
@@ -19,11 +21,9 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.SafeParse
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt
index 96b618059c..d887042ec5 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt
@@ -7,6 +7,8 @@ import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.extensions.formatColor
 import app.aaps.interfaces.automation.Automation
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants.INSULIN_PLUS1_DEFAULT
@@ -33,11 +35,9 @@ import app.aaps.interfaces.utils.SafeParse
 import app.aaps.interfaces.utils.T
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt
index 7f266eeb6c..846e86b71c 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt
@@ -10,6 +10,8 @@ import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
 import androidx.fragment.app.FragmentManager
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.fabric.FabricPrivacy
 import app.aaps.interfaces.aps.ApsMode
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.ConfigBuilder
@@ -38,10 +40,8 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt
index bb850fdb3d..639c827345 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.extensions.toVisibility
@@ -23,7 +24,6 @@ import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.utils.HardLimits
 import app.aaps.interfaces.utils.T
 import com.google.common.base.Joiner
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt
index aa65f968d6..e2f8ce7aba 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt
@@ -7,6 +7,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
+import app.aaps.core.main.R
+import app.aaps.core.main.extensions.getCustomizedName
+import app.aaps.core.main.extensions.pureProfileFromJson
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.extensions.toVisibility
 import app.aaps.interfaces.plugin.ActivePlugin
@@ -21,10 +25,6 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.HardLimits
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.core.extensions.getCustomizedName
-import info.nightscout.core.extensions.pureProfileFromJson
-import info.nightscout.core.main.R
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt
index fa03b00488..073cda80f7 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.extensions.formatColor
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.logging.LTag
 import app.aaps.interfaces.logging.UserEntryLogger
@@ -20,11 +22,9 @@ import app.aaps.interfaces.ui.UiInteraction
 import app.aaps.interfaces.utils.SafeParse
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.ui.R
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt
index e321df5449..cccf967171 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt
@@ -7,6 +7,8 @@ import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.utils.extensions.formatColor
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.db.PersistenceLayer
@@ -23,11 +25,9 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.SafeParse
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.impl.AppRepository
@@ -158,7 +158,7 @@ class TreatmentDialog : DialogFragmentWithDate() {
         }
         if (carbsAfterConstraints > 0) {
             actions.add(
-                rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraints).formatColor(
+                rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(app.aaps.core.main.R.string.format_carbs, carbsAfterConstraints).formatColor(
                     context, rh, info.nightscout
                         .core.ui.R.attr.carbsColor
                 )
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
index d0b2a1eb7e..d42624acaa 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
@@ -16,6 +16,13 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.CompoundButton
 import androidx.fragment.app.FragmentManager
+import app.aaps.core.main.constraints.ConstraintObject
+import app.aaps.core.main.extensions.valueToUnits
+import app.aaps.core.main.iob.round
+import app.aaps.core.main.profile.ProfileSealed
+import app.aaps.core.main.utils.extensions.formatColor
+import app.aaps.core.main.utils.fabric.FabricPrivacy
+import app.aaps.core.main.wizard.BolusWizard
 import app.aaps.interfaces.configuration.Constants
 import app.aaps.interfaces.constraints.ConstraintsChecker
 import app.aaps.interfaces.db.GlucoseUnit
@@ -41,15 +48,8 @@ import app.aaps.interfaces.utils.SafeParse
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.core.constraints.ConstraintObject
-import info.nightscout.core.extensions.valueToUnits
-import info.nightscout.core.iob.round
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
-import info.nightscout.core.utils.extensions.formatColor
-import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.core.wizard.BolusWizard
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.ui.R
@@ -518,7 +518,7 @@ class WizardDialog : DaggerDialogFragment() {
                 val insulinText =
                     if (wizard.calculatedTotalInsulin > 0.0) rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.calculatedTotalInsulin)
                         .formatColor(context, rh, info.nightscout.core.ui.R.attr.bolusColor) else ""
-                val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraint).formatColor(
+                val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(app.aaps.core.main.R.string.format_carbs, carbsAfterConstraint).formatColor(
                     context, rh, info.nightscout.core.ui.R.attr
                         .carbsColor
                 ) else ""
diff --git a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt
index 62e0bd3126..0d9f4928a8 100644
--- a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt
+++ b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt
@@ -12,6 +12,10 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.view.View
 import android.widget.RemoteViews
+import app.aaps.core.main.extensions.directionToIcon
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.iob.displayText
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.aps.VariableSensitivityResult
 import app.aaps.interfaces.configuration.Config
@@ -33,10 +37,6 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.TrendCalculator
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.extensions.directionToIcon
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.iob.displayText
-import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.database.entities.interfaces.end
 import info.nightscout.ui.R
 import java.util.Locale
@@ -260,9 +260,9 @@ class Widget : AppWidgetProvider() {
 
     private fun updateSensitivity(views: RemoteViews) {
         if (constraintChecker.isAutosensModeEnabled().value())
-            views.setImageViewResource(R.id.sensitivity_icon, info.nightscout.core.main.R.drawable.ic_swap_vert_black_48dp_green)
+            views.setImageViewResource(R.id.sensitivity_icon, app.aaps.core.main.R.drawable.ic_swap_vert_black_48dp_green)
         else
-            views.setImageViewResource(R.id.sensitivity_icon, info.nightscout.core.main.R.drawable.ic_x_swap_vert)
+            views.setImageViewResource(R.id.sensitivity_icon, app.aaps.core.main.R.drawable.ic_x_swap_vert)
         views.setTextViewText(R.id.sensitivity, overviewData.lastAutosensData(iobCobCalculator)?.let { autosensData ->
             String.format(Locale.ENGLISH, "%.0f%%", autosensData.autosensResult.ratio * 100)
         } ?: "")
diff --git a/ui/src/main/res/layout/dialog_profileviewer.xml b/ui/src/main/res/layout/dialog_profileviewer.xml
index 5a25dcf435..84cda878e3 100644
--- a/ui/src/main/res/layout/dialog_profileviewer.xml
+++ b/ui/src/main/res/layout/dialog_profileviewer.xml
@@ -249,7 +249,7 @@
 
         </LinearLayout>
 
-        <info.nightscout.core.graph.IcProfileGraph
+        <app.aaps.core.main.graph.IcProfileGraph
             android:id="@+id/ic_graph"
             android:layout_width="match_parent"
             android:layout_height="100dip"
@@ -301,7 +301,7 @@
 
         </LinearLayout>
 
-        <info.nightscout.core.graph.IsfProfileGraph
+        <app.aaps.core.main.graph.IsfProfileGraph
             android:id="@+id/isf_graph"
             android:layout_width="match_parent"
             android:layout_height="100dip"
@@ -388,7 +388,7 @@
 
         </LinearLayout>
 
-        <info.nightscout.core.graph.BasalProfileGraph
+        <app.aaps.core.main.graph.BasalProfileGraph
             android:id="@+id/basal_graph"
             android:layout_width="match_parent"
             android:layout_height="100dip"
@@ -440,7 +440,7 @@
 
         </LinearLayout>
 
-        <info.nightscout.core.graph.TargetBgProfileGraph
+        <app.aaps.core.main.graph.TargetBgProfileGraph
             android:id="@+id/target_graph"
             android:layout_width="match_parent"
             android:layout_height="100dip"
diff --git a/ui/src/test/java/info/nightscout/ui/defaultProfile/DefaultProfileTest.kt b/ui/src/test/java/info/nightscout/ui/defaultProfile/DefaultProfileTest.kt
index f77b8b1e4a..0317d01fb3 100644
--- a/ui/src/test/java/info/nightscout/ui/defaultProfile/DefaultProfileTest.kt
+++ b/ui/src/test/java/info/nightscout/ui/defaultProfile/DefaultProfileTest.kt
@@ -1,9 +1,9 @@
 package info.nightscout.ui.defaultProfile
 
+import app.aaps.core.main.profile.ProfileSealed
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.shared.tests.TestBaseWithProfile
 import com.google.common.truth.Truth.assertThat
-import info.nightscout.core.profile.ProfileSealed
 import org.junit.jupiter.api.Test
 
 class DefaultProfileTest : TestBaseWithProfile() {
diff --git a/workflow/src/main/java/info/nightscout/workflow/DummyWorker.kt b/workflow/src/main/java/info/nightscout/workflow/DummyWorker.kt
index 6eef9becdb..d959f48028 100644
--- a/workflow/src/main/java/info/nightscout/workflow/DummyWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/DummyWorker.kt
@@ -2,7 +2,7 @@ package info.nightscout.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
-import info.nightscout.core.utils.worker.LoggingWorker
+import app.aaps.core.main.utils.worker.LoggingWorker
 import kotlinx.coroutines.Dispatchers
 
 class DummyWorker(
diff --git a/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt b/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt
index 41374dc8be..a3e78fce1d 100644
--- a/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt
@@ -3,12 +3,12 @@ package info.nightscout.workflow
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.rx.events.Event
 import app.aaps.interfaces.rx.events.EventNewBG
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 
diff --git a/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt
index f91047a8d9..9a45f5c0d5 100644
--- a/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt
@@ -3,6 +3,7 @@ package info.nightscout.workflow
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.aps.AutosensDataStore
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.logging.AAPSLogger
@@ -13,7 +14,6 @@ import app.aaps.interfaces.rx.events.EventBucketedDataCreated
 import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.T
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt
index 2aafe0bfae..bca837fae0 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt
@@ -5,17 +5,17 @@ import android.graphics.DashPathEffect
 import android.graphics.Paint
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.ScaledDataPoint
+import app.aaps.core.main.utils.worker.LoggingWorker
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.bus.RxBus
 import com.jjoe64.graphview.series.LineGraphSeries
-import info.nightscout.core.events.EventIobCalculationProgress
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.graph.data.ScaledDataPoint
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.workflow.CalculationWorkflow
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt
index 93d3cfbfd9..6a1cdbdf44 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt
@@ -3,18 +3,18 @@ package info.nightscout.workflow
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.DataPointWithLabelInterface
+import app.aaps.core.main.graph.data.GlucoseValueDataPoint
+import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.profile.DefaultValueHelper
 import app.aaps.interfaces.profile.ProfileUtil
 import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.utils.Round
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.graph.data.DataPointWithLabelInterface
-import info.nightscout.core.graph.data.GlucoseValueDataPoint
-import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt
index 4cbac073e7..5ce5936534 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt
@@ -3,16 +3,16 @@ package info.nightscout.workflow
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.DataPointWithLabelInterface
+import app.aaps.core.main.graph.data.InMemoryGlucoseValueDataPoint
+import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.iob.IobCobCalculator
 import app.aaps.interfaces.profile.DefaultValueHelper
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.resources.ResourceHelper
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.graph.data.DataPointWithLabelInterface
-import info.nightscout.core.graph.data.InMemoryGlucoseValueDataPoint
-import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt
index 3095362180..6e495604a0 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt
@@ -5,6 +5,18 @@ import android.graphics.DashPathEffect
 import android.graphics.Paint
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.DataPointWithLabelInterface
+import app.aaps.core.main.graph.data.DeviationDataPoint
+import app.aaps.core.main.graph.data.FixedLineGraphSeries
+import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
+import app.aaps.core.main.graph.data.Scale
+import app.aaps.core.main.graph.data.ScaledDataPoint
+import app.aaps.core.main.iob.combine
+import app.aaps.core.main.iob.copy
+import app.aaps.core.main.utils.worker.LoggingWorker
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.aps.AutosensData
 import app.aaps.interfaces.aps.AutosensResult
 import app.aaps.interfaces.aps.SMBDefaults
@@ -19,19 +31,7 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import com.jjoe64.graphview.series.BarGraphSeries
 import com.jjoe64.graphview.series.LineGraphSeries
-import info.nightscout.core.events.EventIobCalculationProgress
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.graph.data.DataPointWithLabelInterface
-import info.nightscout.core.graph.data.DeviationDataPoint
-import info.nightscout.core.graph.data.FixedLineGraphSeries
-import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
-import info.nightscout.core.graph.data.Scale
-import info.nightscout.core.graph.data.ScaledDataPoint
-import info.nightscout.core.iob.combine
-import info.nightscout.core.iob.copy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
diff --git a/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt
index 804dd60924..88443ed2e1 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt
@@ -3,6 +3,11 @@ package info.nightscout.workflow
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.DataPointWithLabelInterface
+import app.aaps.core.main.graph.data.GlucoseValueDataPoint
+import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.configuration.Config
 import app.aaps.interfaces.nsclient.ProcessedDeviceStatusData
@@ -12,12 +17,7 @@ import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.graph.data.DataPointWithLabelInterface
-import info.nightscout.core.graph.data.GlucoseValueDataPoint
-import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
 import java.util.Calendar
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt
index da5518bb5a..a7c1377cdd 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt
@@ -3,6 +3,11 @@ package info.nightscout.workflow
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.extensions.target
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.utils.worker.LoggingWorker
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.aps.Loop
 import app.aaps.interfaces.profile.ProfileFunction
 import app.aaps.interfaces.profile.ProfileUtil
@@ -10,12 +15,7 @@ import app.aaps.interfaces.resources.ResourceHelper
 import app.aaps.interfaces.rx.bus.RxBus
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
-import info.nightscout.core.events.EventIobCalculationProgress
-import info.nightscout.core.extensions.target
-import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt
index 8e4c76a3ea..e89995832b 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt
@@ -3,6 +3,18 @@ package info.nightscout.workflow
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.graph.OverviewData
+import app.aaps.core.main.graph.data.BolusDataPoint
+import app.aaps.core.main.graph.data.CarbsDataPoint
+import app.aaps.core.main.graph.data.DataPointWithLabelInterface
+import app.aaps.core.main.graph.data.EffectiveProfileSwitchDataPoint
+import app.aaps.core.main.graph.data.ExtendedBolusDataPoint
+import app.aaps.core.main.graph.data.HeartRateDataPoint
+import app.aaps.core.main.graph.data.PointsWithLabelGraphSeries
+import app.aaps.core.main.graph.data.TherapyEventDataPoint
+import app.aaps.core.main.utils.worker.LoggingWorker
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.db.GlucoseUnit
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.profile.DefaultValueHelper
@@ -13,19 +25,7 @@ import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.Round
 import app.aaps.interfaces.utils.T
 import app.aaps.interfaces.utils.Translator
-import info.nightscout.core.events.EventIobCalculationProgress
-import info.nightscout.core.graph.OverviewData
-import info.nightscout.core.graph.data.BolusDataPoint
-import info.nightscout.core.graph.data.CarbsDataPoint
-import info.nightscout.core.graph.data.DataPointWithLabelInterface
-import info.nightscout.core.graph.data.EffectiveProfileSwitchDataPoint
-import info.nightscout.core.graph.data.ExtendedBolusDataPoint
-import info.nightscout.core.graph.data.HeartRateDataPoint
-import info.nightscout.core.graph.data.PointsWithLabelGraphSeries
-import info.nightscout.core.graph.data.TherapyEventDataPoint
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.impl.AppRepository
diff --git a/workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt b/workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt
index 2a22cbf464..786c4619e3 100644
--- a/workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt
@@ -2,12 +2,12 @@ package info.nightscout.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.utils.worker.LoggingWorker
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventUpdateOverviewGraph
-import info.nightscout.core.events.EventIobCalculationProgress
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.workflow.CalculationWorkflow
 import kotlinx.coroutines.Dispatchers
 import java.security.spec.InvalidParameterSpecException
 import javax.inject.Inject
diff --git a/workflow/src/main/java/info/nightscout/workflow/UpdateIobCobSensWorker.kt b/workflow/src/main/java/info/nightscout/workflow/UpdateIobCobSensWorker.kt
index efe7f572be..3b13cb993e 100644
--- a/workflow/src/main/java/info/nightscout/workflow/UpdateIobCobSensWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/UpdateIobCobSensWorker.kt
@@ -2,11 +2,11 @@ package info.nightscout.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.plugin.ActivePlugin
 import app.aaps.interfaces.rx.bus.RxBus
 import app.aaps.interfaces.rx.events.EventUpdateOverviewIobCob
 import app.aaps.interfaces.rx.events.EventUpdateOverviewSensitivity
-import info.nightscout.core.utils.worker.LoggingWorker
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 
diff --git a/workflow/src/main/java/info/nightscout/workflow/UpdateWidgetWorker.kt b/workflow/src/main/java/info/nightscout/workflow/UpdateWidgetWorker.kt
index 7bd6798bd4..d97cba0edf 100644
--- a/workflow/src/main/java/info/nightscout/workflow/UpdateWidgetWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/UpdateWidgetWorker.kt
@@ -2,8 +2,8 @@ package info.nightscout.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
+import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.interfaces.ui.UiInteraction
-import info.nightscout.core.utils.worker.LoggingWorker
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 
diff --git a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt b/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt
index 710976c1ad..5e9bc88d78 100644
--- a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt
@@ -4,6 +4,10 @@ import android.content.Context
 import android.os.SystemClock
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.extensions.target
+import app.aaps.core.main.utils.worker.LoggingWorker
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.aps.AutosensData
 import app.aaps.interfaces.aps.SMBDefaults
 import app.aaps.interfaces.configuration.Config
@@ -23,11 +27,7 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.events.EventIobCalculationProgress
-import info.nightscout.core.extensions.target
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
diff --git a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt b/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt
index d5724314d8..962400419a 100644
--- a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt
+++ b/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt
@@ -4,6 +4,9 @@ import android.content.Context
 import android.os.SystemClock
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.utils.worker.LoggingWorker
+import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.interfaces.aps.AutosensData
 import app.aaps.interfaces.aps.SMBDefaults
 import app.aaps.interfaces.configuration.Config
@@ -23,10 +26,7 @@ import app.aaps.interfaces.utils.DateUtil
 import app.aaps.interfaces.utils.DecimalFormatter
 import app.aaps.interfaces.utils.T
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.events.EventIobCalculationProgress
 import info.nightscout.core.utils.receivers.DataWorkerStorage
-import info.nightscout.core.utils.worker.LoggingWorker
-import info.nightscout.core.workflow.CalculationWorkflow
 import info.nightscout.database.impl.AppRepository
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject