diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e063fd25dc..104cad7dd3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -135,7 +135,7 @@
         </provider>
 
         <service
-            android:name=".services.AlarmSoundService"
+            android:name="info.nightscout.core.services.AlarmSoundService"
             android:enabled="true"
             android:exported="true" />
         <service android:name=".plugins.general.persistentNotification.DummyService" />
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index b383dc27fc..58d28ab7df 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.receivers.BTReceiver
 import info.nightscout.androidaps.receivers.ChargingStateReceiver
 import info.nightscout.androidaps.receivers.KeepAliveWorker
 import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver
-import info.nightscout.androidaps.services.AlarmSoundServiceHelper
+import info.nightscout.core.services.AlarmSoundServiceHelper
 import info.nightscout.implementation.lifecycle.ProcessLifecycleListener
 import info.nightscout.core.ui.locale.LocaleHelper
 import info.nightscout.implementation.receivers.NetworkChangeReceiver
diff --git a/app/src/main/java/info/nightscout/androidaps/di/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/di/ServicesModule.kt
index 0ad46c2538..79477d374b 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/ServicesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/ServicesModule.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
-import info.nightscout.androidaps.services.AlarmSoundService
+import info.nightscout.core.services.AlarmSoundService
 import info.nightscout.automation.services.LocationService
 
 @Module
diff --git a/app/src/main/java/info/nightscout/androidaps/implementations/ActivityNamesImpl.kt b/app/src/main/java/info/nightscout/androidaps/implementations/ActivityNamesImpl.kt
index 7de636b40a..85b0a604fb 100644
--- a/app/src/main/java/info/nightscout/androidaps/implementations/ActivityNamesImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/implementations/ActivityNamesImpl.kt
@@ -12,7 +12,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.HistoryBrowseActivity
 import info.nightscout.androidaps.activities.MyPreferenceFragment
 import info.nightscout.androidaps.activities.PreferencesActivity
-import info.nightscout.androidaps.services.AlarmSoundService
+import info.nightscout.core.services.AlarmSoundService
 import info.nightscout.configuration.activities.SingleFragmentActivity
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.ui.toast.ToastUtils
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
index 82a1ba55e3..64222415d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@@ -8,9 +8,9 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.RemoteInput
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.extensions.toStringShort
-import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.toStringShort
+import info.nightscout.core.extensions.valueToUnitsString
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.iob.generateCOBString
 import info.nightscout.core.iob.round
 import info.nightscout.core.utils.fabric.FabricPrivacy
diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt
index a6f2fa3809..2f537386d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt
@@ -10,7 +10,7 @@ import com.jjoe64.graphview.series.BarGraphSeries
 import com.jjoe64.graphview.series.LineGraphSeries
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
+import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
 import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.graph.data.DataPointWithLabelInterface
 import info.nightscout.core.graph.data.DeviationDataPoint
diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTemporaryTargetDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTemporaryTargetDataWorker.kt
index 073b68b410..fe06c05f94 100644
--- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTemporaryTargetDataWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareTemporaryTargetDataWorker.kt
@@ -8,7 +8,7 @@ import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.extensions.target
+import info.nightscout.core.extensions.target
 import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.core.workflow.CalculationWorkflow
diff --git a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index c61c03d0c6..cef4f2ddaf 100644
--- a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 9b945ec827..c2e31a3562 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.implementations.ConfigImpl
 import info.nightscout.androidaps.insight.database.InsightDatabase
 import info.nightscout.androidaps.insight.database.InsightDatabaseDao
 import info.nightscout.androidaps.insight.database.InsightDbHelper
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.constraints.ConstraintsImpl
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/safety/SafetyPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/safety/SafetyPluginTest.kt
index 86f39ccade..6928744079 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/safety/SafetyPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/safety/SafetyPluginTest.kt
@@ -4,7 +4,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.HardLimitsMock
 import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.constraints.Constraint
diff --git a/core/core-main/src/main/java/info/nightscout/core/aps/APSResultObject.kt b/core/core-main/src/main/java/info/nightscout/core/aps/APSResultObject.kt
index 53cd48328d..c3e13b7730 100644
--- a/core/core-main/src/main/java/info/nightscout/core/aps/APSResultObject.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/aps/APSResultObject.kt
@@ -2,8 +2,8 @@ package info.nightscout.core.aps
 
 import android.text.Spanned
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.convertedToPercent
+import info.nightscout.core.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.convertedToPercent
 import info.nightscout.core.main.R
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.aps.APSResult
diff --git a/core/core-main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt b/core/core-main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
index 109830f222..5ce11f98e5 100644
--- a/core/core-main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/di/CoreDataClassesModule.kt
@@ -2,7 +2,7 @@ package info.nightscout.core.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
+import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
 import info.nightscout.core.aps.APSResultObject
 import info.nightscout.core.wizard.BolusWizard
 import info.nightscout.core.wizard.QuickWizardEntry
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/BlockExtension.kt
similarity index 99%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/BlockExtension.kt
index 0a8be6f26a..44bcb5352f 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/BlockExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.database.entities.data.Block
 import info.nightscout.database.entities.data.TargetBlock
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/BolusCalculatorResultExtension.kt
similarity index 97%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/BolusCalculatorResultExtension.kt
index ed696ab2ab..94519e19d2 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/BolusCalculatorResultExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/BolusExtension.kt
similarity index 90%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/BolusExtension.kt
index 6966199155..5d0f13d066 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/BolusExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.database.entities.Bolus
 import info.nightscout.interfaces.insulin.Insulin
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/ExtendedBolusExtension.kt
similarity index 99%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/ExtendedBolusExtension.kt
index 19ccb7c7c0..a8e18acdbf 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/ExtendedBolusExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/ExtendedBolusExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.ExtendedBolus
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/FoodExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/FoodExtension.kt
similarity index 97%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/FoodExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/FoodExtension.kt
index f48f8b1bc3..c067103623 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/FoodExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/FoodExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.database.entities.Food
 import info.nightscout.interfaces.utils.JsonHelper
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/GlucoseValueExtension.kt
similarity index 95%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/GlucoseValueExtension.kt
index 625a0e54cb..3cfa51eb29 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/GlucoseValueExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 
 import info.nightscout.database.entities.GlucoseValue
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/JSONObjectExt.kt
similarity index 97%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/JSONObjectExt.kt
index 4079c6bbe9..bfcf039497 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/JSONObjectExt.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/JSONObjectExt.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import androidx.annotation.StringRes
 import info.nightscout.shared.interfaces.ResourceHelper
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt
similarity index 98%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt
index 9c21e6a9b6..f813f8125f 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/ProfileSwitchExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.database.entities.ProfileSwitch
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/TemporaryBasalExtension.kt
similarity index 99%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/TemporaryBasalExtension.kt
index e924c8954c..5f73bbadac 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/TemporaryBasalExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.TemporaryBasal
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/TemporaryTargetExtension.kt
similarity index 96%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/TemporaryTargetExtension.kt
index 41a7850045..8fb495f9c1 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/TemporaryTargetExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.core.main.R
 import info.nightscout.database.entities.TemporaryTarget
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/TherapyEventExtension.kt
similarity index 91%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/TherapyEventExtension.kt
index 9ea429cc47..de8d5df631 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/TherapyEventExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.interfaces.GlucoseUnit
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt b/core/core-main/src/main/java/info/nightscout/core/extensions/TrendArrowIcon.kt
similarity index 95%
rename from core/core-main/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt
rename to core/core-main/src/main/java/info/nightscout/core/extensions/TrendArrowIcon.kt
index 5b852690f8..02c33ed49b 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/extensions/TrendArrowIcon.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/extensions/TrendArrowIcon.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.extensions
+package info.nightscout.core.extensions
 
 import info.nightscout.core.main.R
 import info.nightscout.database.entities.GlucoseValue
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreObject.kt b/core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/AutosensDataStoreObject.kt
similarity index 99%
rename from core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreObject.kt
rename to core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/AutosensDataStoreObject.kt
index 381ab74d59..d2bf135416 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreObject.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/AutosensDataStoreObject.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculator
+package info.nightscout.core.iob.iobCobCalculator
 
 import androidx.collection.LongSparseArray
 import androidx.collection.size
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt b/core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/GlucoseStatusProvider.kt
similarity index 98%
rename from core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt
rename to core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/GlucoseStatusProvider.kt
index 1390b8f632..01973df1f2 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusProvider.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/GlucoseStatusProvider.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculator
+package info.nightscout.core.iob.iobCobCalculator
 
 import dagger.Reusable
 import info.nightscout.core.iob.asRounded
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt b/core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/data/AutosensDataObject.kt
similarity index 98%
rename from core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt
rename to core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/data/AutosensDataObject.kt
index 0751b32384..78e144d769 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensDataObject.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/iob/iobCobCalculator/data/AutosensDataObject.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculator.data
+package info.nightscout.core.iob.iobCobCalculator.data
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.main.R
diff --git a/core/core-main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt b/core/core-main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt
index 5af26c52aa..7b8fa18c1c 100644
--- a/core/core-main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/profile/ProfileSealed.kt
@@ -1,11 +1,11 @@
 package info.nightscout.core.profile
 
-import info.nightscout.androidaps.extensions.blockValueBySeconds
-import info.nightscout.androidaps.extensions.highTargetBlockValueBySeconds
-import info.nightscout.androidaps.extensions.lowTargetBlockValueBySeconds
-import info.nightscout.androidaps.extensions.shiftBlock
-import info.nightscout.androidaps.extensions.shiftTargetBlock
-import info.nightscout.androidaps.extensions.targetBlockValueBySeconds
+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.events.EventNewNotification
 import info.nightscout.core.main.R
 import info.nightscout.core.utils.MidnightUtils
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/core/core-main/src/main/java/info/nightscout/core/services/AlarmSoundService.kt
similarity index 95%
rename from core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
rename to core/core-main/src/main/java/info/nightscout/core/services/AlarmSoundService.kt
index f16e684a4b..489238c19b 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/services/AlarmSoundService.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.services
+package info.nightscout.core.services
 
 import android.content.Context
 import android.content.Intent
@@ -75,7 +75,7 @@ class AlarmSoundService : DaggerService() {
 
         player?.let { if (it.isPlaying) it.stop() }
 
-        if (intent?.hasExtra(AlarmSoundService.SOUND_ID) == true) resourceId = intent.getIntExtra(AlarmSoundService.SOUND_ID, R.raw.error)
+        if (intent?.hasExtra(SOUND_ID) == true) resourceId = intent.getIntExtra(SOUND_ID, R.raw.error)
         player = MediaPlayer()
         try {
             val afd = rh.openRawResourceFd(resourceId) ?: return START_NOT_STICKY
@@ -125,7 +125,8 @@ class AlarmSoundService : DaggerService() {
 
             if (currentVolumeLevel < VOLUME_INCREASE_STEPS) {
                 // Increase volume faster as time goes by
-                val delay = VOLUME_INCREASE_MIN_DELAY_MILLIS.coerceAtLeast(VOLUME_INCREASE_BASE_DELAY_MILLIS -
+                val delay = VOLUME_INCREASE_MIN_DELAY_MILLIS.coerceAtLeast(
+                    VOLUME_INCREASE_BASE_DELAY_MILLIS -
                     ((currentVolumeLevel - 1).toDouble().pow(VOLUME_INCREASE_DELAY_DECREMENT_EXPONENT) * 1000).toLong())
                 aapsLogger.debug(LTag.CORE, "Next notification volume increment in {}ms", delay)
                 increaseVolumeHandler.postDelayed(this, delay)
diff --git a/core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt b/core/core-main/src/main/java/info/nightscout/core/services/AlarmSoundServiceHelper.kt
similarity index 98%
rename from core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt
rename to core/core-main/src/main/java/info/nightscout/core/services/AlarmSoundServiceHelper.kt
index 11abfd4a2f..33d47358fe 100644
--- a/core/core-main/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/services/AlarmSoundServiceHelper.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.services
+package info.nightscout.core.services
 
 import android.content.ComponentName
 import android.content.Context
diff --git a/core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt b/core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
index ae9e8290ac..283c6772cc 100644
--- a/core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
@@ -4,9 +4,9 @@ import android.content.Context
 import android.text.Spanned
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.highValueToUnitsToString
-import info.nightscout.androidaps.extensions.lowValueToUnitsToString
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.highValueToUnitsToString
+import info.nightscout.core.extensions.lowValueToUnitsToString
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.iob.round
 import info.nightscout.core.main.R
 import info.nightscout.core.ui.dialogs.OKDialog
diff --git a/core/core-main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt b/core/core-main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
index bf1660067e..cd5eb5501d 100644
--- a/core/core-main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
@@ -2,8 +2,8 @@ package info.nightscout.core.wizard
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.extensions.valueToUnits
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.valueToUnits
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.iob.round
 import info.nightscout.core.main.R
 import info.nightscout.core.utils.MidnightUtils
diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt b/core/core-main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
index 297ebcc121..e4040d0369 100644
--- a/core/core-main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
+++ b/core/core-main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/core/core-main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 04782b3361..46752b695d 100644
--- a/core/core-main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/core/core-main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
index 23e7167ca2..7e45b0d3dc 100644
--- a/core/core-main/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
+++ b/core/core-main/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
@@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
 import info.nightscout.androidaps.HardLimitsMock
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.main.R
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt
index 8d3dbd1e2e..a42958a9bd 100644
--- a/core/core-main/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt
+++ b/core/core-main/src/test/java/info/nightscout/androidaps/extensions/BlockExtensionKtTest.kt
@@ -1,5 +1,11 @@
 package info.nightscout.androidaps.extensions
 
+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.database.entities.data.Block
 import info.nightscout.database.entities.data.TargetBlock
 import info.nightscout.database.entities.data.checkSanity
diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt
index 0267b6aeed..c0f108c2dd 100644
--- a/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt
+++ b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.iob.iobCalculator
 
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.iob.asRounded
 import info.nightscout.core.iob.log
 import info.nightscout.database.entities.GlucoseValue
diff --git a/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt
index c280be8a58..a82210137b 100644
--- a/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt
+++ b/core/core-main/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStoreTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
 import android.content.Context
 import info.nightscout.androidaps.TestBase
+import info.nightscout.core.iob.iobCobCalculator.AutosensDataStoreObject
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.shared.utils.DateUtil
 import info.nightscout.shared.utils.T
diff --git a/core/core-main/src/test/java/info/nightscout/core/wizard/BolusWizardTest.kt b/core/core-main/src/test/java/info/nightscout/core/wizard/BolusWizardTest.kt
index 2fd65da896..6a0fe61522 100644
--- a/core/core-main/src/test/java/info/nightscout/core/wizard/BolusWizardTest.kt
+++ b/core/core-main/src/test/java/info/nightscout/core/wizard/BolusWizardTest.kt
@@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.AutosensDataStore
 import info.nightscout.interfaces.aps.Loop
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 cfc15a72df..a2a25f7859 100644
--- a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt
@@ -7,11 +7,11 @@ import androidx.annotation.DrawableRes
 import com.jjoe64.graphview.series.BarGraphSeries
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
-import info.nightscout.androidaps.extensions.convertedToPercent
-import info.nightscout.androidaps.extensions.isInProgress
-import info.nightscout.androidaps.extensions.toStringFull
-import info.nightscout.androidaps.extensions.toStringShort
-import info.nightscout.androidaps.extensions.valueToUnits
+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
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 bb6a66f4fd..36bef39058 100644
--- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
@@ -1,6 +1,6 @@
 package info.nightscout.implementation.profile
 
-import info.nightscout.androidaps.extensions.fromConstant
+import info.nightscout.core.extensions.fromConstant
 import info.nightscout.core.main.R
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.fabric.FabricPrivacy
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 df1e0e2321..6eb1d28002 100644
--- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.implementation.profile
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
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 27c64201e4..329d1466a9 100644
--- a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt
@@ -1,7 +1,7 @@
 package info.nightscout.implementation.pump
 
 import android.widget.TextView
-import info.nightscout.androidaps.extensions.isOlderThan
+import info.nightscout.core.extensions.isOlderThan
 import info.nightscout.core.main.R
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.interfaces.pump.WarnColors
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 c20bec8f63..136eecf438 100644
--- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
@@ -9,7 +9,7 @@ import android.text.Spanned
 import androidx.appcompat.app.AppCompatActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.extensions.getCustomizedName
+import info.nightscout.core.extensions.getCustomizedName
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.fabric.FabricPrivacy
diff --git a/implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index c61c03d0c6..cef4f2ddaf 100644
--- a/implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/implementation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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
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 f0f1530656..0d64808955 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,9 +1,9 @@
 package info.nightscout.plugins.aps.openAPSAMA
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
-import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.core.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
+import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.core.aps.APSResultObject
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
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 f8d935aeec..cdacd753ba 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
@@ -3,8 +3,8 @@ package info.nightscout.plugins.aps.openAPSAMA
 import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.extensions.target
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.target
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
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 d05327acf5..eb273dc4f2 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,9 +1,9 @@
 package info.nightscout.plugins.aps.openAPSSMB
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
-import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.core.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
+import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.core.aps.APSResultObject
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
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 3d0be65374..85fbdc8d17 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
@@ -5,8 +5,8 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.extensions.target
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.target
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 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 13becfd988..3837f452fa 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,9 +1,9 @@
 package info.nightscout.plugins.aps.openAPSSMBDynamicISF
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
-import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.core.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.getPassedDurationToTimeInMinutes
+import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
 import info.nightscout.interfaces.aps.SMBDefaults
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
index 89b03eaa91..03eadbee1a 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
@@ -3,7 +3,7 @@ package info.nightscout.plugins.aps.openAPSSMBDynamicISF
 import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
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 ea38010c9e..eede003b64 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,9 +1,9 @@
 package info.nightscout.plugins.general.autotune
 
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.durationInMinutes
-import info.nightscout.androidaps.extensions.toJson
-import info.nightscout.androidaps.extensions.toTemporaryBasal
+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
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 8c7516a613..5a8ac99886 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
@@ -2,7 +2,7 @@ package info.nightscout.plugins.general.autotune
 
 import android.view.View
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
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 e4e649d41d..e471b63485 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,8 +1,8 @@
 package info.nightscout.plugins.general.autotune.data
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.blockValueBySeconds
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.blockValueBySeconds
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.main.R
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.MidnightUtils
diff --git a/plugins/aps/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt b/plugins/aps/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
index 297ebcc121..e4040d0369 100644
--- a/plugins/aps/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
+++ b/plugins/aps/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/plugins/aps/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/plugins/aps/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 89a2d04cf7..d94df05543 100644
--- a/plugins/aps/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/plugins/aps/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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
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 c69e9c7944..d643741094 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
@@ -2,7 +2,7 @@ package info.nightscout.plugins.general.autotune
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.androidaps.extensions.shiftBlock
+import info.nightscout.core.extensions.shiftBlock
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.Carbs
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 20627842e8..3f35b06fc8 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
@@ -3,9 +3,9 @@ package info.nightscout.automation.actions
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.fromConstant
+import info.nightscout.core.extensions.fromConstant
 import info.nightscout.interfaces.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.InputCarePortalMenu
 import info.nightscout.automation.elements.InputDuration
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 3435fda965..961c346b00 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
@@ -3,7 +3,7 @@ package info.nightscout.automation.actions
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.friendlyDescription
+import info.nightscout.core.extensions.friendlyDescription
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.ComparatorExists
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 6b6cdb71cb..05e5975a97 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
@@ -9,7 +9,7 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import com.google.common.base.Optional
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.automation.R
 import info.nightscout.automation.dialogs.ChooseTriggerDialog
 import info.nightscout.automation.events.EventTriggerChanged
diff --git a/plugins/automation/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt b/plugins/automation/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
index 297ebcc121..e4040d0369 100644
--- a/plugins/automation/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
+++ b/plugins/automation/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/plugins/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/plugins/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 4a848379cd..04796937b5 100644
--- a/plugins/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/plugins/automation/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerAutosensValueTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerAutosensValueTest.kt
index 3d2a5103d1..5b3a310b80 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerAutosensValueTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerAutosensValueTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.automation.triggers
 
 import com.google.common.base.Optional
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
+import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.Comparator
 import org.json.JSONObject
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt
index 5ee0773fc1..1b47de9913 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt
@@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.automation.AutomationPlugin
 import info.nightscout.automation.services.LastLocationDataContainer
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
index ee87e48f92..8cb0febecb 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
@@ -14,9 +14,9 @@ import android.os.SystemClock
 import androidx.core.app.NotificationCompat
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.convertedToPercent
-import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.core.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.convertedToPercent
+import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.iob.json
 import info.nightscout.core.utils.fabric.FabricPrivacy
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
index 1803a361d9..e5fc77eac6 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
@@ -1,12 +1,12 @@
 package info.nightscout.plugins.constraints.safety
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.putDouble
-import info.nightscout.androidaps.extensions.putInt
-import info.nightscout.androidaps.extensions.putString
-import info.nightscout.androidaps.extensions.storeDouble
-import info.nightscout.androidaps.extensions.storeInt
-import info.nightscout.androidaps.extensions.storeString
+import info.nightscout.core.extensions.putDouble
+import info.nightscout.core.extensions.putInt
+import info.nightscout.core.extensions.putString
+import info.nightscout.core.extensions.storeDouble
+import info.nightscout.core.extensions.storeInt
+import info.nightscout.core.extensions.storeString
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.constraints.Constraint
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 b721aa24d7..73838cf373 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
@@ -10,8 +10,8 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.toStringMedium
-import info.nightscout.androidaps.extensions.toStringShort
+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
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
index b4f1a1dac3..ed6c9d098c 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
@@ -5,9 +5,9 @@ import android.content.Intent
 import android.content.pm.ResolveInfo
 import android.os.Bundle
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.durationInMinutes
-import info.nightscout.androidaps.extensions.toStringFull
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.durationInMinutes
+import info.nightscout.core.extensions.toStringFull
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.iob.round
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
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 fa32505b63..5e9de93738 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
@@ -5,7 +5,7 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.foodFromJson
+import info.nightscout.core.extensions.foodFromJson
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.database.entities.Food
 import info.nightscout.database.impl.AppRepository
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 c6ca7ee9f2..d5991ae95c 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
@@ -27,9 +27,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.directionToIcon
-import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.directionToIcon
+import info.nightscout.core.extensions.valueToUnitsString
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.iob.displayText
 import info.nightscout.core.profile.ProfileSealed
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 9326b2edfa..77c7426a82 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
@@ -5,12 +5,12 @@ import androidx.annotation.StringRes
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.putDouble
-import info.nightscout.androidaps.extensions.putInt
-import info.nightscout.androidaps.extensions.putString
-import info.nightscout.androidaps.extensions.storeDouble
-import info.nightscout.androidaps.extensions.storeInt
-import info.nightscout.androidaps.extensions.storeString
+import info.nightscout.core.extensions.putDouble
+import info.nightscout.core.extensions.putInt
+import info.nightscout.core.extensions.putString
+import info.nightscout.core.extensions.storeDouble
+import info.nightscout.core.extensions.storeInt
+import info.nightscout.core.extensions.storeString
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.ui.dialogs.OKDialog
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt
index 8df801f6ee..0e68dd8b0e 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt
@@ -12,7 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.app.NotificationCompat
 import androidx.recyclerview.widget.RecyclerView
-import info.nightscout.androidaps.services.AlarmSoundServiceHelper
+import info.nightscout.core.services.AlarmSoundServiceHelper
 import info.nightscout.interfaces.NotificationHolder
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.ActivePlugin
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 fe52c96926..d049a6bf38 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
@@ -12,8 +12,8 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.valueToUnitsString
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.iob.generateCOBString
 import info.nightscout.core.iob.round
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 bb10cd10b4..5e89d590af 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
@@ -3,12 +3,12 @@ package info.nightscout.plugins.general.wear.wearintegration
 import android.app.NotificationManager
 import android.content.Context
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.toStringShort
-import info.nightscout.androidaps.extensions.valueToUnits
-import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.services.AlarmSoundServiceHelper
+import info.nightscout.core.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.toStringShort
+import info.nightscout.core.extensions.valueToUnits
+import info.nightscout.core.extensions.valueToUnitsString
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.services.AlarmSoundServiceHelper
 import info.nightscout.core.graph.data.GlucoseValueDataPoint
 import info.nightscout.core.iob.generateCOBString
 import info.nightscout.core.iob.round
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt
index 50bf4696bf..57aed7995d 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.toStringShort
+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
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt
index 2ffcc8e108..85a9037799 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt
@@ -1,8 +1,8 @@
 package info.nightscout.plugins.insulin
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.putInt
-import info.nightscout.androidaps.extensions.storeInt
+import info.nightscout.core.extensions.putInt
+import info.nightscout.core.extensions.storeInt
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.insulin.Insulin
 import info.nightscout.interfaces.profile.ProfileFunction
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 4287537360..5fd71dfbfc 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
@@ -3,10 +3,10 @@ package info.nightscout.plugins.iob.iobCobCalculator
 import androidx.collection.LongSparseArray
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.iobCalc
-import info.nightscout.androidaps.extensions.toTemporaryBasal
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStoreObject
+import info.nightscout.core.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.iobCalc
+import info.nightscout.core.extensions.toTemporaryBasal
+import info.nightscout.core.iob.iobCobCalculator.AutosensDataStoreObject
 import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.iob.combine
 import info.nightscout.core.iob.copy
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt
index 1fd1a04986..2fd68b9d69 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOref1Worker.kt
@@ -6,8 +6,8 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.target
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
+import info.nightscout.core.extensions.target
+import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt
index 6529b157a4..4fdaae7400 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobOrefWorker.kt
@@ -6,7 +6,7 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensDataObject
+import info.nightscout.core.iob.iobCobCalculator.data.AutosensDataObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.DataWorkerStorage
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 792bd8dbb6..80c85b7fc3 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
@@ -7,8 +7,8 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.extensions.blockFromJsonArray
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt
index 344f9678f7..2da7ab11dc 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.toStringFull
+import info.nightscout.core.extensions.toStringFull
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.profile.ProfileFunction
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt
index b6cc15a090..9e3a5878c4 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt
@@ -4,8 +4,8 @@ import android.os.SystemClock
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.core.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.fabric.InstanceId
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt
index bfb0e50e2a..5a75072614 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt
@@ -14,8 +14,8 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.directionToIcon
-import info.nightscout.androidaps.extensions.valueToUnitsString
+import info.nightscout.core.extensions.directionToIcon
+import info.nightscout.core.extensions.valueToUnitsString
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.ActionModeHelper
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt
index a75e2d9953..782b7cf5ca 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt
@@ -8,7 +8,7 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.fromConstant
+import info.nightscout.core.extensions.fromConstant
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.database.entities.GlucoseValue
diff --git a/plugins/main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt b/plugins/main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
index 297ebcc121..e4040d0369 100644
--- a/plugins/main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
+++ b/plugins/main/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/plugins/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/plugins/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 89a2d04cf7..d94df05543 100644
--- a/plugins/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/plugins/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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
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 2f0cb16668..ecf35306d0 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
@@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt
index d74a9402d3..623dad6933 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt
@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclient
 
-import info.nightscout.androidaps.extensions.toJson
+import info.nightscout.core.extensions.toJson
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
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 f907025629..62a1d2e66f 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,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclient.extensions
 
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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
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 d114bfa013..22ad91b616 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,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclient.extensions
 
-import info.nightscout.androidaps.extensions.toTemporaryBasal
+import info.nightscout.core.extensions.toTemporaryBasal
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.embedments.InterfaceIDs
 import info.nightscout.interfaces.profile.Profile
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 0acad7f4eb..09bc1e7f48 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,8 +1,8 @@
 package info.nightscout.plugins.sync.nsclient.extensions
 
-import info.nightscout.androidaps.extensions.fromConstant
-import info.nightscout.androidaps.extensions.getCustomizedName
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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
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 e9e36b708c..e79e2ce859 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,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclient.extensions
 
-import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.database.entities.TemporaryBasal.Type.Companion.fromString
 import info.nightscout.database.entities.embedments.InterfaceIDs
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 718918492b..834f58ce45 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
@@ -5,7 +5,7 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.bolusCalculatorResultFromJson
+import info.nightscout.core.extensions.bolusCalculatorResultFromJson
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.database.entities.TherapyEvent
 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 a054c367f3..9a38c4013f 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,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclientV3.extensions
 
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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
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 ce6791e00e..b0c710dfb7 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,7 +1,7 @@
 package info.nightscout.plugins.sync.nsclientV3.extensions
 
-import info.nightscout.androidaps.extensions.fromConstant
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.fromConstant
+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
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 0f4fba4d62..154b4472f3 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,7 +1,7 @@
 package info.nightscout.plugins.sync.tidepool.elements
 
 import com.google.gson.annotations.Expose
-import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.shared.utils.DateUtil
diff --git a/pump/dana/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt b/pump/dana/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
index 297ebcc121..e4040d0369 100644
--- a/pump/dana/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
+++ b/pump/dana/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/pump/danar/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt b/pump/danar/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
index 297ebcc121..e4040d0369 100644
--- a/pump/danar/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
+++ b/pump/danar/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 214f7f2fa9..4de6fb97d3 100644
--- a/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
diff --git a/pump/danars/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt b/pump/danars/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
index 297ebcc121..e4040d0369 100644
--- a/pump/danars/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
+++ b/pump/danars/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index fbc25d6636..fb3b9399c7 100644
--- a/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt
index 61c0f764c8..d7d2865a28 100644
--- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt
+++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt
@@ -17,7 +17,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.bindingadapters.setOnSafe
 import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager
 import info.nightscout.androidaps.plugins.pump.eopatch.databinding.DialogAlarmBinding
 import info.nightscout.androidaps.plugins.pump.eopatch.ui.AlarmHelperActivity
-import info.nightscout.androidaps.services.AlarmSoundServiceHelper
+import info.nightscout.core.services.AlarmSoundServiceHelper
 import info.nightscout.core.ui.R
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
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 59c0635451..8a115e3547 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
@@ -70,7 +70,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.Ri
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodErosOverviewFragment;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil;
-import info.nightscout.androidaps.services.AlarmSoundService;
+import info.nightscout.core.services.AlarmSoundService;
 import info.nightscout.core.events.EventNewNotification;
 import info.nightscout.core.pump.DetailedBolusInfoExtensionKt;
 import info.nightscout.core.utils.DateTimeUtil;
diff --git a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt
index 8da313a32c..7b694875e1 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt
@@ -1,7 +1,7 @@
 package info.nightscout.ui.activities
 
 import android.os.Bundle
-import info.nightscout.androidaps.services.AlarmSoundService
+import info.nightscout.core.services.AlarmSoundService
 import info.nightscout.core.ui.activities.DialogAppCompatActivity
 import info.nightscout.core.main.R
 import info.nightscout.database.impl.AppRepository
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 afce3c4d17..9153f6ffe4 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
@@ -16,7 +16,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.iobCalc
+import info.nightscout.core.extensions.iobCalc
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
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 d34df5c300..2826fe05db 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
@@ -15,8 +15,8 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.iobCalc
-import info.nightscout.androidaps.extensions.isInProgress
+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
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 30a6716e3c..4b614cd8a2 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
@@ -16,7 +16,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.getCustomizedName
+import info.nightscout.core.extensions.getCustomizedName
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
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 0fa21322f2..9430f2daab 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
@@ -15,9 +15,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.friendlyDescription
-import info.nightscout.androidaps.extensions.highValueToUnitsToString
-import info.nightscout.androidaps.extensions.lowValueToUnitsToString
+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
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 6affe39cb4..f555fd500a 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
@@ -15,9 +15,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.extensions.iobCalc
-import info.nightscout.androidaps.extensions.toStringFull
-import info.nightscout.androidaps.extensions.toTemporaryBasal
+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
diff --git a/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt b/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt
index d76e5b0343..47d781567a 100644
--- a/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt
@@ -12,7 +12,7 @@ import android.view.Window
 import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.interfaces.logging.UserEntryLogger
-import info.nightscout.androidaps.services.AlarmSoundServiceHelper
+import info.nightscout.core.services.AlarmSoundServiceHelper
 import info.nightscout.core.ui.activities.DialogAppCompatActivity
 import info.nightscout.core.main.R
 import info.nightscout.database.entities.UserEntry.Action
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 0cb85c143f..fba8a9da96 100644
--- a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt
+++ b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt
@@ -1,6 +1,6 @@
 package info.nightscout.ui.defaultProfile
 
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.PureProfile
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 36199e7ec8..47c5412f08 100644
--- a/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt
+++ b/ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt
@@ -1,7 +1,7 @@
 package info.nightscout.ui.defaultProfile
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.PureProfile
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt
index 21436e04bd..38d455ea0c 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
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 7acd2f7e30..e9097a7246 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.extensions.formatColor
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 d3e8b2e1c6..d6763c5db8 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
@@ -10,9 +10,9 @@ import android.view.ViewGroup
 import androidx.annotation.StringRes
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.fromConstant
+import info.nightscout.core.extensions.fromConstant
 import info.nightscout.interfaces.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
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 f61f5be40e..67a01df0de 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt
@@ -9,8 +9,8 @@ import android.view.Window
 import android.view.WindowManager
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.extensions.getCustomizedName
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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.database.ValueWrapper
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 ea7dafbb05..caf78cee40 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
@@ -18,7 +18,7 @@ import android.widget.CompoundButton
 import androidx.fragment.app.FragmentManager
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.extensions.valueToUnits
+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
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt
index e18104b620..31de6c19e6 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt
@@ -7,8 +7,8 @@ import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.extensions.bolusCalculatorResultFromJson
-import info.nightscout.androidaps.extensions.toJson
+import info.nightscout.core.extensions.bolusCalculatorResultFromJson
+import info.nightscout.core.extensions.toJson
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.profile.Profile
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 da3e8c5c2b..c47d98d393 100644
--- a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt
+++ b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt
@@ -13,9 +13,9 @@ import android.os.HandlerThread
 import android.view.View
 import android.widget.RemoteViews
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.directionToIcon
-import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.core.extensions.directionToIcon
+import info.nightscout.core.extensions.valueToUnitsString
+import info.nightscout.core.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.iob.displayText
 import info.nightscout.core.profile.ProfileSealed
diff --git a/ui/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt b/ui/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
index df1e0e2321..6eb1d28002 100644
--- a/ui/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
+++ b/ui/src/test/java/info/nightscout/androidaps/ProfileStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.implementation.profile
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
diff --git a/ui/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/ui/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index c61c03d0c6..cef4f2ddaf 100644
--- a/ui/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/ui/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.extensions.pureProfileFromJson
+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