move to interfaces

app/src/main/java/info/nightscout/androidaps/MainActivity.kt

@@ -56,10 +56,10 @@ import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.IconsProvider
-import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.SmsCommunicator
 import info.nightscout.interfaces.locale.LocaleHelper
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
+import info.nightscout.interfaces.ui.IconsProvider
 import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
 import info.nightscout.plugins.sync.nsclient.data.NSSettingsStatus
 import info.nightscout.rx.AapsSchedulers

app/src/main/java/info/nightscout/androidaps/MainApp.kt

@@ -15,9 +15,6 @@ import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
 import dagger.android.AndroidInjector
 import dagger.android.DaggerApplication
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
-import info.nightscout.database.impl.transactions.VersionChangeTransaction
 import info.nightscout.androidaps.db.CompatDBHelper
 import info.nightscout.androidaps.di.DaggerAppComponent
 import info.nightscout.androidaps.di.StaticInjector
@@ -33,13 +30,16 @@ import info.nightscout.androidaps.services.AlarmSoundServiceHelper
 import info.nightscout.androidaps.utils.ProcessLifecycleListener
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
+import info.nightscout.database.impl.transactions.VersionChangeTransaction
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.ConfigBuilder
 import info.nightscout.interfaces.LocalAlertUtils
-import info.nightscout.interfaces.PluginBase
 import info.nightscout.interfaces.locale.LocaleHelper
 import info.nightscout.interfaces.notifications.Notification
+import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin
 import info.nightscout.rx.logging.AAPSLogger

app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt

@@ -23,7 +23,6 @@ import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.events.EventPreferenceChange
-import info.nightscout.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
@@ -58,6 +57,7 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionTyp
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionType.NONE
 import info.nightscout.automation.AutomationPlugin
 import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.plugins.general.autotune.AutotunePlugin
 import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.plugins.general.xdripStatusline.StatusLinePlugin

app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt

@@ -6,10 +6,10 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import info.nightscout.androidaps.R
-import info.nightscout.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
-import info.nightscout.interfaces.locale.LocaleHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.interfaces.locale.LocaleHelper
+import info.nightscout.interfaces.plugin.PluginBase
 import javax.inject.Inject
 
 class SingleFragmentActivity : DaggerAppCompatActivityWithResult() {

app/src/main/java/info/nightscout/androidaps/di/AppModule.kt

@@ -7,7 +7,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.implementations.ActivityNamesImpl
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
@@ -35,6 +34,7 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.IconsProviderImplementation
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.AndroidPermissionImpl
 import info.nightscout.implementation.BolusTimerImpl
 import info.nightscout.implementation.CarbTimerImpl
@@ -47,22 +47,22 @@ import info.nightscout.implementation.queue.CommandQueueImplementation
 import info.nightscout.implementation.stats.DexcomTirCalculatorImpl
 import info.nightscout.implementation.stats.TddCalculatorImpl
 import info.nightscout.implementation.stats.TirCalculatorImpl
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.AndroidPermission
-import info.nightscout.interfaces.Autotune
 import info.nightscout.interfaces.BolusTimer
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.CarbTimer
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.IconsProvider
-import info.nightscout.interfaces.ImportExportPrefs
 import info.nightscout.interfaces.LocalAlertUtils
 import info.nightscout.interfaces.NotificationHolder
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.autotune.Autotune
-import info.nightscout.interfaces.SmsCommunicator
+import info.nightscout.interfaces.maintenance.ImportExportPrefs
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
 import info.nightscout.interfaces.storage.FileStorage
 import info.nightscout.interfaces.storage.Storage
+import info.nightscout.interfaces.ui.ActivityNames
+import info.nightscout.interfaces.ui.IconsProvider
 import info.nightscout.plugins.general.autotune.AutotunePlugin
 import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.plugins.sync.nsclient.DataSyncSelectorImplementation

app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt

@@ -9,7 +9,6 @@ import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
-import info.nightscout.interfaces.PluginBase
 import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
@@ -45,6 +44,7 @@ import info.nightscout.androidaps.plugins.source.RandomBgPlugin
 import info.nightscout.androidaps.plugins.source.TomatoPlugin
 import info.nightscout.androidaps.plugins.source.XdripPlugin
 import info.nightscout.automation.AutomationPlugin
+import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
 import info.nightscout.plugins.constraints.dstHelper.DstHelperPlugin
 import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin

app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt

@@ -20,9 +20,9 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BO
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
-import info.nightscout.interfaces.ActivityNames
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse

app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt

@@ -7,9 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.R
-import info.nightscout.interfaces.pump.DetailedBolusInfo
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.databinding.DialogFillBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.ActivePlugin
@@ -25,9 +22,12 @@ import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
-import info.nightscout.interfaces.ActivityNames
+import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.Constraint
+import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse

app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt

@@ -31,13 +31,13 @@ import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.BolusTimer
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse

app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt

@@ -12,9 +12,6 @@ import android.view.WindowManager
 import androidx.fragment.app.FragmentManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
-import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
 import info.nightscout.androidaps.databinding.DialogLoopBinding
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.ActivePlugin
@@ -33,13 +30,16 @@ import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
-import info.nightscout.interfaces.ActivityNames
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
 import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRefreshOverview
 import info.nightscout.rx.logging.AAPSLogger

app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt

@@ -22,10 +22,10 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BO
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
-import info.nightscout.interfaces.ActivityNames
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse

app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt

@@ -26,11 +26,11 @@ import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse

app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt

@@ -20,8 +20,6 @@ import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.databinding.DialogWizardBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.extensions.valueToUnits
@@ -36,9 +34,11 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.AapsSchedulers

app/src/main/java/info/nightscout/androidaps/implementations/ActivityNamesImpl.kt

@@ -9,8 +9,8 @@ import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
 import info.nightscout.androidaps.dialogs.WizardDialog
-import info.nightscout.interfaces.ActivityNames
 import info.nightscout.androidaps.services.AlarmSoundService
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.ui.activities.BolusProgressHelperActivity
 import info.nightscout.ui.activities.ErrorHelperActivity
 import info.nightscout.ui.activities.TDDStatsActivity

app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt

@@ -18,7 +18,7 @@ import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopSetLastRunGui
 import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui
 import info.nightscout.core.fabric.FabricPrivacy
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt

@@ -16,12 +16,7 @@ import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResultImpl
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
-import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
-import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.convertedToPercent
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
@@ -48,16 +43,21 @@ import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
-import info.nightscout.interfaces.ActivityNames
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
+import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.notifications.Notification
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.plugins.configBuilder.RunningConfiguration
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.rx.AapsSchedulers

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt

@@ -3,21 +3,21 @@ package info.nightscout.androidaps.plugins.aps.openAPSAMA
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.interfaces.data.MealData
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
-import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
-import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.iob.MealData
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt

@@ -4,8 +4,6 @@ import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.interfaces.APS
 import info.nightscout.androidaps.interfaces.ActivePlugin
@@ -23,10 +21,12 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Profiler
 import info.nightscout.core.fabric.FabricPrivacy
-import info.nightscout.interfaces.Constraint
+import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.database.impl.ValueWrapper
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt

@@ -3,26 +3,26 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMB
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.interfaces.data.MealData
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
-import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.iob.MealData
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONException

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt

@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.aps.openAPSSMB
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.VariableSensitivityResult
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
+import info.nightscout.interfaces.aps.VariableSensitivityResult
 import info.nightscout.rx.logging.LTag
 import org.json.JSONException
 import org.json.JSONObject

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt

@@ -6,36 +6,36 @@ import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.extensions.target
 import info.nightscout.androidaps.interfaces.APS
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.aps.OpenAPSFragment
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.shared.utils.DateUtil
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Profiler
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import javax.inject.Inject
 import javax.inject.Singleton
 

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt

@@ -3,31 +3,31 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.interfaces.data.MealData
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.getPassedDurationToTimeInMinutes
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.DetermineBasalAdapterInterface
-import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.stats.TddCalculator
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
-import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.shared.utils.DateUtil
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.iob.MealData
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt

@@ -26,8 +26,8 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.PR
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRebuildTabs

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt

@@ -18,10 +18,10 @@ import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.NsClient
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.sync.NsClient
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAppInitialized
 import info.nightscout.rx.events.EventConfigBuilderChange

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt

@@ -5,16 +5,16 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.interfaces.NsClient
-import info.nightscout.interfaces.Overview
-import info.nightscout.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.ProfileSource
 import info.nightscout.androidaps.interfaces.Pump
 import info.nightscout.androidaps.interfaces.Sensitivity
-import info.nightscout.interfaces.Sync
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.Overview
-import info.nightscout.interfaces.Safety
+import info.nightscout.interfaces.constraints.Safety
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.sync.NsClient
+import info.nightscout.interfaces.sync.Sync
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import javax.inject.Inject

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt

@@ -3,9 +3,7 @@ package info.nightscout.androidaps.plugins.constraints.objectives
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective0
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective1
@@ -18,8 +16,10 @@ import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Obje
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective7
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective9
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.kt

@@ -2,12 +2,12 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import javax.inject.Inject
 

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective5.kt

@@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.interfaces.Constraint
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
+import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.shared.utils.T
 import javax.inject.Inject
 

app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt

@@ -9,31 +9,31 @@ import info.nightscout.androidaps.extensions.storeDouble
 import info.nightscout.androidaps.extensions.storeInt
 import info.nightscout.androidaps.extensions.storeString
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.Profile
-import info.nightscout.interfaces.pump.defs.PumpDescription
-import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.interfaces.Safety
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
-import info.nightscout.shared.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.HardLimits
+import info.nightscout.interfaces.BuildHelper
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.constraints.Safety
+import info.nightscout.interfaces.notifications.Notification
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Singleton

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt

@@ -12,8 +12,6 @@ import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.HistoryBrowseActivity
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.databinding.ActionsFragmentBinding
 import info.nightscout.androidaps.dialogs.ExtendedBolusDialog
 import info.nightscout.androidaps.dialogs.FillDialog
@@ -37,11 +35,13 @@ import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
-import info.nightscout.interfaces.ActivityNames
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.pump.actions.CustomAction
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventCustomActionsChanged

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt

@@ -3,11 +3,11 @@ package info.nightscout.androidaps.plugins.general.actions
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton
 

app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt

@@ -19,9 +19,9 @@ import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt

@@ -24,7 +24,6 @@ import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.DaggerAppCompatActivityWithResult
 import info.nightscout.androidaps.activities.PreferencesActivity
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
@@ -38,18 +37,19 @@ import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.ImportExportPrefs
+import info.nightscout.interfaces.maintenance.ImportExportPrefs
-import info.nightscout.interfaces.data.maintenance.PrefFileNotFoundError
+import info.nightscout.interfaces.maintenance.PrefFileNotFoundError
-import info.nightscout.interfaces.data.maintenance.PrefIOError
+import info.nightscout.interfaces.maintenance.PrefIOError
-import info.nightscout.interfaces.data.maintenance.PrefMetadata
+import info.nightscout.interfaces.maintenance.PrefMetadata
-import info.nightscout.interfaces.data.maintenance.Prefs
+import info.nightscout.interfaces.maintenance.Prefs
-import info.nightscout.interfaces.data.maintenance.PrefsFile
+import info.nightscout.interfaces.maintenance.PrefsFile
-import info.nightscout.interfaces.data.maintenance.PrefsFormat
+import info.nightscout.interfaces.maintenance.PrefsFormat
-import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey
+import info.nightscout.interfaces.maintenance.PrefsMetadataKey
-import info.nightscout.interfaces.data.maintenance.PrefsStatus
+import info.nightscout.interfaces.maintenance.PrefsStatus
 import info.nightscout.interfaces.storage.Storage
 import info.nightscout.interfaces.utils.MidnightTime
 import info.nightscout.rx.bus.RxBus

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt

@@ -10,7 +10,6 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.dana.database.DanaHistoryDatabase
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding
 import info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase
 import info.nightscout.androidaps.events.EventPreferenceChange
@@ -29,7 +28,8 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.PR
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
-import info.nightscout.interfaces.ImportExportPrefs
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.interfaces.maintenance.ImportExportPrefs
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt

@@ -7,11 +7,11 @@ import androidx.core.content.FileProvider
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
-import info.nightscout.interfaces.PluginBase
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.general.maintenance.LoggerUtils
 import info.nightscout.plugins.sync.nsclient.data.NSSettingsStatus
 import info.nightscout.rx.logging.AAPSLogger

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt

@@ -29,7 +29,6 @@ import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.databinding.OverviewFragmentBinding
 import info.nightscout.androidaps.dialogs.InsulinDialog
 import info.nightscout.androidaps.dialogs.LoopDialog
@@ -78,12 +77,13 @@ import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.interfaces.end
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.GlucoseUnit
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.JsonHelper
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt

@@ -21,9 +21,9 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Overview
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
 import info.nightscout.plugins.general.overview.notifications.events.EventUpdateOverviewNotification

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt

@@ -19,11 +19,11 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.IconsProvider
 import info.nightscout.interfaces.NotificationHolder
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.ui.IconsProvider
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAutosensCalculationFinished

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt

@@ -9,9 +9,9 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBo
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataHandlerMobile
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.DataLayerListenerServiceMobileHelper
 import info.nightscout.core.fabric.FabricPrivacy
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventAutosensCalculationFinished

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt

@@ -4,11 +4,6 @@ import android.app.NotificationManager
 import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.interfaces.pump.DetailedBolusInfo
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
-import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
-import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.dialogs.InsulinDialog
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.toStringShort
@@ -44,11 +39,16 @@ import info.nightscout.database.entities.TotalDailyDose
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.entities.interfaces.end
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
+import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.GlucoseUnit
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData
 import info.nightscout.rx.AapsSchedulers

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt

@@ -5,8 +5,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.events.EventEffectiveProfileSwitchChanged
 import info.nightscout.androidaps.events.EventNewBG
 import info.nightscout.androidaps.events.EventNewHistoryData
@@ -27,11 +25,13 @@ import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.database.entities.interfaces.end
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.iob.MealData
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.data.MealData
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.utils.MidnightTime
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt

@@ -2,16 +2,16 @@ package info.nightscout.androidaps.plugins.sensitivity
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.Sensitivity
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.SafeParse
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import kotlin.math.max
 import kotlin.math.min

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt

@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.sensitivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.Sensitivity.SensitivityType
@@ -11,9 +10,10 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.utils.extensions.isPSEvent5minBack
 import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.sync.nsclient.extensions.isTherapyEventEvent5minBack
 import info.nightscout.plugins.utils.Percentile
 import info.nightscout.rx.logging.AAPSLogger

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt

@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.sensitivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.Sensitivity.SensitivityType
@@ -11,10 +10,11 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.utils.extensions.isPSEvent5minBack
 import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.interfaces.PluginType
 import info.nightscout.interfaces.aps.SMBDefaults
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.sync.nsclient.extensions.isTherapyEventEvent5minBack
 import info.nightscout.plugins.utils.Percentile
 import info.nightscout.rx.logging.AAPSLogger

app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt

@@ -4,7 +4,6 @@ import androidx.collection.LongSparseArray
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.Sensitivity.SensitivityType
@@ -12,9 +11,10 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.utils.extensions.isPSEvent5minBack
 import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.sync.nsclient.extensions.isTherapyEventEvent5minBack
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/AidexPlugin.kt

@@ -6,18 +6,18 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.receivers.Intents
 import info.nightscout.database.entities.GlucoseValue
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt

@@ -9,9 +9,6 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
-import info.nightscout.database.impl.transactions.InvalidateGlucoseValueTransaction
 import info.nightscout.androidaps.extensions.fromConstant
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.Profile
@@ -24,10 +21,13 @@ import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
+import info.nightscout.database.impl.transactions.InvalidateGlucoseValueTransaction
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt

@@ -6,17 +6,17 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
-import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
-import info.nightscout.interfaces.PluginType
+import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt

@@ -7,14 +7,14 @@ import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt

@@ -6,8 +6,6 @@ import android.os.Handler
 import android.os.HandlerThread
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -16,10 +14,12 @@ import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/IntelligoPlugin.kt

@@ -8,8 +8,6 @@ import android.os.HandlerThread
 import android.util.Log
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -18,10 +16,12 @@ import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt

@@ -6,15 +6,15 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt

@@ -6,15 +6,15 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.database.entities.GlucoseValue
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.utils.JsonHelper.safeGetString
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger

app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt

@@ -5,16 +5,16 @@ import android.os.HandlerThread
 import android.os.SystemClock
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.utils.extensions.isRunningTest
 import info.nightscout.database.entities.GlucoseValue
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger

app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt

@@ -6,14 +6,14 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt

@@ -6,15 +6,15 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.receivers.Intents
 import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.database.impl.AppRepository
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.database.impl.transactions.CgmSourceTransaction
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt

@@ -15,7 +15,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.IobCobCalculator
@@ -25,9 +24,10 @@ import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.utils.extensions.buildDeviceStatus
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.LocalAlertUtils
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.plugins.configBuilder.RunningConfiguration
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventProfileSwitchChanged

app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt

@@ -13,8 +13,6 @@ import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment
@@ -41,8 +39,10 @@ import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.extensions.isRunningTest
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.ConfigBuilder
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.maintenance.ImportExportPrefs
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.plugins.profile.ProfileFragment
 import info.nightscout.plugins.profile.ProfilePlugin
 import info.nightscout.plugins.sync.nsShared.events.EventNSClientStatus

app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt

@@ -9,12 +9,12 @@ import android.widget.RadioGroup
 import android.widget.TextView
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.activities.MyPreferenceFragment
-import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.PluginType
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.setupwizard.SWDefinition
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.events.EventConfigBuilderChange
 import javax.inject.Inject
 

app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt

@@ -18,11 +18,11 @@ import androidx.annotation.StyleRes
 import androidx.appcompat.view.ContextThemeWrapper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import info.nightscout.androidaps.R
-import info.nightscout.shared.extensions.runOnUiThread
-import info.nightscout.interfaces.data.maintenance.Prefs
-import info.nightscout.interfaces.data.maintenance.PrefsStatus
 import info.nightscout.androidaps.utils.ToastUtils
-import java.util.*
+import info.nightscout.interfaces.maintenance.Prefs
+import info.nightscout.interfaces.maintenance.PrefsStatus
+import info.nightscout.shared.extensions.runOnUiThread
+import java.util.LinkedList
 
 object PrefImportSummaryDialog {
 

app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt

@@ -10,8 +10,8 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.TaskStackBuilder
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.core.main.R
-import info.nightscout.interfaces.IconsProvider
 import info.nightscout.interfaces.NotificationHolder
+import info.nightscout.interfaces.ui.IconsProvider
 import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton

app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.utils.resources
 
 import info.nightscout.androidaps.R
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.IconsProvider
+import info.nightscout.interfaces.ui.IconsProvider
 import javax.inject.Inject
 import javax.inject.Singleton
 

app/src/main/java/info/nightscout/androidaps/utils/tabs/TabPageAdapter.kt

@@ -3,9 +3,8 @@ package info.nightscout.androidaps.utils.tabs
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginFragment
+import info.nightscout.interfaces.plugin.PluginFragment
-import java.util.*
 
 class TabPageAdapter(private val activity: AppCompatActivity) : FragmentStateAdapter(activity) {
 

app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt

@@ -5,9 +5,6 @@ import android.text.Spanned
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.interfaces.pump.DetailedBolusInfo
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.InsertOrUpdateBolusCalculatorResultTransaction
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.extensions.highValueToUnitsToString
 import info.nightscout.androidaps.extensions.lowValueToUnitsToString
@@ -29,14 +26,17 @@ import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
-import info.nightscout.interfaces.ActivityNames
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.InsertOrUpdateBolusCalculatorResultTransaction
 import info.nightscout.interfaces.BolusTimer
 import info.nightscout.interfaces.CarbTimer
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.interfaces.utils.HtmlHelper
 import info.nightscout.interfaces.utils.Round
 import info.nightscout.rx.bus.RxBus

app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt

@@ -2,8 +2,6 @@ package info.nightscout.androidaps.utils.wizard
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.ValueWrapper
 import info.nightscout.androidaps.extensions.valueToUnits
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
@@ -11,7 +9,9 @@ import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.ValueWrapper
+import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.utils.JsonHelper.safeGetInt
 import info.nightscout.interfaces.utils.JsonHelper.safeGetString
 import info.nightscout.rx.logging.AAPSLogger

app/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt

@@ -1,14 +1,14 @@
 package info.nightscout.androidaps
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.pump.DetailedBolusInfo
-import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.interfaces.pump.DetailedBolusInfo
+import info.nightscout.interfaces.pump.PumpEnactResult
 import info.nightscout.interfaces.pump.defs.ManufacturerType
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import org.json.JSONObject

app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt

@@ -31,9 +31,9 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.constraints.ConstraintsImpl
 import info.nightscout.interfaces.BuildHelper
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.shared.sharedPreferences.SP

app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt

@@ -6,7 +6,6 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.Constraints
@@ -15,10 +14,11 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.core.fabric.FabricPrivacy
-import info.nightscout.interfaces.ActivityNames
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.pump.defs.PumpDescription
+import info.nightscout.interfaces.ui.ActivityNames
 import info.nightscout.plugins.configBuilder.RunningConfiguration
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.rx.bus.RxBus

app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt

@@ -5,13 +5,13 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.Constraint
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
-import info.nightscout.shared.utils.DateUtil
+import info.nightscout.interfaces.Config
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test

app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt

@@ -4,19 +4,19 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.database.impl.AppRepository
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.source.GlimpPlugin
 import info.nightscout.androidaps.utils.HardLimits
+import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.shared.sharedPreferences.SP
 import org.junit.Assert

app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt

@@ -3,12 +3,12 @@ package info.nightscout.androidaps.plugins.sensitivity
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.interfaces.PluginDescription
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.interfaces.Sensitivity
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
+import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import org.json.JSONObject
 import org.junit.Assert

app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt

@@ -7,16 +7,16 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
-import info.nightscout.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
-import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
+import info.nightscout.interfaces.GlucoseUnit
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper

automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt

@@ -45,9 +45,9 @@ import info.nightscout.automation.triggers.TriggerTimeRange
 import info.nightscout.automation.triggers.TriggerWifiSsid
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus

automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt

@@ -10,8 +10,8 @@ import info.nightscout.automation.R
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRefreshOverview

automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt

@@ -9,8 +9,8 @@ import info.nightscout.automation.R
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventRefreshOverview

automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt

@@ -5,18 +5,17 @@ import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResultImpl
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.interfaces.Autotune
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.interfaces.queue.Callback
-import info.nightscout.interfaces.utils.JsonHelper
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.InputDuration
 import info.nightscout.automation.elements.InputProfileName
 import info.nightscout.automation.elements.LabelWithElement
 import info.nightscout.automation.elements.LayoutBuilder
+import info.nightscout.interfaces.autotune.Autotune
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.utils.JsonHelper
 import info.nightscout.rx.logging.LTag
-
+import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import org.json.JSONObject
 import javax.inject.Inject

automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt

@@ -3,13 +3,13 @@ package info.nightscout.automation.actions
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResultImpl
-import info.nightscout.interfaces.SmsCommunicator
-import info.nightscout.interfaces.queue.Callback
-import info.nightscout.interfaces.utils.JsonHelper
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.InputString
 import info.nightscout.automation.elements.LabelWithElement
 import info.nightscout.automation.elements.LayoutBuilder
+import info.nightscout.interfaces.queue.Callback
+import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
+import info.nightscout.interfaces.utils.JsonHelper
 import org.json.JSONObject
 import javax.inject.Inject
 

automation/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt

@@ -1,20 +1,20 @@
 package info.nightscout.androidaps
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.pump.DetailedBolusInfo
-import info.nightscout.interfaces.data.PumpEnactResult
 import info.nightscout.androidaps.data.PumpEnactResultImpl
-import info.nightscout.interfaces.PluginBase
-import info.nightscout.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.interfaces.plugin.PluginBase
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.pump.DetailedBolusInfo
+import info.nightscout.interfaces.pump.PumpEnactResult
 import info.nightscout.interfaces.pump.defs.ManufacturerType
+import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.utils.TimeChangeType
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.interfaces.ResourceHelper
 import org.json.JSONObject
 
 @Suppress("MemberVisibilityCanBePrivate")

automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt

@@ -1,8 +1,8 @@
 package info.nightscout.automation.actions
 
-import info.nightscout.interfaces.PluginType
-import info.nightscout.interfaces.queue.Callback
 import info.nightscout.automation.R
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test

automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt

@@ -1,8 +1,8 @@
 package info.nightscout.automation.actions
 
-import info.nightscout.interfaces.PluginType
-import info.nightscout.interfaces.queue.Callback
 import info.nightscout.automation.R
+import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.interfaces.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test

automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt

@@ -14,11 +14,11 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.automation.triggers.Trigger
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.Constraint
 import info.nightscout.interfaces.GlucoseUnit
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.SmsCommunicator
+import info.nightscout.interfaces.plugin.PluginDescription
+import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP

automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt

@@ -7,12 +7,12 @@ import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.interfaces.PluginDescription
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.automation.AutomationPlugin
 import info.nightscout.automation.services.LastLocationDataContainer
+import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.sharedPreferences.SP
 import org.junit.Before

core/core-main/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt

@@ -5,14 +5,14 @@ import android.content.pm.PackageManager
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.ActivityCompat
 import dagger.android.support.DaggerAppCompatActivity
-import info.nightscout.core.main.R
-import info.nightscout.interfaces.ImportExportPrefs
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.main.R
+import info.nightscout.interfaces.maintenance.ImportExportPrefs
 import info.nightscout.interfaces.permissions.OptimizationPermissionContract
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject
 
 open class DaggerAppCompatActivityWithResult : DaggerAppCompatActivity() {

core/core-main/src/main/java/info/nightscout/androidaps/data/LocalInsulin.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data
 
 import info.nightscout.database.entities.Bolus
-import info.nightscout.interfaces.data.Iob
+import info.nightscout.interfaces.iob.Iob
 import kotlin.math.exp
 import kotlin.math.pow
 

core/core-main/src/main/java/info/nightscout/androidaps/data/PumpEnactResultImpl.kt

@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.data
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.core.main.R
-import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.core.main.R
+import info.nightscout.interfaces.pump.PumpEnactResult
 import info.nightscout.interfaces.utils.Round
-import info.nightscout.interfaces.data.PumpEnactResult
+import info.nightscout.shared.interfaces.ResourceHelper
 import org.json.JSONObject
 import javax.inject.Inject
 

core/core-main/src/main/java/info/nightscout/androidaps/extensions/BolusExtension.kt

@@ -4,7 +4,7 @@ import info.nightscout.androidaps.data.LocalInsulin
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Insulin
 import info.nightscout.database.entities.Bolus
-import info.nightscout.interfaces.data.Iob
+import info.nightscout.interfaces.iob.Iob
 
 fun Bolus.iobCalc(activePlugin: ActivePlugin, time: Long, dia: Double): Iob {
     if (!isValid  || type == Bolus.Type.PRIMING ) return Iob()

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt

@@ -1,12 +1,11 @@
 package info.nightscout.androidaps.interfaces
 
-import info.nightscout.interfaces.NsClient
 import info.nightscout.interfaces.Overview
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.constraints.Safety
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.Safety
+import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.interfaces.Sync
+import info.nightscout.interfaces.sync.NsClient
-import java.util.*
+import info.nightscout.interfaces.sync.Sync
 
 interface ActivePlugin {
 

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.interfaces
 
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
 
 /**
  * Constraints interface

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/DetermineBasalAdapterInterface.kt

@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.interfaces
 
 import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.interfaces.data.MealData
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.interfaces.iob.MealData
 
 interface DetermineBasalAdapterInterface {
 

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Insulin.kt

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.interfaces
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.embedments.InsulinConfiguration
 import info.nightscout.interfaces.ConfigExportImport
-import info.nightscout.interfaces.data.Iob
+import info.nightscout.interfaces.iob.Iob
 
 interface Insulin : ConfigExportImport {
 

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt

@@ -8,7 +8,7 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.TemporaryBasal
-import info.nightscout.interfaces.data.MealData
+import info.nightscout.interfaces.iob.MealData
 import org.json.JSONArray
 
 interface IobCobCalculator {

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Loop.kt

@@ -2,8 +2,8 @@ package info.nightscout.androidaps.interfaces
 
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
 import info.nightscout.database.entities.OfflineEvent
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.data.PumpEnactResult
+import info.nightscout.interfaces.pump.PumpEnactResult
 
 interface Loop {
 

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/Pump.kt

@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.interfaces
 
 import info.nightscout.interfaces.pump.DetailedBolusInfo
-import info.nightscout.interfaces.pump.defs.PumpType
+import info.nightscout.interfaces.pump.PumpEnactResult
-import info.nightscout.interfaces.data.PumpEnactResult
-import info.nightscout.interfaces.pump.defs.ManufacturerType
-import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.pump.actions.CustomAction
 import info.nightscout.interfaces.pump.actions.CustomActionType
+import info.nightscout.interfaces.pump.defs.ManufacturerType
+import info.nightscout.interfaces.pump.defs.PumpDescription
+import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.queue.CustomCommand
 import info.nightscout.interfaces.utils.TimeChangeType
 import org.json.JSONObject

core/core-main/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt

@@ -3,9 +3,9 @@ package info.nightscout.androidaps.interfaces
 import android.os.SystemClock
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.main.R
-import info.nightscout.interfaces.PluginBase
+import info.nightscout.interfaces.plugin.PluginBase
-import info.nightscout.interfaces.PluginDescription
+import info.nightscout.interfaces.plugin.PluginDescription
-import info.nightscout.interfaces.PluginType
+import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
 

core/core-main/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt

@@ -12,7 +12,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.core.main.R
 import info.nightscout.database.entities.GlucoseValue
-import info.nightscout.interfaces.Constraint
+import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.utils.HtmlHelper.fromHtml
 import info.nightscout.rx.logging.AAPSLogger

core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt

@@ -3,16 +3,16 @@ package info.nightscout.androidaps.plugins.general.maintenance
 import android.content.Context
 import android.os.Environment
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.core.main.R
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
 import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
+import info.nightscout.core.main.R
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.data.maintenance.PrefMetadata
+import info.nightscout.interfaces.maintenance.PrefMetadata
-import info.nightscout.interfaces.data.maintenance.PrefMetadataMap
+import info.nightscout.interfaces.maintenance.PrefMetadataMap
-import info.nightscout.interfaces.data.maintenance.PrefsFile
+import info.nightscout.interfaces.maintenance.PrefsFile
-import info.nightscout.interfaces.data.maintenance.PrefsImportDir
+import info.nightscout.interfaces.maintenance.PrefsImportDir
-import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey
+import info.nightscout.interfaces.maintenance.PrefsMetadataKey
-import info.nightscout.interfaces.data.maintenance.PrefsStatus
+import info.nightscout.interfaces.maintenance.PrefsStatus
 import info.nightscout.interfaces.storage.Storage
 import info.nightscout.shared.interfaces.ResourceHelper
 import org.joda.time.DateTime

core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefsFileContract.kt

@@ -6,7 +6,7 @@ import androidx.activity.result.contract.ActivityResultContract
 import androidx.fragment.app.FragmentActivity
 import info.nightscout.androidaps.extensions.safeGetParcelableExtra
 import info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImportListActivity
-import info.nightscout.interfaces.data.maintenance.PrefsFile
+import info.nightscout.interfaces.maintenance.PrefsFile
 
 class PrefsFileContract : ActivityResultContract<Void?, PrefsFile?>() {
 

core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt

@@ -11,15 +11,15 @@ import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerAppCompatActivity
+import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
+import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract
 import info.nightscout.core.main.R
 import info.nightscout.core.main.databinding.MaintenanceImportListActivityBinding
 import info.nightscout.core.main.databinding.MaintenanceImportListItemBinding
-import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
-import info.nightscout.interfaces.data.maintenance.PrefsFile
-import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract
-import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey
-import info.nightscout.interfaces.data.maintenance.PrefsStatus
 import info.nightscout.interfaces.locale.LocaleHelper
+import info.nightscout.interfaces.maintenance.PrefsFile
+import info.nightscout.interfaces.maintenance.PrefsMetadataKey
+import info.nightscout.interfaces.maintenance.PrefsStatus
 import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject
 

core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt

@@ -1,26 +1,26 @@
 package info.nightscout.androidaps.plugins.general.maintenance.formats
 
-import info.nightscout.core.main.R
-import info.nightscout.androidaps.utils.CryptoUtil
 import info.nightscout.androidaps.extensions.hexStringToByteArray
 import info.nightscout.androidaps.extensions.toHex
-import info.nightscout.shared.interfaces.ResourceHelper
+import info.nightscout.androidaps.utils.CryptoUtil
+import info.nightscout.core.main.R
+import info.nightscout.interfaces.maintenance.PrefFileNotFoundError
+import info.nightscout.interfaces.maintenance.PrefFormatError
+import info.nightscout.interfaces.maintenance.PrefIOError
+import info.nightscout.interfaces.maintenance.PrefMetadata
+import info.nightscout.interfaces.maintenance.PrefMetadataMap
+import info.nightscout.interfaces.maintenance.Prefs
+import info.nightscout.interfaces.maintenance.PrefsFormat
+import info.nightscout.interfaces.maintenance.PrefsMetadataKey
+import info.nightscout.interfaces.maintenance.PrefsStatus
 import info.nightscout.interfaces.storage.Storage
-import info.nightscout.interfaces.data.maintenance.PrefFileNotFoundError
+import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.interfaces.data.maintenance.PrefFormatError
-import info.nightscout.interfaces.data.maintenance.PrefIOError
-import info.nightscout.interfaces.data.maintenance.PrefMetadata
-import info.nightscout.interfaces.data.maintenance.PrefMetadataMap
-import info.nightscout.interfaces.data.maintenance.Prefs
-import info.nightscout.interfaces.data.maintenance.PrefsFormat
-import info.nightscout.interfaces.data.maintenance.PrefsMetadataKey
-import info.nightscout.interfaces.data.maintenance.PrefsStatus
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
-import java.util.*
+import java.util.LinkedList
 import javax.inject.Inject
 import javax.inject.Singleton
 

core/core-main/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.general.overview.events
 
-import info.nightscout.interfaces.data.PumpEnactResult
+import info.nightscout.interfaces.pump.PumpEnactResult
 import info.nightscout.rx.events.Event
 
 class EventDismissBolusProgressIfRunning(val result: PumpEnactResult?, val id: Long?) : Event()