diff --git a/app/build.gradle b/app/build.gradle
index 732b465487..f1f1afa44f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,10 +177,12 @@ dependencies {
     wearApp project(':wear')
 
     implementation project(':core')
+    implementation project(':combo')
     implementation project(':database')
     implementation project(':dana')
     implementation project(':danars')
     implementation project(':danar')
+    implementation project(':insight')
     implementation project(':rileylink')
     implementation project(':medtronic')
     implementation project(':omnipod-common')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1abc55ecfe..a367417120 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -219,8 +219,6 @@
             android:exported="false" />
 
         <service android:name=".plugins.general.persistentNotification.DummyService" />
-        <service android:name=".plugins.pump.insight.connection_service.InsightConnectionService" />
-        <service android:name=".plugins.pump.insight.InsightAlertService" />
 
         <meta-data
             android:name="io.fabric.ApiKey"
@@ -236,20 +234,6 @@
             android:name=".activities.SingleFragmentActivity"
             android:theme="@style/AppTheme" />
         <activity android:name=".plugins.general.maintenance.activities.LogSettingActivity" />
-        <activity
-            android:name=".plugins.pump.insight.activities.InsightPairingActivity"
-            android:label="@string/insight_pairing"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".plugins.pump.insight.activities.InsightAlertActivity"
-            android:label="@string/pump_alert"
-            android:excludeFromRecents="true"
-            android:launchMode="singleInstance"
-            android:theme="@style/InsightAlertDialog" />
-        <activity
-            android:name=".plugins.pump.insight.activities.InsightPairingInformationActivity"
-            android:label="@string/pairing_information"
-            android:theme="@style/AppTheme" />
         <activity android:name=".activities.RequestDexcomPermissionActivity" />
         <activity android:name=".plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity">
             <intent-filter>
@@ -259,13 +243,6 @@
             </intent-filter>
         </activity>
 
-        <!-- Medtronic service and activities -->
-        <service
-            android:name=".plugins.pump.medtronic.service.RileyLinkMedtronicService"
-            android:enabled="true"
-            android:exported="true" />
-
-        <activity android:name=".plugins.pump.medtronic.dialog.MedtronicHistoryActivity" />
         <activity android:name=".plugins.general.openhumans.OpenHumansLoginActivity"
             android:launchMode="singleTop">
             <intent-filter>
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 09505d0e18..072e621cdc 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -138,7 +138,7 @@ class MainActivity : NoSplashAppCompatActivity() {
             .observeOn(aapsSchedulers.main)
             .subscribe({ processPreferenceChange(it) }, fabricPrivacy::logException)
         )
-        if (!sp.getBoolean(R.string.key_setupwizard_processed, false) && !isRunningRealPumpTest()) {
+        if (startWizard() && !isRunningRealPumpTest()) {
             protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, {
                 startActivity(Intent(this, SetupWizardActivity::class.java))
             })
@@ -156,6 +156,9 @@ class MainActivity : NoSplashAppCompatActivity() {
         if (viewPager.currentItem >= 0) pluginPreferencesMenuItem?.isEnabled = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem).preferencesId != -1
     }
 
+    private fun startWizard() : Boolean =
+        !sp.getBoolean(R.string.key_setupwizard_processed, false)
+
     override fun onPostCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
         super.onPostCreate(savedInstanceState, persistentState)
         actionBarDrawerToggle.syncState()
@@ -381,6 +384,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         FirebaseCrashlytics.getInstance().setCustomKey("Remote", remote)
         FirebaseCrashlytics.getInstance().setCustomKey("Committed", BuildConfig.COMMITTED)
         FirebaseCrashlytics.getInstance().setCustomKey("Hash", hashes[0])
+        FirebaseCrashlytics.getInstance().setCustomKey("Email", sp.getString(R.string.key_email_for_crash_report, ""))
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index ae7a6e4436..9eb8a59a5e 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -46,6 +46,7 @@ import info.nightscout.androidaps.events.EventReloadTreatmentData;
 import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.logging.AAPSLogger;
@@ -54,9 +55,6 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID;
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.utils.PercentageSplitter;
@@ -83,9 +81,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     public static final String DATABASE_DBREQUESTS = "DBRequests";
     public static final String DATABASE_CAREPORTALEVENTS = "CareportalEvents";
     public static final String DATABASE_TDDS = "TDDs";
-    public static final String DATABASE_INSIGHT_HISTORY_OFFSETS = "InsightHistoryOffsets";
-    public static final String DATABASE_INSIGHT_BOLUS_IDS = "InsightBolusIDs";
-    public static final String DATABASE_INSIGHT_PUMP_IDS = "InsightPumpIDs";
     public static final String DATABASE_OPEN_HUMANS_QUEUE = "OpenHumansQueue";
 
     private static final int DATABASE_VERSION = 13;
@@ -138,10 +133,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class);
             TableUtils.createTableIfNotExists(connectionSource, OmnipodHistoryRecord.class);
             TableUtils.createTableIfNotExists(connectionSource, OHQueueItem.class);
-            database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " +
-                    "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\")");
-            database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " +
-                    "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_PUMP_IDS + "\")");
+            database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " +
+                    "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\")");
+            database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " +
+                    "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\")");
         } catch (SQLException e) {
             aapsLogger.error("Can't create database", e);
             throw new RuntimeException(e);
@@ -169,13 +164,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class);
                 TableUtils.createTableIfNotExists(connectionSource, InsightBolusID.class);
                 TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class);
-                database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " +
-                        "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\")");
-                database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " +
-                        "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_PUMP_IDS + "\")");
+                database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " +
+                        "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\")");
+                database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " +
+                        "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\")");
             } else if (oldVersion < 11) {
-                database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\"");
-                database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DATABASE_INSIGHT_PUMP_IDS + "\"");
+                database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_BOLUS_IDS + "\"");
+                database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DatabaseHelperInterface.Companion.DATABASE_INSIGHT_PUMP_IDS + "\"");
             }
             TableUtils.createTableIfNotExists(connectionSource, OHQueueItem.class);
         } catch (SQLException e) {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
index 41f7cabdd9..71d61d7276 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
@@ -108,4 +108,35 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
         return MainApp.getDbHelper().getProfileSwitchData(from, ascending);
     }
 
+    @Override public void createOrUpdate(@NotNull InsightBolusID record) {
+        MainApp.getDbHelper().createOrUpdate(record);
+    }
+
+    @Override public void createOrUpdate(@NotNull InsightPumpID record) {
+        MainApp.getDbHelper().createOrUpdate(record);
+    }
+
+    @Override public void createOrUpdate(@NotNull InsightHistoryOffset record) {
+        MainApp.getDbHelper().createOrUpdate(record);
+    }
+
+    @Override public void delete(@NotNull ExtendedBolus extendedBolus) {
+        MainApp.getDbHelper().delete(extendedBolus);
+    }
+
+    @Nullable @Override public ExtendedBolus getExtendedBolusByPumpId(long pumpId) {
+        return MainApp.getDbHelper().getExtendedBolusByPumpId(pumpId);
+    }
+
+    @Nullable @Override public InsightBolusID getInsightBolusID(@NotNull String pumpSerial, int bolusID, long timestamp) {
+        return MainApp.getDbHelper().getInsightBolusID(pumpSerial, bolusID, timestamp);
+    }
+
+    @Nullable @Override public InsightHistoryOffset getInsightHistoryOffset(@NotNull String pumpSerial) {
+        return MainApp.getDbHelper().getInsightHistoryOffset(pumpSerial);
+    }
+
+    @Nullable @Override public InsightPumpID getPumpStoppedEvent(@NotNull String pumpSerial, long before) {
+        return MainApp.getDbHelper().getPumpStoppedEvent(pumpSerial, before);
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 54f139f0e8..95e0888b79 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -9,12 +9,6 @@ import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSett
 import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansLoginActivity
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
-import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEConfigActivity
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
-import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
-import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
-import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity
-import info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 
 @Module
@@ -22,17 +16,11 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 abstract class ActivitiesModule {
 
     @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity
-    @ContributesAndroidInjector abstract fun contributesInsightAlertActivity(): InsightAlertActivity
-    @ContributesAndroidInjector abstract fun contributesInsightPairingActivity(): InsightPairingActivity
-    @ContributesAndroidInjector abstract fun contributesInsightPairingInformationActivity(): InsightPairingInformationActivity
     @ContributesAndroidInjector abstract fun contributesLogSettingActivity(): LogSettingActivity
     @ContributesAndroidInjector abstract fun contributeMainActivity(): MainActivity
-    @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity
     @ContributesAndroidInjector abstract fun contributesPreferencesActivity(): PreferencesActivity
     @ContributesAndroidInjector abstract fun contributesQuickWizardListActivity(): QuickWizardListActivity
     @ContributesAndroidInjector abstract fun contributesRequestDexcomPermissionActivity(): RequestDexcomPermissionActivity
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): RileyLinkStatusActivity
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBLEConfigActivity(): RileyLinkBLEConfigActivity
     @ContributesAndroidInjector abstract fun contributesSetupWizardActivity(): SetupWizardActivity
     @ContributesAndroidInjector abstract fun contributesSingleFragmentActivity(): SingleFragmentActivity
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorOtpActivity(): SmsCommunicatorOtpActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index 61cb5334b0..f1075e2e9c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -5,12 +5,15 @@ import dagger.Component
 import dagger.android.AndroidInjectionModule
 import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.combo.di.ComboModule
 import info.nightscout.androidaps.core.di.CoreModule
 import info.nightscout.androidaps.dana.di.DanaModule
 import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.danars.di.DanaRSModule
+import info.nightscout.androidaps.danars.di.InsightModule
 import info.nightscout.androidaps.database.DatabaseModule
-import info.nightscout.androidaps.plugins.pump.common.dagger.RileyLinkModule
+import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule
+import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodErosModule
 import javax.inject.Singleton
 
@@ -43,6 +46,8 @@ import javax.inject.Singleton
         DanaModule::class,
         DanaRModule::class,
         DanaRSModule::class,
+        ComboModule::class,
+        InsightModule::class,
         WorkersModule::class,
         OHUploaderModule::class
     ]
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index d7f9e11759..4acdd1f0db 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -30,13 +30,6 @@ import info.nightscout.androidaps.plugins.general.wear.WearFragment
 import info.nightscout.androidaps.plugins.insulin.InsulinFragment
 import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
 import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
-import info.nightscout.androidaps.plugins.pump.combo.ComboFragment
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
-import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodErosOverviewFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
 import info.nightscout.androidaps.plugins.source.BGSourceFragment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment
@@ -52,7 +45,6 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesActionsFragment(): ActionsFragment
     @ContributesAndroidInjector abstract fun contributesAutomationFragment(): AutomationFragment
     @ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
-    @ContributesAndroidInjector abstract fun contributesComboFragment(): ComboFragment
 
     @ContributesAndroidInjector
     abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
@@ -64,11 +56,8 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesOpenAPSAMAFragment(): OpenAPSAMAFragment
     @ContributesAndroidInjector abstract fun contributesOpenAPSSMBFragment(): OpenAPSSMBFragment
     @ContributesAndroidInjector abstract fun contributesOverviewFragment(): OverviewFragment
-    @ContributesAndroidInjector abstract fun contributesLocalInsightFragment(): LocalInsightFragment
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
-    @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
-    @ContributesAndroidInjector abstract fun contributesOmnipodFragment(): OmnipodErosOverviewFragment
     @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
     @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
     @ContributesAndroidInjector
@@ -117,11 +106,4 @@ abstract class FragmentsModule {
     abstract fun contributesExchangeAuthTokenDialot(): OpenHumansLoginActivity.ExchangeAuthTokenDialog
 
     @ContributesAndroidInjector abstract fun contributesPasswordCheck(): PasswordCheck
-
-    @ContributesAndroidInjector
-    abstract fun contributesRileyLinkStatusGeneral(): RileyLinkStatusGeneralFragment
-    @ContributesAndroidInjector
-    abstract fun contributesRileyLinkStatusHistoryFragment(): RileyLinkStatusHistoryFragment
-    @ContributesAndroidInjector
-    abstract fun contributesRileyLinkStatusDeviceMedtronic(): RileyLinkStatusDeviceMedtronic
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
deleted file mode 100644
index cadac7d13c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package info.nightscout.androidaps.dependencyInjection
-
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
-
-@Module
-@Suppress("unused")
-abstract class MedtronicModule {
-    @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager
-    @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): MedtronicUITask
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
index 50f8695bf9..04165b32a1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
@@ -6,11 +6,6 @@ import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientServ
 import info.nightscout.androidaps.plugins.general.overview.notifications.DismissNotificationService
 import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
-import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
-import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
-import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.RileyLinkOmnipodService
 import info.nightscout.androidaps.services.AlarmSoundService
 import info.nightscout.androidaps.services.LocationService
 
@@ -24,9 +19,4 @@ abstract class ServicesModule {
     @ContributesAndroidInjector abstract fun contributesLocationService(): LocationService
     @ContributesAndroidInjector abstract fun contributesNSClientService(): NSClientService
     @ContributesAndroidInjector abstract fun contributesWatchUpdaterService(): WatchUpdaterService
-    @ContributesAndroidInjector abstract fun contributesInsightAlertService(): InsightAlertService
-    @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
-    @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
-    @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
-    @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt
index 2c105e9ce7..1405b8867f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/WizardModule.kt
@@ -18,6 +18,7 @@ abstract class WizardModule {
     @ContributesAndroidInjector abstract fun swEditEncryptedPasswordInjector(): SWEditEncryptedPassword
     @ContributesAndroidInjector abstract fun swEditUrlInjector(): SWEditUrl
     @ContributesAndroidInjector abstract fun swFragmentInjector(): SWFragment
+    @ContributesAndroidInjector abstract fun swPreferenceInjector(): SWPreference
     @ContributesAndroidInjector abstract fun swHtmlLinkInjector(): SWHtmlLink
     @ContributesAndroidInjector abstract fun swInfotextInjector(): SWInfoText
     @ContributesAndroidInjector abstract fun swItemInjector(): SWItem
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
index 36246c4c2c..de7e3f4d4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
@@ -91,7 +91,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
                 commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                         }
                     }
                 })
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
index a736e78367..e818dd8fc1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.general.overview.notifications
 
-import android.annotation.SuppressLint
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -11,14 +10,10 @@ import android.media.RingtoneManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.cardview.widget.CardView
 import androidx.core.app.NotificationCompat
-import androidx.core.app.TaskStackBuilder
 import androidx.recyclerview.widget.RecyclerView
-import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.databinding.OverviewNotificationItemBinding
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -45,8 +40,7 @@ class NotificationStore @Inject constructor(
     private val dateUtil: DateUtil
 ) {
 
-    var store: MutableList<Notification> = ArrayList()
-    private var usesChannels = false
+    private var store: MutableList<Notification> = ArrayList()
 
     companion object {
 
@@ -71,20 +65,19 @@ class NotificationStore @Inject constructor(
             }
         }
         store.add(n)
-        if (sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true) && n !is NotificationWithAction) {
+        if (sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true) && n !is NotificationWithAction)
             raiseSystemNotification(n)
-            if (usesChannels && n.soundId != null && n.soundId != 0) alarmSoundServiceHelper.startAlarm(context, n.soundId)
-        } else {
-            if (n.soundId != null && n.soundId != 0) alarmSoundServiceHelper.startAlarm(context, n.soundId)
-        }
+        if (n.soundId != null && n.soundId != 0) alarmSoundServiceHelper.startAlarm(context, n.soundId)
         Collections.sort(store, NotificationComparator())
         return true
     }
 
-    @Synchronized fun remove(id: Int): Boolean {
+    @Synchronized
+    fun remove(id: Int): Boolean {
         for (i in store.indices) {
             if (store[i].id == id) {
                 if (store[i].soundId != null) alarmSoundServiceHelper.stopService(context)
+                aapsLogger.debug(LTag.NOTIFICATION, "Notification removed: " + store[i].text)
                 store.removeAt(i)
                 return true
             }
@@ -92,11 +85,14 @@ class NotificationStore @Inject constructor(
         return false
     }
 
-    @Synchronized private fun removeExpired() {
+    @Synchronized
+    private fun removeExpired() {
         var i = 0
         while (i < store.size) {
             val n = store[i]
             if (n.validTo != 0L && n.validTo < System.currentTimeMillis()) {
+                if (store[i].soundId != null) alarmSoundServiceHelper.stopService(context)
+                aapsLogger.debug(LTag.NOTIFICATION, "Notification expired: " + store[i].text)
                 store.removeAt(i)
                 i--
             }
@@ -135,20 +131,17 @@ class NotificationStore @Inject constructor(
     }
 
     fun createNotificationChannel() {
-        usesChannels = true
         val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        @SuppressLint("WrongConstant") val channel = NotificationChannel(CHANNEL_ID,
-            CHANNEL_ID,
-            NotificationManager.IMPORTANCE_HIGH)
+        val channel = NotificationChannel(CHANNEL_ID, CHANNEL_ID, NotificationManager.IMPORTANCE_HIGH)
         mNotificationManager.createNotificationChannel(channel)
     }
 
     @Synchronized
     fun updateNotifications(notificationsView: RecyclerView) {
         removeExpired()
-//        unSnooze()
-        if (store.size > 0) {
-            val adapter = NotificationRecyclerViewAdapter(cloneStore())
+        val clonedStore = ArrayList(store)
+        if (clonedStore.isNotEmpty()) {
+            val adapter = NotificationRecyclerViewAdapter(clonedStore)
             notificationsView.adapter = adapter
             notificationsView.visibility = View.VISIBLE
         } else {
@@ -156,33 +149,24 @@ class NotificationStore @Inject constructor(
         }
     }
 
-    @Synchronized
-    private fun cloneStore(): List<Notification> {
-        val clone: MutableList<Notification> = ArrayList(store.size)
-        clone.addAll(store)
-        return clone
-    }
-
     inner class NotificationRecyclerViewAdapter internal constructor(private val notificationsList: List<Notification>) : RecyclerView.Adapter<NotificationRecyclerViewAdapter.NotificationsViewHolder>() {
 
-        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): NotificationsViewHolder {
-            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.overview_notification_item, viewGroup, false)
-            return NotificationsViewHolder(v)
-        }
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): NotificationsViewHolder =
+            NotificationsViewHolder(LayoutInflater.from(viewGroup.context).inflate(R.layout.overview_notification_item, viewGroup, false))
 
         override fun onBindViewHolder(holder: NotificationsViewHolder, position: Int) {
             val notification = notificationsList[position]
-            holder.dismiss.tag = notification
-            if (notification.buttonText != 0) holder.dismiss.setText(notification.buttonText)
-            else holder.dismiss.setText(R.string.snooze)
+            holder.binding.dismiss.tag = notification
+            if (notification.buttonText != 0) holder.binding.dismiss.setText(notification.buttonText)
+            else holder.binding.dismiss.setText(R.string.snooze)
             @Suppress("SetTextI18n")
-            holder.text.text = dateUtil.timeString(notification.date) + " " + notification.text
+            holder.binding.text.text = dateUtil.timeString(notification.date) + " " + notification.text
             when (notification.level) {
-                Notification.URGENT -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationUrgent))
-                Notification.NORMAL -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationNormal))
-                Notification.LOW -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationLow))
-                Notification.INFO -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationInfo))
-                Notification.ANNOUNCEMENT -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationAnnouncement))
+                Notification.URGENT -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationUrgent))
+                Notification.NORMAL -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationNormal))
+                Notification.LOW -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationLow))
+                Notification.INFO -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationInfo))
+                Notification.ANNOUNCEMENT -> holder.binding.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationAnnouncement))
             }
         }
 
@@ -192,12 +176,10 @@ class NotificationStore @Inject constructor(
 
         inner class NotificationsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-            var cv: CardView = itemView.findViewById(R.id.notification_cardview)
-            var text: TextView = itemView.findViewById(R.id.notification_text)
-            var dismiss: Button = itemView.findViewById(R.id.notification_dismiss)
+            val binding = OverviewNotificationItemBinding.bind(itemView)
 
             init {
-                dismiss.setOnClickListener {
+                binding.dismiss.setOnClickListener {
                     val notification = it.tag as Notification
                     rxBus.send(EventDismissNotification(notification.id))
                     notification.action?.run()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyServiceHelper.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyServiceHelper.kt
index d1adfc00ed..5f52035bac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyServiceHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyServiceHelper.kt
@@ -4,9 +4,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.os.Build
 import android.os.IBinder
-import androidx.annotation.RequiresApi
 import info.nightscout.androidaps.interfaces.NotificationHolderInterface
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -14,14 +12,13 @@ import javax.inject.Singleton
 /*
     This code replaces  following
     val alarm = Intent(context, DummyService::class.java)
-    alarm.putExtra("soundid", n.soundId)
+    alarm.putExtra("soundId", n.soundId)
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) context.startForegroundService(alarm) else context.startService(alarm)
 
     it fails randomly with error
     Context.startForegroundService() did not then call Service.startForeground(): ServiceRecord{e317f7e u0 info.nightscout.nsclient/info.nightscout.androidaps.services.DummyService}
 
  */
-@RequiresApi(Build.VERSION_CODES.O)
 @Singleton
 class DummyServiceHelper @Inject constructor(
     private val notificationHolder: NotificationHolderInterface
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
index 0d6defc736..d65114f9ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@@ -30,7 +30,7 @@ import io.reactivex.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Singleton
 
-@Suppress("PrivatePropertyName")
+@Suppress("PrivatePropertyName", "DEPRECATION")
 @Singleton
 class PersistentNotificationPlugin @Inject constructor(
     injector: HasAndroidInjector,
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
index 9a077ce965..5e1dbb7cb5 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -189,6 +189,13 @@ class SWDefinition @Inject constructor(
         .add(SWEditString(injector)
             .validator(SWTextValidator(String::isNotEmpty))
             .preferenceId(R.string.key_patient_name))
+    private val privacy = SWScreen(injector, R.string.privacy_settings)
+        .skippable(true)
+        .add(SWInfoText(injector)
+            .label(R.string.privacy_summary))
+        .add(SWPreference(injector, this)
+            .option(R.xml.pref_datachoices)
+        )
     private val screenMasterPassword = SWScreen(injector, R.string.master_password)
         .skippable(false)
         .add(SWInfoText(injector)
@@ -374,6 +381,7 @@ class SWDefinition @Inject constructor(
             .add(screenPermissionStore)
             .add(screenMasterPassword)
             .add(screenImport)
+            .add(privacy)
             .add(screenUnits)
             .add(displaySettings)
             .add(screenNsClient)
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
index c6cc3f9620..2a25c2ea91 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
@@ -31,8 +31,9 @@ open class SWItem(val injector: HasAndroidInjector, var type: Type) {
         injector.androidInjector().inject(this)
     }
 
+    @Suppress("unused")
     enum class Type {
-        NONE, TEXT, HTML_LINK, BREAK, LISTENER, URL, STRING, NUMBER, DECIMAL_NUMBER, RADIOBUTTON, PLUGIN, BUTTON, FRAGMENT, UNIT_NUMBER
+        NONE, TEXT, HTML_LINK, BREAK, LISTENER, URL, STRING, NUMBER, DECIMAL_NUMBER, RADIOBUTTON, PLUGIN, BUTTON, FRAGMENT, UNIT_NUMBER, PREFERENCE
     }
 
     var label: Int? = null
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt
index 76c140d708..95401bdfab 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.setupwizard.SWDefinition
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
 import javax.inject.Inject
 
-class SWPlugin(injector: HasAndroidInjector, val definition: SWDefinition) : SWItem(injector, Type.PLUGIN) {
+class SWPlugin(injector: HasAndroidInjector, private val definition: SWDefinition) : SWItem(injector, Type.PLUGIN) {
 
     @Inject lateinit var pluginStore: PluginStore
     @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPreference.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPreference.kt
new file mode 100644
index 0000000000..7abafa7c82
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPreference.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.setupwizard.elements
+
+import android.os.Bundle
+import android.widget.LinearLayout
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.activities.MyPreferenceFragment
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.configBuilder.PluginStore
+import info.nightscout.androidaps.setupwizard.SWDefinition
+import javax.inject.Inject
+
+class SWPreference(injector: HasAndroidInjector, private val definition: SWDefinition) : SWItem(injector, Type.PREFERENCE) {
+
+    @Inject lateinit var pluginStore: PluginStore
+    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+
+    private var xml: Int = -1
+
+    fun option(xml: Int): SWPreference {
+        this.xml = xml
+        return this
+    }
+
+    override fun generateDialog(layout: LinearLayout) {
+        addConfiguration(layout, xml)
+        super.generateDialog(layout)
+    }
+
+    private fun addConfiguration(layout: LinearLayout, xml: Int) {
+        MyPreferenceFragment().also { fragment ->
+            fragment.arguments = Bundle().also { it.putInt("id", xml) }
+            definition.activity.supportFragmentManager.beginTransaction().run {
+                replace(layout.id, fragment)
+                commit()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/overview_notification_item.xml b/app/src/main/res/layout/overview_notification_item.xml
index 03b5688fc3..f8f1974d33 100644
--- a/app/src/main/res/layout/overview_notification_item.xml
+++ b/app/src/main/res/layout/overview_notification_item.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/notification_cardview"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cv"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
@@ -16,16 +17,17 @@
         android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/notification_text"
-            android:layout_width="wrap_content"
+            android:id="@+id/text"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:layout_weight="1"
             android:maxLines="4"
-            android:text="Notification text. Notification text. Notification text. Notification text. Notification text. Notification text. " />
+            android:text="Notification text. Notification text. Notification text. Notification text. Notification text. Notification text. "
+            tools:ignore="HardcodedText" />
 
         <Button
-            android:id="@+id/notification_dismiss"
+            android:id="@+id/dismiss"
             android:layout_width="wrap_content"
             android:layout_height="35dp"
             android:text="@string/dismiss" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c0acd512a..f4d5bb15d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,6 +27,8 @@
     <string name="sv_lang" translatable="false">Swedish</string>
     <string name="tr_lang" translatable="false">Turkish</string>
 
+    <string name="key_email_for_crash_report" translatable="false">email_for_crash_report</string>
+
     <string name="treatmentssafety_title">Treatments safety</string>
     <string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Max allowed carbs [g]</string>
@@ -56,7 +58,6 @@
     <string name="description_persistent_notification">Shows an ongoing notification with a short overview of what your loop is doing</string>
     <string name="description_profile_local">Define a profile which is available offline.</string>
     <string name="description_profile_nightscout">Provides the profile you have defined in Nightscout</string>
-    <string name="description_pump_combo">Pump integration for Accu-Chek Combo pumps, requires having ruffy installed</string>
     <string name="description_pump_mdi">Pump integration for people who do multiple daily injections for their diabetes therapy</string>
     <string name="description_pump_virtual">Pump integration for pumps which don\'t have any driver yet (Open Loop)</string>
     <string name="description_sensitivity_aaps">Sensitivity is calculated the same way like Oref0, but you can specify timeframe to the past. Minimal carb absorption is calculated from max carb absorption time from preferences.</string>
@@ -90,7 +91,6 @@
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Run now</string>
     <string name="vitualpump_label">VIRTUAL PUMP</string>
-    <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Last run</string>
     <string name="openapsma_inputparameters_label">Input parameters</string>
     <string name="openapsma_glucosestatus_label">Glucose status</string>
@@ -161,7 +161,6 @@
     <string name="openloop_newsuggestion">New suggestion available</string>
     <string name="carbssuggestion">Carbs Suggestion</string>
     <string name="unsupportednsversion">Unsupported version of Nightscout</string>
-    <string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="bolusconstraintapplied">Bolus constraint applied</string>
     <string name="carbsconstraintapplied">Carbs constraint applied</string>
@@ -231,7 +230,6 @@
     <string name="smscommunicator_remotebolusmindistance_summary">Minimum number of minutes that must elapse between one remote bolus and the next</string>
     <string name="smscommunicator_remotebolusmindistance">How many minutes must elapse, at least, between one bolus and the next</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">For your safety, to edit this preference you need to add at least 2 phone numbers.</string>
-    <string name="bolusdelivered">Bolus %1$.2f U delivered successfully</string>
     <string name="bolusrequested">Going to deliver %1$.2f U</string>
     <string name="smscommunicator_bolusdelivered">Bolus %1$.2f U delivered successfully</string>
     <string name="smscommunicator_mealbolusdelivered">Meal Bolus %1$.2f U delivered successfully</string>
@@ -239,8 +237,6 @@
     <string name="smscommunicator_tt_set">Target %1$s for %2$d minutes set successfully</string>
     <string name="smscommunicator_tt_canceled">Temp Target canceled successfully</string>
     <string name="smscommunicator_remotecommandsallowed">Allow remote commands via SMS</string>
-    <string name="bolusstopped">Bolus stopped</string>
-    <string name="bolusstopping">Stopping bolus</string>
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
     <string name="smscommunicator_loophasbeenenabled">Loop has been enabled</string>
     <string name="smscommunicator_loopisdisabled">Loop is disabled</string>
@@ -388,7 +384,6 @@
     <string name="show_queue">Show queue</string>
     <string name="queue">Queue:</string>
     <string name="status">Status:</string>
-    <string name="paused">Paused</string>
     <string name="key_nsclientinternal_url" translatable="false">nsclientinternal_url</string>
     <string name="key_nsclientinternal_api_secret" translatable="false">nsclientinternal_api_secret</string>
     <string name="clearlog">Clear log</string>
@@ -554,8 +549,6 @@
     <string name="mdtp_cancel">Cancel</string>
     <string name="notloadedplugins">Not all profiles loaded!</string>
     <string name="valuesnotstored">Values not stored!</string>
-    <string name="combopump" translatable="false">Accu-Chek Combo</string>
-    <string name="combopump_shortname" translatable="false">COMBO</string>
     <string name="ns_localbroadcasts">Enable broadcasts to other apps (like xDrip+). Do not enable if you have more than one instance of AAPS or NSClient installed!</string>
     <string name="ns_localbroadcasts_title">Enable local Broadcasts.</string>
     <string name="careportal_newnstreatment_duration_min_label">Duration [min]</string>
@@ -600,7 +593,6 @@
     <string name="shortfat">Fat</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="executingrightnow">Command is executed right now</string>
-    <string name="pump_unreachable">Pump unreachable</string>
     <string name="missed_bg_readings">Missed BG readings</string>
     <string name="key_raise_notifications_as_android_notifications" translatable="false">raise_urgent_alarms_as_android_notification</string>
     <string name="raise_notifications_as_android_notifications">Use system notifications for alerts and notifications</string>
@@ -648,42 +640,7 @@
     <string name="closedmodeenabled">Closed mode enabled</string>
     <string name="maxiobset">Maximal IOB set properly</string>
     <string name="hasbgdata">BG available from selected source</string>
-    <string name="combo_programming_bolus">Programming pump for bolusing</string>
-    <string name="combo_pump_state_label">State</string>
-    <string name="combo_pump_activity_label">Activity</string>
-    <string name="combo_no_pump_connection">No connection for %1$d min</string>
-    <string name="combo_tbr_remaining">%1$d%% (%2$d min remaining)</string>
-    <string name="combo_last_bolus" translatable="false">%1$.1f %2$s (%3$s)</string>
-    <string name="combo_pump_state_initializing">Initializing</string>
-    <string name="combo_pump_state_suspended_due_to_error">Suspended due to error</string>
-    <string name="combo_pump_state_suspended_by_user">Suspended by user</string>
-    <string name="combo_pump_state_running">Running</string>
-    <string name="combo_pump_action_cancelling_tbr">Cancelling TBR</string>
-    <string name="combo_pump_action_setting_tbr">Setting TBR (%1$d%% / %2$d min)</string>
-    <string name="combo_pump_action_bolusing">Bolusing (%1$.1f U)</string>
-    <string name="combo_pump_action_refreshing">Refreshing</string>
-    <string name="combo_pump_unsupported_operation">Requested operation not supported by pump</string>
-    <string name="combo_low_suspend_forced_notification">Unsafe usage: extended or multiwave boluses are active. Loop mode has been set to low-suspend only 6 hours. Only normal boluses are supported in loop mode</string>
-    <string name="combo_force_disabled_notification">Unsafe usage: the pump uses a different basal rate profile than the first. The loop has been disabled. Select the first profile on the pump and refresh.</string>
-    <string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last two minutes. To prevent accidental double boluses and to guard against bugs this is disallowed.</string>
-    <string name="combo_pump_connected_now">Now</string>
-    <string name="combo_activity_reading_pump_history">Reading pump history</string>
-    <string name="combo_activity_setting_basal_profile">Setting basal profile</string>
-    <string name="combo_pump_cartridge_low_warrning">Pump cartridge level is low</string>
-    <string name="combo_pump_battery_low_warrning">Pump battery is low</string>
-    <string name="combo_is_in_error_state">The pump is showing the error E%1$d: %2$s</string>
-    <string name="combo_reservoir_low">Low</string>
-    <string name="combo_reservoir_empty">Empty</string>
-    <string name="combo_reservoir_normal">Normal</string>
-    <string name="combo_notification_check_time_date">Pump clock update needed</string>
-    <string name="combo_pump_tbr_cancelled_warrning">TBR CANCELLED warning was confirmed</string>
-    <string name="combo_error_no_connection_no_bolus_delivered">The pump could not be reached. No bolus was given</string>
-    <string name="combo_error_no_bolus_delivered">Bolus delivery failed. It appears no bolus was delivered. To be sure, please check the pump to avoid a double bolus and then bolus again. To guard against bugs, boluses are not automatically retried.</string>
-    <string name="combo_error_partial_bolus_delivered">Only %1$.2f U of the requested bolus of %2$.2f U was delivered due to an error. Please check the pump to verify this and take appropriate actions.</string>
-    <string name="combo_error_bolus_verification_failed">Delivering the bolus and verifying the pump\'s history failed, please check the pump. If a bolus was delivered, it will be added to treatments during the next connection to the pump.</string>
-    <string name="combo_reservoir_level_insufficient_for_bolus">Not enough insulin for bolus left in reservoir</string>
     <string name="extendedbolusdeliveryerror">Extended bolus delivery error</string>
-    <string name="insightpump_shortname">Sight</string>
     <string name="key_enableSMB_always" translatable="false">enableSMB_always</string>
     <string name="key_enableSMB_with_COB" translatable="false">enableSMB_with_COB</string>
     <string name="key_enableSMB_with_temptarget" translatable="false">enableSMB_with_temptarget</string>
@@ -761,23 +718,8 @@
     <string name="closed_loop_disabled_on_dev_branch">Running dev version. Closed loop is disabled.</string>
     <string name="key_fromNSAreCommingFakedExtendedBoluses" translatable="false">fromNSAreCommingFakedExtendedBoluses</string>
     <string name="engineering_mode_enabled">Engineering mode enabled</string>
-    <string name="combo_actvity_reading_basal_profile">Reading basal profile</string>
-    <string name="combo_bolus_rejected_due_to_pump_history_change">The pump history has changed after the bolus calculation was performed. The bolus was not delivered. Please recalculate if a bolus is still needed.</string>
-    <string name="combo_error_updating_treatment_record">Bolus successfully delivered, but adding the treatment entry failed. This can happen if two small boluses of the same size are administered within the last two minutes. Please check the pump history and treatment entries and use the Careportal to add missing entries. Make sure not to add any entries for the exact same minute and same amount.</string>
-    <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rejecting high temp since calculation didn\'t consider recently changed pump history</string>
-    <string name="combo_activity_checking_pump_state">Refreshing pump state</string>
-    <string name="combo_warning_pump_basal_rate_changed">The basal rate on the pump has changed and will be updated soon</string>
-    <string name="combo_error_failure_reading_changed_basal_rate">Basal rate changed on pump, but reading it failed</string>
-    <string name="combo_activity_checking_for_history_changes">Checking for history changes</string>
-    <string name="combo_error_multiple_boluses_with_identical_timestamp">Multiple boluses with the same amount within the same minute were just imported. Only one record could be added to treatments. Please check the pump and manually add a bolus record using the Careportal tab. Make sure to create a bolus with a time no other bolus uses.</string>
-    <string name="about_link_urls">\n\ndocumentation:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
-    <string name="combo_check_date">The last bolus is older than 24 hours or is in the future. Please check the date on the pump is set correctly.</string>
-    <string name="combo_suspious_bolus_time">Time/date of the delivered bolus on pump seems wrong, IOB is likely incorrect. Please check pump time/date.</string>
     <string name="profileswitch_ismissing">ProfileSwitch missing. Please do a profile switch or press \"Activate Profile\" in the LocalProfile.</string>
-    <string name="combo_bolus_count">Bolus count</string>
-    <string name="combo_tbr_count">TBR count</string>
     <string name="pumpisnottempbasalcapable">Pump is not temp basal capable</string>
-    <string name="novalidbasalrate">No valid basal rate read from pump</string>
     <string name="closedmodedisabledinpreferences">Closed loop mode disabled in preferences</string>
     <string name="autosensdisabledinpreferences">Autosens disabled in preferences</string>
     <string name="smbdisabledinpreferences">SMB disabled in preferences</string>
@@ -793,13 +735,11 @@
     <string name="basal_set_correctly">Basal set correctly</string>
     <string name="key_treatmentssafety_maxbolus" translatable="false">treatmentssafety_maxbolus</string>
     <string name="limitingextendedbolus">Limiting extended bolus to %1$.1f U because of %2$s</string>
-    <string name="limitingmaxiob">Limiting max IOB to %1$.1f U because of %2$s</string>
     <string name="limitingcarbs">Limiting carbs to %1$d g because of %2$s</string>
     <string name="limitingiob">Limiting IOB to %1$.1f U because of %2$s</string>
     <string name="maxvalueinpreferences">max value in preferences</string>
     <string name="hardlimit">hard limit</string>
     <string name="key_treatmentssafety_maxcarbs" translatable="false">treatmentssafety_maxcarbs</string>
-    <string name="unsafeusage">unsafe usage</string>
     <string name="key_openapsama_useautosens" translatable="false">openapsama_useautosens</string>
     <string name="readstatusfailed">Read status failed</string>
     <string name="record_pump_site_change">Record pump site change</string>
@@ -812,9 +752,6 @@
     <string name="key_openapssmb_max_iob" translatable="false">openapsmb_max_iob</string>
     <string name="openapssmb_maxiob_title">Maximum total IOB OpenAPS can\'t go over [U]</string>
     <string name="openapssmb_maxiob_summary">This value is called Max IOB in OpenAPS context\nOpenAPS will not add more insulin if current IOB is greater than this value</string>
-    <string name="pump_stopped">Pump stopped</string>
-    <string name="pump_started">Pump started</string>
-    <string name="pump_paused">Pump paused</string>
     <string name="absorption_cutoff_title">Meal max absorption time [h]</string>
     <string name="absorption_cutoff_summary">Time at which any meal is considered absorbed. Remaining carbs will be cut off.</string>
     <string name="time">Time</string>
@@ -886,7 +823,6 @@
     <string name="needlocationpermission">Application needs location permission for BT scan and WiFi identification</string>
     <string name="needstoragepermission">Application needs storage permission to be able store log files and export settings</string>
     <string name="request">Request</string>
-    <string name="exit">Exit</string>
     <string name="open_navigation">Open navigation</string>
     <string name="close_navigation">Close navigation</string>
     <string name="nav_plugin_preferences">Plugin preferences</string>
@@ -908,7 +844,6 @@
     <string name="key_sensitivity_raises_target" translatable="false">sensitivity_raises_target</string>
     <string name="sensitivity_raises_target_title">Sensitivity raises target</string>
     <string name="sensitivity_raises_target_summary">When sensitivity is detected, raise the target glucose</string>
-    <string name="combo_invalid_setup">Invalid pump setup, check the docs and verify that the Quick Info menu is named QUICK INFO using the 360 configuration software.</string>
     <string name="key_keep_screen_on" translatable="false">keep_screen_on</string>
     <string name="careportal_removestartedevents">Clean AndroidAPS started</string>
     <string name="storedsettingsfound">Stored settings found</string>
@@ -943,76 +878,6 @@
     <string name="loop_openmode_min_change">Minimal request change [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20%</string>
     <string name="key_short_tabtitles" translatable="false">short_tabtitles</string>
-    <string name="searching_for_devices">Searching for devices…</string>
-    <string name="pairing_completed">Pairing completed</string>
-    <string name="code_compare">Do the codes displayed on this device and on your pump match?</string>
-    <string name="insight_pairing">Insight pairing</string>
-    <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2f U / %2$.2f U delivered</string>
-    <string name="insight_alert_formatter">%1$s: %2$s</string>
-    <string name="tube_changed">Tube changed</string>
-    <string name="pump_time_updated">Pump time updated</string>
-    <string name="confirm">Confirm</string>
-    <string name="mute_alert">Mute</string>
-    <string name="pump_alert">Pump alert</string>
-    <string name="log_site_changes">Log site changes</string>
-    <string name="log_reservoir_changes">Log reservoir changes</string>
-    <string name="log_tube_changes">Log tube changes</string>
-    <string name="log_battery_changes">Log battery changes</string>
-    <string name="log_operating_mode_changes">Log operating mode changes</string>
-    <string name="log_alerts">Log alerts</string>
-    <string name="enable_tbr_emulation">Enable TBR emulation</string>
-    <string name="enable_tbr_emulation_summary">Use extended boluses instead of TBRs to bypass the 250%% limit</string>
-    <string name="key_disable_vibration" translatable="false">insight_disable_vibration</string>
-    <string name="disable_vibration">Disable vibrations on manual bolus delivery</string>
-    <string name="disable_vibration_summary">For bolus and extended bolus (only available with Insight firmware 3.x)</string>
-    <string name="key_disable_vibration_auto" translatable="false">insight_disable_vibration_auto</string>
-    <string name="disable_vibration_auto">Disable vibrations on automated bolus delivery</string>
-    <string name="disable_vibration_auto_summary">For SMB and Temp Basal with TBR emulation (only available with Insight firmware 3.x)</string>
-    <string name="disconnect_delay">Disconnect delay [s]</string>
-    <string name="serial_number">Serial number</string>
-    <string name="release_software_version">Release software version</string>
-    <string name="ui_processor_software_version">UI processor software version</string>
-    <string name="pc_processor_software_version">PC processor software version</string>
-    <string name="md_tel_processor_software_version">MD tel processor software version</string>
-    <string name="safety_processor_software_version">Safety processor software version</string>
-    <string name="bt_info_page_version">BT info page version</string>
-    <string name="bluetooth_address">Bluetooth address</string>
-    <string name="system_id_appendix">System ID appendix</string>
-    <string name="manufacturing_date">Manufacturing date</string>
-    <string name="delete_pairing">Delete pairing</string>
-    <string name="pairing_information">Pairing information</string>
-    <string name="start_pump">Start pump</string>
-    <string name="stop_pump">Stop pump</string>
-    <string name="operating_mode">Operating mode</string>
-    <string name="insight_status">Status</string>
-    <string name="tdd_bolus">TDD Bolus</string>
-    <string name="tdd_basal">TDD Basal</string>
-    <string name="tdd_total">TDD Total</string>
-    <string name="recovering">Recovering</string>
-    <string name="not_paired">Not paired</string>
-    <string name="last_connected">Last connected</string>
-    <string name="started">Started</string>
-    <string name="stopped">Stopped</string>
-    <string name="tbr_formatter">%1$d%% for %2$d / %3$d min</string>
-    <string name="extended_bolus">Extended bolus</string>
-    <string name="multiwave_bolus">Multiwave bolus</string>
-    <string name="eb_formatter">%1$.2f / %2$.2f U for %3$d min</string>
-    <string name="enable_tbr_over_notification">Enable notification of TBR end\n(pump setting)</string>
-    <string name="disable_tbr_over_notification">Disable notification of TBR end\n(pump setting)</string>
-    <string name="description_pump_insight_local">Pump integration for Accu-Chek Insight pumps</string>
-    <string name="not_inserted">Not inserted</string>
-    <string name="short_status_last_connected">Last conn: %1$d min ago</string>
-    <string name="short_status_tbr">TBR: %1$d%% for %2$d / %3$d min</string>
-    <string name="short_status_extended">Extended: %1$.2f / %2$.2f U for %3$d min</string>
-    <string name="short_status_multiwave">Multiwave: %1$.2f / %2$.2f U for %3$d min</string>
-    <string name="short_status_tdd">TDD: %1$.2f</string>
-    <string name="short_status_reservoir">Reser.: %1$.2f U</string>
-    <string name="short_status_battery">Batt.: %1$d%%</string>
-    <string name="max_recovery_duration">Max. recovery duration [s]</string>
-    <string name="min_recovery_duration">Min. recovery duration [s]</string>
-    <string name="recovery_duration">Recovery duration</string>
-    <string name="timeout_during_handshake">Timeout during handshake - reset bluetooth</string>
     <string name="weekday_sunday_short">Sun</string>
     <string name="weekday_saturday_short">Sat</string>
     <string name="weekday_friday_short">Fri</string>
@@ -1260,7 +1125,6 @@
     <string name="loop_smbexecution_time_label">SMB execution time</string>
     <string name="loop_tbrrequest_time_label">Temp basal request time</string>
     <string name="loop_tbrexecution_time_label">Temp basal execution time</string>
-    <string name="insight_alert_notification_channel">Insight Pump Alerts</string>
 
     <!-- SMS Communicator & OTP Authenticator -->
 
@@ -1381,5 +1245,9 @@
     <string name="cannula">Cannula</string>
     <string name="userentry">User entry</string>
     <string name="common_values">Use values of your largest food you usually eat\n</string>
+    <string name="summary_email_for_crash_report">This email address will attached to crash reports so we can contact you in urgent cases. It\'s optional.</string>
+    <string name="email_address">Email address</string>
+    <string name="privacy_settings">Privacy setting</string>
+    <string name="privacy_summary">You can provide optional email address if you want to be notified about app crashes. This is not an automated service. You will be contacted by developers in dangerous situations.</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b79d02361d..ecfecd2140 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,12 +16,6 @@
         <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
     </style>
 
-    <style name="InsightAlertDialog" parent="Theme.AppCompat.Dialog.MinWidth">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
     <style name="section_header_label">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/app/src/main/res/xml/pref_datachoices.xml b/app/src/main/res/xml/pref_datachoices.xml
index e60840d09d..d44c622d97 100644
--- a/app/src/main/res/xml/pref_datachoices.xml
+++ b/app/src/main/res/xml/pref_datachoices.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
         android:title="@string/data_choices"
@@ -12,6 +13,15 @@
             android:summary="@string/allow_automated_crash_reporting"
             android:title="@string/fabric_upload" />
 
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:dialogMessage="@string/summary_email_for_crash_report"
+            android:inputType="textEmailAddress"
+            android:key="@string/key_email_for_crash_report"
+            android:selectAllOnFocus="true"
+            android:summary="@string/summary_email_for_crash_report"
+            android:title="@string/email_address"
+            validate:testType="email" />
+
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index df2e00d3af..ffb35d88bf 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -69,10 +69,11 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     @Mock lateinit var uploadQueue: UploadQueue
     @Mock lateinit var uel: UserEntryLogger
     @Mock lateinit var loggerUtils: LoggerUtils
+    @Mock lateinit var databaseHelper: DatabaseHelperInterface
 
-    lateinit var danaPump: DanaPump
+    private lateinit var danaPump: DanaPump
 
-    lateinit var constraintChecker: ConstraintChecker
+    private lateinit var constraintChecker: ConstraintChecker
     private lateinit var safetyPlugin: SafetyPlugin
     private lateinit var objectivesPlugin: ObjectivesPlugin
     private lateinit var comboPlugin: ComboPlugin
@@ -123,10 +124,10 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         danaPump = DanaPump(aapsLogger, sp, injector)
         hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, nsUpload)
         objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, Config(), uel)
-        comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsInterface, sp, commandQueue, context)
+        comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsInterface, sp, commandQueue, context, databaseHelper)
         danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy)
         danaRSPlugin = DanaRSPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
-        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsInterface, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, Config(), dateUtil)
+        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsInterface, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, Config(), dateUtil, databaseHelper)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsInterface, iobCobCalculatorPlugin, hardLimits, profiler, sp)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsInterface, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, BuildHelper(Config(), loggerUtils), treatmentsInterface, Config())
diff --git a/combo/.gitignore b/combo/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/combo/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/combo/build.gradle b/combo/build.gradle
new file mode 100644
index 0000000000..8020051b31
--- /dev/null
+++ b/combo/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'com.hiya.jacoco-android'
+
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+
+
+android {
+    defaultConfig {
+        versionCode 1
+        versionName "1.0"
+    }
+}
+
+dependencies {
+    implementation project(':core')
+}
\ No newline at end of file
diff --git a/combo/consumer-rules.pro b/combo/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/combo/proguard-rules.pro b/combo/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/combo/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/combo/src/main/AndroidManifest.xml b/combo/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..559e7533ca
--- /dev/null
+++ b/combo/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.combo">
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl b/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl
similarity index 100%
rename from app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl
rename to combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl
diff --git a/app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl b/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl
similarity index 100%
rename from app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl
rename to combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl
diff --git a/app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl b/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl
similarity index 100%
rename from app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl
rename to combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl
diff --git a/app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java b/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java
similarity index 100%
rename from app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java
rename to combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java
diff --git a/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboActivitiesModule.kt b/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboActivitiesModule.kt
new file mode 100644
index 0000000000..7e0541a183
--- /dev/null
+++ b/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboActivitiesModule.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.danars.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.combo.ComboFragment
+
+@Module
+@Suppress("unused")
+abstract class ComboActivitiesModule {
+    @ContributesAndroidInjector abstract fun contributesComboFragment(): ComboFragment
+}
\ No newline at end of file
diff --git a/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboModule.kt b/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboModule.kt
new file mode 100644
index 0000000000..b2d117bbc1
--- /dev/null
+++ b/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboModule.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.combo.di
+
+import dagger.Module
+import info.nightscout.androidaps.danars.di.ComboActivitiesModule
+
+@Module(includes = [
+    ComboActivitiesModule::class
+])
+open class ComboModule
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
index fd76ef6ae9..d2358de9d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
+++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
@@ -16,13 +16,13 @@ import androidx.fragment.app.FragmentActivity;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.combo.R;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.combo.events.EventComboPumpUpdateGUI;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.queue.CommandQueue;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
@@ -31,9 +31,9 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 
-public class ComboFragment extends DaggerFragment implements View.OnClickListener {
+public class ComboFragment extends DaggerFragment {
     @Inject ComboPlugin comboPlugin;
-    @Inject CommandQueue commandQueue;
+    @Inject CommandQueueProvider commandQueue;
     @Inject ResourceHelper resourceHelper;
     @Inject RxBusWrapper rxBus;
     @Inject SP sp;
@@ -71,7 +71,15 @@ public class ComboFragment extends DaggerFragment implements View.OnClickListene
         tbrCount = view.findViewById(R.id.combo_tbr_count);
 
         refreshButton = view.findViewById(R.id.combo_refresh_button);
-        refreshButton.setOnClickListener(this);
+        refreshButton.setOnClickListener(v -> {
+            refreshButton.setEnabled(false);
+            commandQueue.readStatus("User request", new Callback() {
+                @Override
+                public void run() {
+                    runOnUiThread(() -> refreshButton.setEnabled(true));
+                }
+            });
+        });
 
         return view;
     }
@@ -105,21 +113,6 @@ public class ComboFragment extends DaggerFragment implements View.OnClickListene
         }
     }
 
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.combo_refresh_button:
-                refreshButton.setEnabled(false);
-                commandQueue.readStatus("User request", new Callback() {
-                    @Override
-                    public void run() {
-                        runOnUiThread(() -> refreshButton.setEnabled(true));
-                    }
-                });
-                break;
-        }
-    }
-
     public void updateGui() {
 
         // state
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index 354468f7aa..cdf9e416d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -6,6 +6,7 @@ import android.os.SystemClock;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
@@ -20,8 +21,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.combo.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -35,6 +35,7 @@ import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
@@ -64,10 +65,8 @@ import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpH
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tdd;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.InstanceId;
-import info.nightscout.androidaps.utils.TimeChangeType;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -79,13 +78,13 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
     static final String COMBO_TBRS_SET = "combo_tbrs_set";
     static final String COMBO_BOLUSES_DELIVERED = "combo_boluses_delivered";
 
-    private final ResourceHelper resourceHelper;
     private final ProfileFunction profileFunction;
     private final TreatmentsInterface treatmentsPlugin;
     private final info.nightscout.androidaps.utils.sharedPreferences.SP sp;
     private RxBusWrapper rxBus;
     private final CommandQueueProvider commandQueue;
     private final Context context;
+    private final DatabaseHelperInterface databaseHelper;
 
     private final static PumpDescription pumpDescription = new PumpDescription();
 
@@ -140,7 +139,8 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
             TreatmentsInterface treatmentsPlugin,
             SP sp,
             CommandQueueProvider commandQueue,
-            Context context
+            Context context,
+            DatabaseHelperInterface databaseHelper
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.PUMP)
@@ -152,12 +152,12 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
                 injector, aapsLogger, resourceHelper, commandQueue
         );
         this.rxBus = rxBus;
-        this.resourceHelper = resourceHelper;
         this.profileFunction = profileFunction;
         this.treatmentsPlugin = treatmentsPlugin;
         this.sp = sp;
         this.commandQueue = commandQueue;
         this.context = context;
+        this.databaseHelper = databaseHelper;
 
         pumpDescription.setPumpDescription(PumpType.AccuChekCombo);
     }
@@ -752,9 +752,9 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
         }
 
         if (adjustedPercent % 10 != 0) {
-            Long rounded = Math.round(adjustedPercent / 10d) * 10;
+            long rounded = Math.round(adjustedPercent / 10d) * 10;
             getAapsLogger().debug(LTag.PUMP, "Rounded requested percentage:" + adjustedPercent + " -> " + rounded);
-            adjustedPercent = rounded.intValue();
+            adjustedPercent = (int) rounded;
         }
 
         // do a soft TBR-cancel when requested rate was rounded to 100% (>94% && <104%)
@@ -964,8 +964,7 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
             checkAndResolveTbrMismatch(preCheckResult.state);
             checkPumpTime(preCheckResult.state);
             checkBasalRate(preCheckResult.state);
-            CommandResult historyCheckError = checkHistory();
-            return historyCheckError;
+            return checkHistory();
         } else {
             long now = System.currentTimeMillis();
             TemporaryBasal aapsTbr = treatmentsPlugin.getTempBasalFromHistory(now);
@@ -1256,7 +1255,7 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
     }
 
     @NonNull @Override
-    public JSONObject getJSONStatus(Profile profile, String profileName, String version) {
+    public JSONObject getJSONStatus(@NotNull Profile profile, @NotNull String profileName, @NotNull String version) {
         if (!pump.initialized) {
             return null;
         }
@@ -1360,7 +1359,7 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
                 Collection<TDD> uniqueColl = map.values();
 
                 for (TDD currTdd : uniqueColl) {
-                    MainApp.getDbHelper().createOrUpdateTDD(currTdd);
+                    databaseHelper.createOrUpdateTDD(currTdd);
                 }
             }
         }
@@ -1390,10 +1389,4 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
     public boolean canHandleDST() {
         return false;
     }
-
-    @Override
-    public void timezoneOrDSTChanged(TimeChangeType changeType) {
-    }
-
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.kt b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.kt
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java
rename to combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java
diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
similarity index 100%
rename from app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
rename to combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java
similarity index 100%
rename from app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java
rename to combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java
diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java
similarity index 100%
rename from app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java
rename to combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java
diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java
similarity index 100%
rename from app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java
rename to combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java
diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java
similarity index 100%
rename from app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java
rename to combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java
diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java
similarity index 100%
rename from app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java
rename to combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java
diff --git a/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java b/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java
similarity index 100%
rename from app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java
rename to combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java
diff --git a/app/src/main/res/drawable/ic_combo.xml b/combo/src/main/res/drawable/ic_combo.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_combo.xml
rename to combo/src/main/res/drawable/ic_combo.xml
diff --git a/app/src/main/res/drawable/ic_combo_128.xml b/combo/src/main/res/drawable/ic_combo_128.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_combo_128.xml
rename to combo/src/main/res/drawable/ic_combo_128.xml
diff --git a/app/src/main/res/layout/combopump_fragment.xml b/combo/src/main/res/layout/combopump_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/combopump_fragment.xml
rename to combo/src/main/res/layout/combopump_fragment.xml
diff --git a/combo/src/main/res/values/strings.xml b/combo/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..5c41d1ab90
--- /dev/null
+++ b/combo/src/main/res/values/strings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="combopump" translatable="false">Accu-Chek Combo</string>
+    <string name="combopump_shortname" translatable="false">COMBO</string>
+    <string name="description_pump_combo">Pump integration for Accu-Chek Combo pumps, requires having ruffy installed</string>
+    <string name="combo_programming_bolus">Programming pump for bolusing</string>
+    <string name="combo_pump_state_label">State</string>
+    <string name="combo_pump_activity_label">Activity</string>
+    <string name="combo_no_pump_connection">No connection for %1$d min</string>
+    <string name="combo_tbr_remaining">%1$d%% (%2$d min remaining)</string>
+    <string name="combo_last_bolus" translatable="false">%1$.1f %2$s (%3$s)</string>
+    <string name="combo_pump_state_initializing">Initializing</string>
+    <string name="combo_pump_state_suspended_due_to_error">Suspended due to error</string>
+    <string name="combo_pump_state_suspended_by_user">Suspended by user</string>
+    <string name="combo_pump_state_running">Running</string>
+    <string name="combo_pump_action_cancelling_tbr">Cancelling TBR</string>
+    <string name="combo_pump_action_setting_tbr">Setting TBR (%1$d%% / %2$d min)</string>
+    <string name="combo_pump_action_bolusing">Bolusing (%1$.1f U)</string>
+    <string name="combo_pump_action_refreshing">Refreshing</string>
+    <string name="combo_pump_unsupported_operation">Requested operation not supported by pump</string>
+    <string name="combo_low_suspend_forced_notification">Unsafe usage: extended or multiwave boluses are active. Loop mode has been set to low-suspend only 6 hours. Only normal boluses are supported in loop mode</string>
+    <string name="combo_force_disabled_notification">Unsafe usage: the pump uses a different basal rate profile than the first. The loop has been disabled. Select the first profile on the pump and refresh.</string>
+    <string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last two minutes. To prevent accidental double boluses and to guard against bugs this is disallowed.</string>
+    <string name="combo_pump_connected_now">Now</string>
+    <string name="combo_activity_reading_pump_history">Reading pump history</string>
+    <string name="combo_activity_setting_basal_profile">Setting basal profile</string>
+    <string name="combo_pump_cartridge_low_warrning">Pump cartridge level is low</string>
+    <string name="combo_pump_battery_low_warrning">Pump battery is low</string>
+    <string name="combo_is_in_error_state">The pump is showing the error E%1$d: %2$s</string>
+    <string name="combo_reservoir_low">Low</string>
+    <string name="combo_reservoir_empty">Empty</string>
+    <string name="combo_reservoir_normal">Normal</string>
+    <string name="combo_notification_check_time_date">Pump clock update needed</string>
+    <string name="combo_pump_tbr_cancelled_warrning">TBR CANCELLED warning was confirmed</string>
+    <string name="combo_error_no_connection_no_bolus_delivered">The pump could not be reached. No bolus was given</string>
+    <string name="combo_error_no_bolus_delivered">Bolus delivery failed. It appears no bolus was delivered. To be sure, please check the pump to avoid a double bolus and then bolus again. To guard against bugs, boluses are not automatically retried.</string>
+    <string name="combo_error_partial_bolus_delivered">Only %1$.2f U of the requested bolus of %2$.2f U was delivered due to an error. Please check the pump to verify this and take appropriate actions.</string>
+    <string name="combo_error_bolus_verification_failed">Delivering the bolus and verifying the pump\'s history failed, please check the pump. If a bolus was delivered, it will be added to treatments during the next connection to the pump.</string>
+    <string name="combo_reservoir_level_insufficient_for_bolus">Not enough insulin for bolus left in reservoir</string>
+    <string name="combo_invalid_setup">Invalid pump setup, check the docs and verify that the Quick Info menu is named QUICK INFO using the 360 configuration software.</string>
+    <string name="combo_actvity_reading_basal_profile">Reading basal profile</string>
+    <string name="combo_bolus_rejected_due_to_pump_history_change">The pump history has changed after the bolus calculation was performed. The bolus was not delivered. Please recalculate if a bolus is still needed.</string>
+    <string name="combo_error_updating_treatment_record">Bolus successfully delivered, but adding the treatment entry failed. This can happen if two small boluses of the same size are administered within the last two minutes. Please check the pump history and treatment entries and use the Careportal to add missing entries. Make sure not to add any entries for the exact same minute and same amount.</string>
+    <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rejecting high temp since calculation didn\'t consider recently changed pump history</string>
+    <string name="combo_activity_checking_pump_state">Refreshing pump state</string>
+    <string name="combo_warning_pump_basal_rate_changed">The basal rate on the pump has changed and will be updated soon</string>
+    <string name="combo_error_failure_reading_changed_basal_rate">Basal rate changed on pump, but reading it failed</string>
+    <string name="combo_activity_checking_for_history_changes">Checking for history changes</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">Multiple boluses with the same amount within the same minute were just imported. Only one record could be added to treatments. Please check the pump and manually add a bolus record using the Careportal tab. Make sure to create a bolus with a time no other bolus uses.</string>
+    <string name="about_link_urls">\n\ndocumentation:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
+    <string name="combo_check_date">The last bolus is older than 24 hours or is in the future. Please check the date on the pump is set correctly.</string>
+    <string name="combo_suspious_bolus_time">Time/date of the delivered bolus on pump seems wrong, IOB is likely incorrect. Please check pump time/date.</string>
+    <string name="combo_bolus_count">Bolus count</string>
+    <string name="combo_tbr_count">TBR count</string>
+    <string name="bolusstopped">Bolus stopped</string>
+    <string name="bolusstopping">Stopping bolus</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt b/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
similarity index 76%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
rename to combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
index bf455dd0bc..78207ea792 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
+++ b/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
@@ -4,19 +4,10 @@ import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.combo.R
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
@@ -29,17 +20,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(MainApp::class, ConfigBuilderPlugin::class, ConstraintChecker::class, Context::class, CommandQueue::class)
+@PrepareForTest(Context::class)
 class ComboPluginTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var profileFunction: ProfileFunction
-    @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var commandQueue: CommandQueueProvider
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var treatmentsPlugin: TreatmentsInterface
     @Mock lateinit var sp: SP
     @Mock lateinit var context: Context
+    @Mock lateinit var databaseHelper: DatabaseHelperInterface
 
     val injector = HasAndroidInjector {
         AndroidInjector {
@@ -51,7 +42,7 @@ class ComboPluginTest : TestBase() {
     @Before
     fun prepareMocks() {
         `when`(resourceHelper.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump")
-        comboPlugin = ComboPlugin(injector, aapsLogger, RxBusWrapper(aapsSchedulers), resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
+        comboPlugin = ComboPlugin(injector, aapsLogger, RxBusWrapper(aapsSchedulers), resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context, databaseHelper)
     }
 
     @Test
diff --git a/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/TestBase.kt b/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/TestBase.kt
new file mode 100644
index 0000000000..573c9dcbcc
--- /dev/null
+++ b/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/TestBase.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps
+
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
+import org.junit.Before
+import org.junit.Rule
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import java.util.*
+
+@Suppress("SpellCheckingInspection")
+open class TestBase {
+
+    val aapsLogger = AAPSLoggerTest()
+    val aapsSchedulers: AapsSchedulers = TestAapsSchedulers()
+
+    // Add a JUnit rule that will setup the @Mock annotated vars and log.
+    // Another possibility would be to add `MockitoAnnotations.initMocks(this) to the setup method.
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    @Before
+    fun setupLocale() {
+        Locale.setDefault(Locale.ENGLISH)
+        System.setProperty("disableFirebase", "true")
+    }
+
+    // Workaround for Kotlin nullability.
+    // https://medium.com/@elye.project/befriending-kotlin-and-mockito-1c2e7b0ef791
+    // https://stackoverflow.com/questions/30305217/is-it-possible-to-use-mockito-in-kotlin
+    fun <T> anyObject(): T {
+        Mockito.any<T>()
+        return uninitialized()
+    }
+
+    @Suppress("Unchecked_Cast")
+    fun <T> uninitialized(): T = null as T
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.java b/core/src/main/java/info/nightscout/androidaps/db/InsightBolusID.java
similarity index 68%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.java
rename to core/src/main/java/info/nightscout/androidaps/db/InsightBolusID.java
index 16fa232a40..b860fa5b03 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/InsightBolusID.java
@@ -1,11 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.insight.database;
+package info.nightscout.androidaps.db;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import info.nightscout.androidaps.db.DatabaseHelper;
-
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_INSIGHT_BOLUS_IDS)
+@DatabaseTable(tableName = "InsightBolusIDs")
 public class InsightBolusID {
 
     @DatabaseField(generatedId = true)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.java b/core/src/main/java/info/nightscout/androidaps/db/InsightHistoryOffset.java
similarity index 56%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.java
rename to core/src/main/java/info/nightscout/androidaps/db/InsightHistoryOffset.java
index 05f9d2d5e3..0d30acbe68 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/InsightHistoryOffset.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.insight.database;
+package info.nightscout.androidaps.db;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import info.nightscout.androidaps.db.DatabaseHelper;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_INSIGHT_HISTORY_OFFSETS)
+@DatabaseTable(tableName = "InsightHistoryOffsets")
 public class InsightHistoryOffset {
 
     @DatabaseField(id = true, canBeNull = false)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.java b/core/src/main/java/info/nightscout/androidaps/db/InsightPumpID.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.java
rename to core/src/main/java/info/nightscout/androidaps/db/InsightPumpID.java
index 7bd70b9185..2e2bf05253 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/InsightPumpID.java
@@ -1,11 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.insight.database;
+package info.nightscout.androidaps.db;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import info.nightscout.androidaps.db.DatabaseHelper;
-
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_INSIGHT_PUMP_IDS)
+@DatabaseTable(tableName = "InsightPumpIDs")
 public class InsightPumpID {
 
     @DatabaseField(generatedId = true)
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventUpdateGui.kt b/core/src/main/java/info/nightscout/androidaps/events/EventUpdateGui.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventUpdateGui.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventUpdateGui.kt
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
index d3edb553bb..f68d074412 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -8,12 +8,16 @@ interface DatabaseHelperInterface {
     fun createOrUpdate(careportalEvent: CareportalEvent)
     fun createOrUpdate(record: DanaRHistoryRecord)
     fun createOrUpdate(record: OmnipodHistoryRecord)
+    fun createOrUpdate(record: InsightBolusID)
+    fun createOrUpdate(record: InsightPumpID)
+    fun createOrUpdate(record: InsightHistoryOffset)
     fun create(record: DbRequest)
     fun getDanaRHistoryRecordsByType(type: Byte): List<DanaRHistoryRecord>
     fun getTDDs(): List<TDD>
     fun size(table: String): Long
     fun deleteAllDbRequests()
     fun deleteDbRequest(id: String): Int
+    fun delete(extendedBolus: ExtendedBolus)
     fun deleteDbRequestbyMongoId(action: String, _id: String)
     fun getDbRequestInterator(): CloseableIterator<DbRequest>
     fun roundDateToSec(date: Long): Long
@@ -26,4 +30,16 @@ interface DatabaseHelperInterface {
     fun findOmnipodHistoryRecordByPumpId(pumpId: Long): OmnipodHistoryRecord?
     fun getTDDsForLastXDays(days: Int): List<TDD>
     fun getProfileSwitchData(from: Long, ascending: Boolean): List<ProfileSwitch>
+    fun getExtendedBolusByPumpId(pumpId: Long): ExtendedBolus?
+
+    fun getInsightBolusID(pumpSerial: String, bolusID: Int, timestamp: Long): InsightBolusID?
+    fun getInsightHistoryOffset(pumpSerial: String): InsightHistoryOffset?
+    fun getPumpStoppedEvent(pumpSerial: String, before: Long): InsightPumpID?
+
+    companion object {
+
+        const val DATABASE_INSIGHT_HISTORY_OFFSETS = "InsightHistoryOffsets"
+        const val DATABASE_INSIGHT_BOLUS_IDS = "InsightBolusIDs"
+        const val DATABASE_INSIGHT_PUMP_IDS = "InsightPumpIDs"
+    }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java
index d051d43501..a9bef5cac2 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java
@@ -5,4 +5,5 @@ import info.nightscout.androidaps.db.DbRequest;
 public interface UploadQueueInterface {
 
     void add(DbRequest dbRequest);
+    void removeID(final String action, final String _id);
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt
index 2ea92fd952..5da7968e88 100644
--- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundServiceHelper.kt
@@ -4,31 +4,32 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.os.Build
 import android.os.IBinder
-import androidx.annotation.RequiresApi
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.interfaces.NotificationHolderInterface
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /*
     This code replaces  following
     val alarm = Intent(context, AlarmSoundService::class.java)
-    alarm.putExtra("soundid", n.soundId)
+    alarm.putExtra("soundId", n.soundId)
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) context.startForegroundService(alarm) else context.startService(alarm)
 
     it fails randomly with error
     Context.startForegroundService() did not then call Service.startForeground(): ServiceRecord{e317f7e u0 info.nightscout.nsclient/info.nightscout.androidaps.services.AlarmSoundService}
 
  */
-@RequiresApi(Build.VERSION_CODES.O)
 @Singleton
 class AlarmSoundServiceHelper @Inject constructor(
+    private val aapsLogger: AAPSLogger,
     private val notificationHolder: NotificationHolderInterface
 ) {
 
     fun startAlarm(context: Context, sound: Int) {
+        aapsLogger.debug(LTag.CORE, "Starting alarm")
         val connection = object : ServiceConnection {
             override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
                 // The binder of the service that returns the instance that is created.
@@ -62,6 +63,7 @@ class AlarmSoundServiceHelper @Inject constructor(
     }
 
     fun stopService(context: Context) {
+        aapsLogger.debug(LTag.CORE, "Stopping alarm")
         val alarm = Intent(context, AlarmSoundService::class.java)
         context.stopService(alarm)
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt b/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
index 1efe3a9ff6..6e36c3a659 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
@@ -2,12 +2,10 @@ package info.nightscout.androidaps.utils.protection
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.EditText
 import android.widget.TextView
-import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.CryptoUtil
@@ -20,7 +18,6 @@ import javax.inject.Singleton
 // since androidx.autofill.HintConstants are not available
 const val AUTOFILL_HINT_NEW_PASSWORD = "newPassword"
 
-@RequiresApi(Build.VERSION_CODES.O)
 @Singleton
 class PasswordCheck @Inject constructor(
     val sp: SP,
diff --git a/app/src/main/res/raw/alarm.mp3 b/core/src/main/res/raw/alarm.mp3
similarity index 100%
rename from app/src/main/res/raw/alarm.mp3
rename to core/src/main/res/raw/alarm.mp3
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 7d22c30592..04c79461f2 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -99,6 +99,17 @@
     <string name="pairing">Pairing</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
+    <string name="bolusdelivered">Bolus %1$.2f U delivered successfully</string>
+    <string name="virtualpump_resultok">OK</string>
+    <string name="novalidbasalrate">No valid basal rate read from pump</string>
+    <string name="limitingmaxiob">Limiting max IOB to %1$.1f U because of %2$s</string>
+    <string name="unsafeusage">unsafe usage</string>
+    <string name="pump_unreachable">Pump unreachable</string>
+    <string name="extended_bolus">Extended bolus</string>
+    <string name="pump_time_updated">Pump time updated</string>
+    <string name="exit">Exit</string>
+    <string name="serial_number">Serial number</string>
 
     <!--    Constraints-->
     <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>
diff --git a/crowdin.yml b/crowdin.yml
index 7339e43604..129302efd1 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,8 +1,6 @@
 files:
   - source: /app/src/main/res/values/strings.xml
     translation: /app/src/main/res/values-%android_code%/strings.xml
-  - source: /app/src/main/res/values/insight_*.xml
-    translation: /app/src/main/res/values-%android_code%/%original_file_name%
   - source: /app/src/main/res/values/exam.xml
     translation: /app/src/main/res/values-%android_code%/%original_file_name%
   - source: /app/src/main/res/values/objectives.xml
@@ -11,10 +9,12 @@ files:
     translation: /wear/src/main/res/values-%android_code%/strings.xml
   - source: /app/src/main/res/values/protection.xml
     translation: /app/src/main/res/values-%android_code%/protection.xml
-  - source: /app/src/main/res/values/validator.xml
-    translation: /app/src/main/res/values-%android_code%/validator.xml
+  - source: /core/src/main/res/values/validator.xml
+    translation: /core/src/main/res/values-%android_code%/validator.xml
   - source: /core/src/main/res/values/strings.xml
     translation: /core/src/main/res/values-%android_code%/strings.xml
+  - source: /combo/src/main/res/values/strings.xml
+    translation: /combo/src/main/res/values-%android_code%/strings.xml
   - source: /dana/src/main/res/values/strings.xml
     translation: /dana/src/main/res/values-%android_code%/strings.xml
   - source: /medtronic/src/main/res/values/strings.xml
@@ -27,3 +27,7 @@ files:
     translation: /omnipod-eros/src/main/res/values-%android_code%/strings.xml
   - source: /rileylink/src/main/res/values/strings.xml
     translation: /rileylink/src/main/res/values-%android_code%/strings.xml
+  - source: /insight/src/main/res/values/strings.xml
+    translation: /insight/src/main/res/values-%android_code%/strings.xml
+  - source: /insight/src/main/res/values/insight_*.xml
+    translation: /insight/src/main/res/values-%android_code%/%original_file_name%
diff --git a/insight/.gitignore b/insight/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/insight/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/insight/build.gradle b/insight/build.gradle
new file mode 100644
index 0000000000..8020051b31
--- /dev/null
+++ b/insight/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'com.hiya.jacoco-android'
+
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+
+
+android {
+    defaultConfig {
+        versionCode 1
+        versionName "1.0"
+    }
+}
+
+dependencies {
+    implementation project(':core')
+}
\ No newline at end of file
diff --git a/insight/consumer-rules.pro b/insight/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/insight/proguard-rules.pro b/insight/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/insight/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/insight/src/main/AndroidManifest.xml b/insight/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..feecfc8067
--- /dev/null
+++ b/insight/src/main/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.insight">
+
+    <application>
+        <activity
+            android:name="info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity"
+            android:label="@string/insight_pairing"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name="info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity"
+            android:label="@string/pump_alert"
+            android:excludeFromRecents="true"
+            android:launchMode="singleInstance"
+            android:theme="@style/InsightAlertDialog" />
+        <activity
+            android:name="info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity"
+            android:label="@string/pairing_information"
+            android:theme="@style/AppTheme" />
+
+        <service android:name="info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService" />
+        <service android:name="info.nightscout.androidaps.plugins.pump.insight.InsightAlertService" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightActivitiesModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightActivitiesModule.kt
new file mode 100644
index 0000000000..7a3024a501
--- /dev/null
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightActivitiesModule.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.danars.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
+import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
+import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
+import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity
+
+@Module
+@Suppress("unused")
+abstract class InsightActivitiesModule {
+    @ContributesAndroidInjector abstract fun contributesInsightAlertActivity(): InsightAlertActivity
+    @ContributesAndroidInjector abstract fun contributesInsightPairingActivity(): InsightPairingActivity
+    @ContributesAndroidInjector abstract fun contributesInsightPairingInformationActivity(): InsightPairingInformationActivity
+
+    @ContributesAndroidInjector abstract fun contributesLocalInsightFragment(): LocalInsightFragment
+}
\ No newline at end of file
diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt
new file mode 100644
index 0000000000..4aeed99770
--- /dev/null
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.danars.di
+
+import dagger.Module
+
+@Module
+@Suppress("unused")
+abstract class InsightCommModule {
+}
\ No newline at end of file
diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightModule.kt
new file mode 100644
index 0000000000..59d3a3de2a
--- /dev/null
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightModule.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.danars.di
+
+import dagger.Module
+
+@Module(includes = [
+    InsightCommModule::class,
+    InsightActivitiesModule::class,
+    InsightServicesModule::class
+])
+open class InsightModule
\ No newline at end of file
diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightServicesModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightServicesModule.kt
new file mode 100644
index 0000000000..3d9a4bc52e
--- /dev/null
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightServicesModule.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.danars.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
+import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
+
+@Module
+@Suppress("unused")
+abstract class InsightServicesModule {
+
+    @ContributesAndroidInjector abstract fun contributesInsightAlertService(): InsightAlertService
+    @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 71d3c2075b..a134c904be 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -17,7 +17,7 @@ import androidx.lifecycle.MutableLiveData;
 import javax.inject.Inject;
 
 import dagger.android.DaggerService;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.insight.R;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index 82523c20dd..1fe4faf9bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.insight;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -19,7 +20,8 @@ import java.util.List;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.insight.R;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate;
@@ -30,7 +32,6 @@ import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.TotalDailyDose;
 import info.nightscout.androidaps.plugins.pump.insight.events.EventLocalInsightUpdateGUI;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.queue.CommandQueue;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
@@ -40,7 +41,7 @@ import io.reactivex.disposables.CompositeDisposable;
 
 public class LocalInsightFragment extends DaggerFragment implements View.OnClickListener {
     @Inject LocalInsightPlugin localInsightPlugin;
-    @Inject CommandQueue commandQueue;
+    @Inject CommandQueueProvider commandQueue;
     @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
     @Inject FabricPrivacy fabricPrivacy;
@@ -186,7 +187,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
     }
 
     private View getStatusItem(String label, String value) {
-        View statusItem = getLayoutInflater().inflate(R.layout.local_insight_status_item, null);
+        @SuppressLint("InflateParams") View statusItem = getLayoutInflater().inflate(R.layout.local_insight_status_item, null);
         ((TextView) statusItem.findViewById(R.id.label)).setText(label);
         ((TextView) statusItem.findViewById(R.id.value)).setText(value);
         return statusItem;
@@ -238,7 +239,6 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
             default:
                 long lastConnection = localInsightPlugin.getConnectionService().getLastConnected();
                 if (lastConnection == 0) return;
-                int min = (int) ((System.currentTimeMillis() - lastConnection) / 60000);
                 statusItems.add(getStatusItem(resourceHelper.gs(R.string.last_connected), dateUtil.timeString(lastConnection)));
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 638439e728..6fc64de812 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -26,9 +26,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -40,9 +37,12 @@ import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventRefreshOverview;
+import info.nightscout.androidaps.insight.R;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.ConfigInterface;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
@@ -50,12 +50,12 @@ import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
+import info.nightscout.androidaps.interfaces.UploadQueueInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -108,9 +108,9 @@ import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetPumpS
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetTotalDailyDoseMessage;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.ResetPumpStatusRegisterMessage;
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID;
+import info.nightscout.androidaps.db.InsightBolusID;
+import info.nightscout.androidaps.db.InsightHistoryOffset;
+import info.nightscout.androidaps.db.InsightPumpID;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR;
@@ -147,8 +147,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
     private final ProfileFunction profileFunction;
     private final NSUpload nsUpload;
     private final Context context;
-    private final UploadQueue uploadQueue;
+    private final UploadQueueInterface uploadQueue;
     private final DateUtil dateUtil;
+    private final DatabaseHelperInterface databaseHelper;
 
     public static final String ALERT_CHANNEL_ID = "AndroidAPS-InsightAlert";
 
@@ -209,9 +210,10 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             ProfileFunction profileFunction,
             NSUpload nsUpload,
             Context context,
-            UploadQueue uploadQueue,
-            Config config,
-            DateUtil dateUtil
+            UploadQueueInterface uploadQueue,
+            ConfigInterface config,
+            DateUtil dateUtil,
+            DatabaseHelperInterface databaseHelper
     ) {
         super(new PluginDescription()
                         .pluginIcon(R.drawable.ic_insight_128)
@@ -235,6 +237,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         this.context = context;
         this.uploadQueue = uploadQueue;
         this.dateUtil = dateUtil;
+        this.databaseHelper = databaseHelper;
 
         pumpDescription = new PumpDescription();
         pumpDescription.setPumpDescription(PumpType.AccuChekInsightBluetooth);
@@ -606,7 +609,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                 insightBolusID.bolusID = bolusID;
                 insightBolusID.timestamp = System.currentTimeMillis();
                 insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber();
-                MainApp.getDbHelper().createOrUpdate(insightBolusID);
+                databaseHelper.createOrUpdate(insightBolusID);
                 detailedBolusInfo.date = insightBolusID.timestamp;
                 detailedBolusInfo.source = Source.PUMP;
                 detailedBolusInfo.pumpId = insightBolusID.id;
@@ -820,7 +823,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             insightBolusID.bolusID = bolusID;
             insightBolusID.timestamp = System.currentTimeMillis();
             insightBolusID.pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber();
-            MainApp.getDbHelper().createOrUpdate(insightBolusID);
+            databaseHelper.createOrUpdate(insightBolusID);
             ExtendedBolus extendedBolus = new ExtendedBolus(getInjector());
             extendedBolus.date = insightBolusID.timestamp;
             extendedBolus.source = Source.PUMP;
@@ -920,10 +923,10 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                     connectionService.requestMessage(cancelBolusMessage).await();
                     confirmAlert(AlertType.WARNING_38);
                     alertService.ignore(null);
-                    InsightBolusID insightBolusID = MainApp.getDbHelper().getInsightBolusID(connectionService.getPumpSystemIdentification().getSerialNumber(),
+                    InsightBolusID insightBolusID = databaseHelper.getInsightBolusID(connectionService.getPumpSystemIdentification().getSerialNumber(),
                             activeBolus.getBolusID(), System.currentTimeMillis());
                     if (insightBolusID != null) {
-                        ExtendedBolus extendedBolus = MainApp.getDbHelper().getExtendedBolusByPumpId(insightBolusID.id);
+                        ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(insightBolusID.id);
                         if (extendedBolus != null) {
                             extendedBolus.durationInMinutes = (int) ((System.currentTimeMillis() - extendedBolus.date) / 60000);
                             if (extendedBolus.durationInMinutes <= 0) {
@@ -931,7 +934,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                                 if (NSUpload.isIdValid(_id))
                                     nsUpload.removeCareportalEntryFromNS(_id);
                                 else uploadQueue.removeID("dbAdd", _id);
-                                MainApp.getDbHelper().delete(extendedBolus);
+                                databaseHelper.delete(extendedBolus);
                             } else
                                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus);
                         }
@@ -1162,7 +1165,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             String pumpSerial = connectionService.getPumpSystemIdentification().getSerialNumber();
             timeOffset = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() - parseDate(pumpTime.getYear(),
                     pumpTime.getMonth(), pumpTime.getDay(), pumpTime.getHour(), pumpTime.getMinute(), pumpTime.getSecond());
-            InsightHistoryOffset historyOffset = MainApp.getDbHelper().getInsightHistoryOffset(pumpSerial);
+            InsightHistoryOffset historyOffset = databaseHelper.getInsightHistoryOffset(pumpSerial);
             try {
                 List<HistoryEvent> historyEvents = new ArrayList<>();
                 if (historyOffset == null) {
@@ -1189,7 +1192,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                     historyOffset = new InsightHistoryOffset();
                     historyOffset.pumpSerial = pumpSerial;
                     historyOffset.offset = historyEvents.get(0).getEventPosition();
-                    MainApp.getDbHelper().createOrUpdate(historyOffset);
+                    databaseHelper.createOrUpdate(historyOffset);
                 }
             } catch (AppLayerErrorException e) {
                 aapsLogger.info(LTag.PUMP, "Exception while reading history: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
@@ -1221,7 +1224,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                 break;
         Collections.reverse(temporaryBasals);
         for (InsightPumpID pumpID : pumpStartedEvents) {
-            InsightPumpID stoppedEvent = MainApp.getDbHelper().getPumpStoppedEvent(pumpID.pumpSerial, pumpID.timestamp);
+            InsightPumpID stoppedEvent = databaseHelper.getPumpStoppedEvent(pumpID.pumpSerial, pumpID.timestamp);
             if (stoppedEvent == null || stoppedEvent.eventType.equals("PumpPaused")) continue;
             long tbrStart = stoppedEvent.timestamp + 10000;
             TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector());
@@ -1289,7 +1292,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         tdd.bolus = event.getBolusTotal();
         tdd.total = tdd.basal + tdd.bolus;
         tdd.date = calendar.getTimeInMillis();
-        MainApp.getDbHelper().createOrUpdateTDD(tdd);
+        databaseHelper.createOrUpdateTDD(tdd);
     }
 
     private void processTubeFilledEvent(TubeFilledEvent event) {
@@ -1338,7 +1341,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                     logNote(timestamp, resourceHelper.gs(R.string.pump_paused));
                 break;
         }
-        MainApp.getDbHelper().createOrUpdate(pumpID);
+        databaseHelper.createOrUpdate(pumpID);
     }
 
     private void processStartOfTBREvent(String serial, List<TemporaryBasal> temporaryBasals, StartOfTBREvent event) {
@@ -1349,7 +1352,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         pumpID.pumpSerial = serial;
         pumpID.timestamp = timestamp;
         pumpID.eventType = "StartOfTBR";
-        MainApp.getDbHelper().createOrUpdate(pumpID);
+        databaseHelper.createOrUpdate(pumpID);
         TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector());
         temporaryBasal.durationInMinutes = event.getDuration();
         temporaryBasal.source = Source.PUMP;
@@ -1368,7 +1371,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         pumpID.pumpSerial = serial;
         pumpID.eventType = "EndOfTBR";
         pumpID.timestamp = timestamp;
-        MainApp.getDbHelper().createOrUpdate(pumpID);
+        databaseHelper.createOrUpdate(pumpID);
         TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector());
         temporaryBasal.durationInMinutes = 0;
         temporaryBasal.source = Source.PUMP;
@@ -1380,10 +1383,10 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
     private void processBolusProgrammedEvent(String serial, BolusProgrammedEvent event) {
         long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
                 event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
-        InsightBolusID bolusID = MainApp.getDbHelper().getInsightBolusID(serial, event.getBolusID(), timestamp);
+        InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp);
         if (bolusID != null && bolusID.endID != null) {
             bolusID.startID = event.getEventPosition();
-            MainApp.getDbHelper().createOrUpdate(bolusID);
+            databaseHelper.createOrUpdate(bolusID);
             return;
         }
         if (bolusID == null || bolusID.startID != null) {
@@ -1393,7 +1396,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             bolusID.pumpSerial = serial;
         }
         bolusID.startID = event.getEventPosition();
-        MainApp.getDbHelper().createOrUpdate(bolusID);
+        databaseHelper.createOrUpdate(bolusID);
         if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) {
             DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
             detailedBolusInfo.date = bolusID.timestamp;
@@ -1419,7 +1422,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                 event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
         long startTimestamp = parseRelativeDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), event.getEventHour(),
                 event.getEventMinute(), event.getEventSecond(), event.getStartHour(), event.getStartMinute(), event.getStartSecond()) + timeOffset;
-        InsightBolusID bolusID = MainApp.getDbHelper().getInsightBolusID(serial, event.getBolusID(), timestamp);
+        InsightBolusID bolusID = databaseHelper.getInsightBolusID(serial, event.getBolusID(), timestamp);
         if (bolusID == null || bolusID.endID != null) {
             bolusID = new InsightBolusID();
             bolusID.timestamp = startTimestamp;
@@ -1427,7 +1430,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             bolusID.pumpSerial = serial;
         }
         bolusID.endID = event.getEventPosition();
-        MainApp.getDbHelper().createOrUpdate(bolusID);
+        databaseHelper.createOrUpdate(bolusID);
         if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) {
             DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
             detailedBolusInfo.date = bolusID.timestamp;
@@ -1438,12 +1441,12 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         }
         if (event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE) {
             if (event.getDuration() == 0) {
-                ExtendedBolus extendedBolus = MainApp.getDbHelper().getExtendedBolusByPumpId(bolusID.id);
+                ExtendedBolus extendedBolus = databaseHelper.getExtendedBolusByPumpId(bolusID.id);
                 if (extendedBolus != null) {
                     final String _id = extendedBolus._id;
                     if (NSUpload.isIdValid(_id)) nsUpload.removeCareportalEntryFromNS(_id);
                     else uploadQueue.removeID("dbAdd", _id);
-                    MainApp.getDbHelper().delete(extendedBolus);
+                    databaseHelper.delete(extendedBolus);
                 }
             } else {
                 ExtendedBolus extendedBolus = new ExtendedBolus(getInjector());
@@ -1559,7 +1562,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
 
     private void logNote(long date, String note) {
         try {
-            if (MainApp.getDbHelper().getCareportalEventFromTimestamp(date) != null)
+            if (databaseHelper.getCareportalEventFromTimestamp(date) != null)
                 return;
             JSONObject data = new JSONObject();
             String enteredBy = sp.getString("careportal_enteredby", "");
@@ -1572,7 +1575,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             careportalEvent.source = Source.USER;
             careportalEvent.eventType = CareportalEvent.NOTE;
             careportalEvent.json = data.toString();
-            MainApp.getDbHelper().createOrUpdate(careportalEvent);
+            databaseHelper.createOrUpdate(careportalEvent);
             nsUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             aapsLogger.error("Unhandled exception", e);
@@ -1593,7 +1596,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
     }
 
     private void uploadCareportalEvent(long date, String event) {
-        if (MainApp.getDbHelper().getCareportalEventFromTimestamp(date) != null)
+        if (databaseHelper.getCareportalEventFromTimestamp(date) != null)
             return;
         try {
             JSONObject data = new JSONObject();
@@ -1606,7 +1609,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             careportalEvent.source = Source.USER;
             careportalEvent.eventType = event;
             careportalEvent.json = data.toString();
-            MainApp.getDbHelper().createOrUpdate(careportalEvent);
+            databaseHelper.createOrUpdate(careportalEvent);
             nsUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             aapsLogger.error("Unhandled exception", e);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
index 4c4a1ff855..9532f47c4e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
@@ -17,7 +17,7 @@ import androidx.core.content.ContextCompat;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerAppCompatActivity;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.insight.R;
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertStatus;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
index 5c2bedf3b3..1215219256 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
@@ -25,8 +25,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
+import info.nightscout.androidaps.insight.R;
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
index 1dc928d2c6..39225e4fbe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
@@ -10,8 +10,8 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
+import info.nightscout.androidaps.insight.R;
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
 
 public class InsightPairingInformationActivity extends NoSplashAppCompatActivity {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/Service.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/Service.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/Service.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/Service.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/CloseConfigurationWriteSessionMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/CloseConfigurationWriteSessionMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/CloseConfigurationWriteSessionMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/CloseConfigurationWriteSessionMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/OpenConfigurationWriteSessionMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/OpenConfigurationWriteSessionMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/OpenConfigurationWriteSessionMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/OpenConfigurationWriteSessionMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/WriteConfigurationBlockMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/WriteConfigurationBlockMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/WriteConfigurationBlockMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/WriteConfigurationBlockMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ActivateServiceMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ActivateServiceMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ActivateServiceMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ActivateServiceMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/BindMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/BindMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/BindMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/BindMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ConnectMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ConnectMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ConnectMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ConnectMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/DisconnectMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/DisconnectMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/DisconnectMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/DisconnectMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ServiceChallengeMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ServiceChallengeMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ServiceChallengeMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ServiceChallengeMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/HistoryReadingDirection.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/HistoryReadingDirection.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/HistoryReadingDirection.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/HistoryReadingDirection.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/ReadHistoryEventsMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/ReadHistoryEventsMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/ReadHistoryEventsMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/ReadHistoryEventsMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StartReadingHistoryMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StartReadingHistoryMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StartReadingHistoryMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StartReadingHistoryMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StopReadingHistoryMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StopReadingHistoryMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StopReadingHistoryMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StopReadingHistoryMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BasalDeliveryChangedEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BasalDeliveryChangedEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BasalDeliveryChangedEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BasalDeliveryChangedEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusDeliveredEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusDeliveredEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusDeliveredEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusDeliveredEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusProgrammedEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusProgrammedEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusProgrammedEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusProgrammedEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CannulaFilledEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CannulaFilledEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CannulaFilledEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CannulaFilledEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeInsertedEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeInsertedEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeInsertedEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeInsertedEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeRemovedEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeRemovedEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeRemovedEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeRemovedEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DateTimeChangedEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DateTimeChangedEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DateTimeChangedEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DateTimeChangedEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DefaultDateTimeSetEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DefaultDateTimeSetEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DefaultDateTimeSetEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DefaultDateTimeSetEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/EndOfTBREvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/EndOfTBREvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/EndOfTBREvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/EndOfTBREvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfAlertEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfAlertEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfAlertEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfAlertEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfErrorEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfErrorEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfErrorEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfErrorEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfWarningEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfWarningEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfWarningEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfWarningEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OperatingModeChangedEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OperatingModeChangedEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OperatingModeChangedEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OperatingModeChangedEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerDownEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerDownEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerDownEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerDownEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerUpEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerUpEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerUpEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerUpEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/SniffingDoneEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/SniffingDoneEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/SniffingDoneEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/SniffingDoneEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/StartOfTBREvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/StartOfTBREvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/StartOfTBREvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/StartOfTBREvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TotalDailyDoseEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TotalDailyDoseEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TotalDailyDoseEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TotalDailyDoseEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TubeFilledEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TubeFilledEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TubeFilledEvent.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TubeFilledEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ActiveBRProfileBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ActiveBRProfileBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ActiveBRProfileBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ActiveBRProfileBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1Block.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1Block.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1Block.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1Block.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1NameBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1NameBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1NameBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1NameBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2Block.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2Block.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2Block.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2Block.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2NameBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2NameBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2NameBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2NameBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3Block.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3Block.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3Block.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3Block.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3NameBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3NameBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3NameBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3NameBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4Block.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4Block.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4Block.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4Block.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4NameBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4NameBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4NameBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4NameBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5Block.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5Block.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5Block.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5Block.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5NameBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5NameBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5NameBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5NameBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfileBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfileBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfileBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfileBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBasalAmountBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBasalAmountBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBasalAmountBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBasalAmountBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBolusAmountBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBolusAmountBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBolusAmountBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBolusAmountBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/NameBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/NameBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/NameBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/NameBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ParameterBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ParameterBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ParameterBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ParameterBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/SystemIdentificationBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/SystemIdentificationBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/SystemIdentificationBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/SystemIdentificationBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/TBROverNotificationBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/TBROverNotificationBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/TBROverNotificationBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/TBROverNotificationBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelBolusMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelBolusMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelBolusMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelBolusMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelTBRMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelTBRMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelTBRMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelTBRMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ChangeTBRMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ChangeTBRMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ChangeTBRMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ChangeTBRMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ConfirmAlertMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ConfirmAlertMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ConfirmAlertMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ConfirmAlertMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/GetAvailableBolusTypesMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/GetAvailableBolusTypesMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/GetAvailableBolusTypesMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/GetAvailableBolusTypesMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetDateTimeMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetDateTimeMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetDateTimeMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetDateTimeMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetOperatingModeMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetOperatingModeMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetOperatingModeMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetOperatingModeMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetTBRMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetTBRMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetTBRMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetTBRMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SnoozeAlertMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SnoozeAlertMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SnoozeAlertMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SnoozeAlertMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveAlertMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveAlertMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveAlertMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveAlertMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBasalRateMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBasalRateMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBasalRateMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBasalRateMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBolusesMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBolusesMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBolusesMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBolusesMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveTBRMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveTBRMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveTBRMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveTBRMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetBatteryStatusMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetBatteryStatusMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetBatteryStatusMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetBatteryStatusMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetCartridgeStatusMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetCartridgeStatusMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetCartridgeStatusMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetCartridgeStatusMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetDateTimeMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetDateTimeMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetDateTimeMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetDateTimeMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetFirmwareVersionsMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetFirmwareVersionsMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetFirmwareVersionsMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetFirmwareVersionsMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetOperatingModeMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetOperatingModeMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetOperatingModeMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetOperatingModeMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetPumpStatusRegisterMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetPumpStatusRegisterMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetPumpStatusRegisterMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetPumpStatusRegisterMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetTotalDailyDoseMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetTotalDailyDoseMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetTotalDailyDoseMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetTotalDailyDoseMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/ResetPumpStatusRegisterMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/ResetPumpStatusRegisterMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/ResetPumpStatusRegisterMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/ResetPumpStatusRegisterMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/ConfigurationMessageRequest.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/ConfigurationMessageRequest.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/ConfigurationMessageRequest.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/ConfigurationMessageRequest.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageQueue.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageQueue.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageQueue.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageQueue.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageRequest.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageRequest.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageRequest.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageRequest.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBasalRate.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBasalRate.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBasalRate.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBasalRate.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBolus.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBolus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBolus.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBolus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveTBR.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveTBR.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveTBR.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveTBR.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertCategory.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertCategory.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertCategory.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertCategory.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertStatus.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertStatus.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertType.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertType.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AvailableBolusTypes.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AvailableBolusTypes.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AvailableBolusTypes.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AvailableBolusTypes.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfile.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfile.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfile.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfile.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfileBlock.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfileBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfileBlock.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfileBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryStatus.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryStatus.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryType.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryType.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BolusType.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BolusType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BolusType.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BolusType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeStatus.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeStatus.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeType.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeType.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/FirmwareVersions.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/FirmwareVersions.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/FirmwareVersions.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/FirmwareVersions.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/InsightState.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/InsightState.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/InsightState.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/InsightState.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/MessagePriority.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/MessagePriority.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/MessagePriority.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/MessagePriority.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/OperatingMode.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/OperatingMode.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/OperatingMode.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/OperatingMode.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/PumpTime.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/PumpTime.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/PumpTime.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/PumpTime.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SymbolStatus.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SymbolStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SymbolStatus.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SymbolStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SystemIdentification.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SystemIdentification.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SystemIdentification.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SystemIdentification.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/TotalDailyDose.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/TotalDailyDose.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/TotalDailyDose.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/TotalDailyDose.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/events/EventLocalInsightUpdateGUI.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/AppLayerException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/AppLayerException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/AppLayerException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/AppLayerException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/CommandNotSupportedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/CommandNotSupportedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/CommandNotSupportedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/CommandNotSupportedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionFailedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionFailedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionFailedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionFailedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionLostException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionLostException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionLostException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionLostException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/DisconnectedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/DisconnectedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/DisconnectedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/DisconnectedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleAppVersionException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleAppVersionException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleAppVersionException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleAppVersionException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleSatlVersionException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleSatlVersionException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleSatlVersionException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleSatlVersionException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InsightException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InsightException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InsightException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InsightException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidAppCRCException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidAppCRCException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidAppCRCException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidAppCRCException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidMacTrailerException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidMacTrailerException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidMacTrailerException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidMacTrailerException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidNonceException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidNonceException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidNonceException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidNonceException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPacketLengthsException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPacketLengthsException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPacketLengthsException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPacketLengthsException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPreambleException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPreambleException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPreambleException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPreambleException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCRCException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCRCException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCRCException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCRCException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCommandException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCommandException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCommandException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCommandException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ReceivedPacketInInvalidStateException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ReceivedPacketInInvalidStateException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ReceivedPacketInInvalidStateException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ReceivedPacketInInvalidStateException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SatlException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SatlException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SatlException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SatlException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SecondChannelFailedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SecondChannelFailedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SecondChannelFailedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SecondChannelFailedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SocketCreationFailedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SocketCreationFailedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SocketCreationFailedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SocketCreationFailedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TimeoutException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TimeoutException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TimeoutException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TimeoutException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TooChattyPumpException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TooChattyPumpException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TooChattyPumpException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TooChattyPumpException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownAppCommandException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownAppCommandException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownAppCommandException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownAppCommandException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownServiceException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownServiceException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownServiceException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownServiceException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AlreadyConnectedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AlreadyConnectedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AlreadyConnectedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AlreadyConnectedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AppLayerErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AppLayerErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AppLayerErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AppLayerErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusAmountNotInRangeException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusAmountNotInRangeException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusAmountNotInRangeException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusAmountNotInRangeException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusDurationNotInRangeException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusDurationNotInRangeException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusDurationNotInRangeException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusDurationNotInRangeException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CommandExecutionFailedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CommandExecutionFailedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CommandExecutionFailedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CommandExecutionFailedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ConfigMemoryAccessException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ConfigMemoryAccessException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ConfigMemoryAccessException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ConfigMemoryAccessException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/IncompatibleVersionException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/IncompatibleVersionException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/IncompatibleVersionException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/IncompatibleVersionException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockIdException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockIdException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockIdException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockIdException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDateParameterException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDateParameterException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDateParameterException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDateParameterException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDurationPresetException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDurationPresetException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDurationPresetException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDurationPresetException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidLagTimeException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidLagTimeException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidLagTimeException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidLagTimeException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidParameterTypeException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidParameterTypeException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidParameterTypeException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidParameterTypeException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadCRCException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadCRCException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadCRCException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadCRCException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadLengthException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadLengthException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadLengthException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadLengthException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidServicePasswordException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidServicePasswordException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidServicePasswordException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidServicePasswordException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRDurationException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRDurationException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRDurationException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRDurationException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRFactorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRFactorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRFactorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRFactorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRTemplateException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRTemplateException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRTemplateException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRTemplateException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTimeParameterException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTimeParameterException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTimeParameterException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTimeParameterException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToChangeException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToChangeException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToChangeException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToChangeException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoConfigBlockDataException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoConfigBlockDataException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoConfigBlockDataException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoConfigBlockDataException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoServicePasswordNeededException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoServicePasswordNeededException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoServicePasswordNeededException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoServicePasswordNeededException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoSuchBolusToCancelException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoSuchBolusToCancelException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoSuchBolusToCancelException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoSuchBolusToCancelException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotConnectedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotConnectedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotConnectedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotConnectedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotReferencedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotReferencedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotReferencedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotReferencedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PauseModeNotAllowedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PauseModeNotAllowedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PauseModeNotAllowedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PauseModeNotAllowedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PositionProtectedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PositionProtectedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PositionProtectedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PositionProtectedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpBusyException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpBusyException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpBusyException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpBusyException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpStoppedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpStoppedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpStoppedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpStoppedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/RunModeNotAllowedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/RunModeNotAllowedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/RunModeNotAllowedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/RunModeNotAllowedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceIncompatibleException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceIncompatibleException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceIncompatibleException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceIncompatibleException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceNotActivatedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceNotActivatedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceNotActivatedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceNotActivatedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/StepCountOutOfRangeException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/StepCountOutOfRangeException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/StepCountOutOfRangeException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/StepCountOutOfRangeException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownCommandException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownCommandException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownCommandException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownCommandException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownServiceException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownServiceException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownServiceException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownServiceException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionClosedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionClosedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionClosedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionClosedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WrongStateException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WrongStateException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WrongStateException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WrongStateException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlCompatibleStateErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlCompatibleStateErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlCompatibleStateErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlCompatibleStateErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCRCErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCRCErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCRCErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCRCErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCommIdErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCommIdErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCommIdErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCommIdErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMacErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMacErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMacErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMacErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidNonceErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidNonceErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidNonceErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidNonceErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPacketErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPacketErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPacketErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPacketErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlNoneErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlNoneErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlNoneErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlNoneErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlPairingRejectedException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlPairingRejectedException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlPairingRejectedException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlPairingRejectedException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlUndefinedErrorException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlUndefinedErrorException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlUndefinedErrorException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlUndefinedErrorException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlWrongStateException.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlWrongStateException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlWrongStateException.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlWrongStateException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBasalProfileIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBasalProfileIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBasalProfileIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBasalProfileIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBolusTypeIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBolusTypeIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBolusTypeIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBolusTypeIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertCategoryIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertCategoryIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertCategoryIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertCategoryIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertStatusIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertStatusIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertStatusIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertStatusIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIncrementalIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIncrementalIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIncrementalIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIncrementalIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppCommandIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppCommandIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppCommandIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppCommandIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppErrorIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppErrorIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppErrorIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppErrorIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BatteryTypeIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BatteryTypeIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BatteryTypeIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BatteryTypeIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BolusTypeIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BolusTypeIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BolusTypeIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BolusTypeIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/CartridgeTypeIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/CartridgeTypeIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/CartridgeTypeIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/CartridgeTypeIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryEventIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryEventIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryEventIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryEventIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryReadingDirectionIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryReadingDirectionIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryReadingDirectionIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryReadingDirectionIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/OperatingModeIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/OperatingModeIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/OperatingModeIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/OperatingModeIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/PairingStatusIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/PairingStatusIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/PairingStatusIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/PairingStatusIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ParameterBlockIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ParameterBlockIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ParameterBlockIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ParameterBlockIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlCommandIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlCommandIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlCommandIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlCommandIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlErrorIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlErrorIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlErrorIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlErrorIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ServiceIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ServiceIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ServiceIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ServiceIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SymbolStatusIDs.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SymbolStatusIDs.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SymbolStatusIDs.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SymbolStatusIDs.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionRequest.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionRequest.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionRequest.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionRequest.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionResponse.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionResponse.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DataMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DataMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DataMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DataMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DisconnectMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DisconnectMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DisconnectMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DisconnectMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ErrorMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ErrorMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ErrorMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ErrorMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyRequest.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyRequest.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyRequest.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyRequest.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyResponse.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyResponse.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/PairingStatus.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/PairingStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/PairingStatus.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/PairingStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlError.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlError.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlError.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlError.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynAckResponse.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynAckResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynAckResponse.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynAckResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynRequest.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynRequest.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynRequest.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynRequest.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmRequest.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmRequest.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmRequest.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmRequest.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmResponse.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmResponse.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayRequest.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayRequest.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayRequest.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayRequest.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayResponse.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayResponse.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
index 8e26c318c5..11f000ef32 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.insight.utils
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.insight.R
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertCategory
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/BOCUtil.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/BOCUtil.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/BOCUtil.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/BOCUtil.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ByteBuf.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ByteBuf.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ByteBuf.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ByteBuf.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/DelayedActionThread.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/DelayedActionThread.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/DelayedActionThread.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/DelayedActionThread.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
index d756a803f0..15390c7e66 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
@@ -8,7 +8,7 @@ import android.widget.Toast;
 import java.util.HashMap;
 import java.util.Map;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.insight.R;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.ConnectionFailedException;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.ConnectionLostException;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.DisconnectedException;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/IDStorage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/IDStorage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/IDStorage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/IDStorage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/InputStreamReader.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/InputStreamReader.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/InputStreamReader.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/InputStreamReader.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/Nonce.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/Nonce.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/Nonce.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/Nonce.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/OutputStreamWriter.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/OutputStreamWriter.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/OutputStreamWriter.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/OutputStreamWriter.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/PairingDataStorage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/PairingDataStorage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/PairingDataStorage.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/PairingDataStorage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ParameterBlockUtil.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ParameterBlockUtil.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ParameterBlockUtil.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ParameterBlockUtil.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/CRC.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/CRC.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/CRC.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/CRC.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/Cryptograph.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/Cryptograph.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/Cryptograph.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/Cryptograph.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/DerivedKeys.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/DerivedKeys.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/DerivedKeys.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/DerivedKeys.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/KeyPair.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/KeyPair.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/KeyPair.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/KeyPair.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/VerificationString.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/VerificationString.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/VerificationString.java
rename to insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/VerificationString.java
diff --git a/app/src/main/res/drawable/ic_error.xml b/insight/src/main/res/drawable/ic_error.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_error.xml
rename to insight/src/main/res/drawable/ic_error.xml
diff --git a/app/src/main/res/drawable/ic_insight.xml b/insight/src/main/res/drawable/ic_insight.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_insight.xml
rename to insight/src/main/res/drawable/ic_insight.xml
diff --git a/app/src/main/res/drawable/ic_insight_128.xml b/insight/src/main/res/drawable/ic_insight_128.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_insight_128.xml
rename to insight/src/main/res/drawable/ic_insight_128.xml
diff --git a/app/src/main/res/drawable/ic_maintenance.xml b/insight/src/main/res/drawable/ic_maintenance.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_maintenance.xml
rename to insight/src/main/res/drawable/ic_maintenance.xml
diff --git a/app/src/main/res/drawable/ic_reminder.xml b/insight/src/main/res/drawable/ic_reminder.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_reminder.xml
rename to insight/src/main/res/drawable/ic_reminder.xml
diff --git a/app/src/main/res/drawable/ic_warning.xml b/insight/src/main/res/drawable/ic_warning.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_warning.xml
rename to insight/src/main/res/drawable/ic_warning.xml
diff --git a/app/src/main/res/layout/activity_insight_alert.xml b/insight/src/main/res/layout/activity_insight_alert.xml
similarity index 100%
rename from app/src/main/res/layout/activity_insight_alert.xml
rename to insight/src/main/res/layout/activity_insight_alert.xml
diff --git a/app/src/main/res/layout/activity_insight_pairing.xml b/insight/src/main/res/layout/activity_insight_pairing.xml
similarity index 100%
rename from app/src/main/res/layout/activity_insight_pairing.xml
rename to insight/src/main/res/layout/activity_insight_pairing.xml
diff --git a/app/src/main/res/layout/activity_insight_pairing_information.xml b/insight/src/main/res/layout/activity_insight_pairing_information.xml
similarity index 100%
rename from app/src/main/res/layout/activity_insight_pairing_information.xml
rename to insight/src/main/res/layout/activity_insight_pairing_information.xml
diff --git a/app/src/main/res/layout/bluetooth_device.xml b/insight/src/main/res/layout/bluetooth_device.xml
similarity index 100%
rename from app/src/main/res/layout/bluetooth_device.xml
rename to insight/src/main/res/layout/bluetooth_device.xml
diff --git a/app/src/main/res/layout/local_insight_fragment.xml b/insight/src/main/res/layout/local_insight_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/local_insight_fragment.xml
rename to insight/src/main/res/layout/local_insight_fragment.xml
diff --git a/app/src/main/res/layout/local_insight_status_delimitter.xml b/insight/src/main/res/layout/local_insight_status_delimitter.xml
similarity index 100%
rename from app/src/main/res/layout/local_insight_status_delimitter.xml
rename to insight/src/main/res/layout/local_insight_status_delimitter.xml
diff --git a/app/src/main/res/layout/local_insight_status_item.xml b/insight/src/main/res/layout/local_insight_status_item.xml
similarity index 100%
rename from app/src/main/res/layout/local_insight_status_item.xml
rename to insight/src/main/res/layout/local_insight_status_item.xml
diff --git a/app/src/main/res/values/insight_alert_codes.xml b/insight/src/main/res/values/insight_alert_codes.xml
similarity index 100%
rename from app/src/main/res/values/insight_alert_codes.xml
rename to insight/src/main/res/values/insight_alert_codes.xml
diff --git a/app/src/main/res/values/insight_alert_descriptions.xml b/insight/src/main/res/values/insight_alert_descriptions.xml
similarity index 100%
rename from app/src/main/res/values/insight_alert_descriptions.xml
rename to insight/src/main/res/values/insight_alert_descriptions.xml
diff --git a/app/src/main/res/values/insight_alert_titles.xml b/insight/src/main/res/values/insight_alert_titles.xml
similarity index 100%
rename from app/src/main/res/values/insight_alert_titles.xml
rename to insight/src/main/res/values/insight_alert_titles.xml
diff --git a/app/src/main/res/values/insight_exceptions.xml b/insight/src/main/res/values/insight_exceptions.xml
similarity index 100%
rename from app/src/main/res/values/insight_exceptions.xml
rename to insight/src/main/res/values/insight_exceptions.xml
diff --git a/insight/src/main/res/values/strings.xml b/insight/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..8b235730bc
--- /dev/null
+++ b/insight/src/main/res/values/strings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_tbr_over_notification">Enable notification of TBR end\n(pump setting)</string>
+    <string name="disable_tbr_over_notification">Disable notification of TBR end\n(pump setting)</string>
+    <string name="not_paired">Not paired</string>
+    <string name="recovering">Recovering</string>
+    <string name="insight_status">Status</string>
+    <string name="recovery_duration">Recovery duration</string>
+    <string name="last_connected">Last connected</string>
+    <string name="start_pump">Start pump</string>
+    <string name="stop_pump">Stop pump</string>
+    <string name="started">Started</string>
+    <string name="stopped">Stopped</string>
+    <string name="paused">Paused</string>
+    <string name="operating_mode">Operating mode</string>
+    <string name="description_pump_insight_local">Pump integration for Accu-Chek Insight pumps</string>
+    <string name="not_inserted">Not inserted</string>
+    <string name="tdd_bolus">TDD Bolus</string>
+    <string name="tdd_basal">TDD Basal</string>
+    <string name="tdd_total">TDD Total</string>
+    <string name="tbr_formatter">%1$d%% for %2$d / %3$d min</string>
+    <string name="multiwave_bolus">Multiwave bolus</string>
+    <string name="eb_formatter">%1$.2f / %2$.2f U for %3$d min</string>
+    <string name="searching_for_devices">Searching for devices…</string>
+    <string name="pairing_completed">Pairing completed</string>
+    <string name="code_compare">Do the codes displayed on this device and on your pump match?</string>
+    <string name="insight_pairing">Insight pairing</string>
+    <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2f U / %2$.2f U delivered</string>
+    <string name="insight_alert_formatter">%1$s: %2$s</string>
+    <string name="tube_changed">Tube changed</string>
+    <string name="insightpump_shortname">Sight</string>
+    <string name="insight_alert_notification_channel">Insight Pump Alerts</string>
+    <string name="key_disable_vibration" translatable="false">insight_disable_vibration</string>
+    <string name="disable_vibration">Disable vibrations on manual bolus delivery</string>
+    <string name="disable_vibration_summary">For bolus and extended bolus (only available with Insight firmware 3.x)</string>
+    <string name="key_disable_vibration_auto" translatable="false">insight_disable_vibration_auto</string>
+    <string name="disable_vibration_auto">Disable vibrations on automated bolus delivery</string>
+    <string name="disable_vibration_auto_summary">For SMB and Temp Basal with TBR emulation (only available with Insight firmware 3.x)</string>
+    <string name="timeout_during_handshake">Timeout during handshake - reset bluetooth</string>
+    <string name="pump_stopped">Pump stopped</string>
+    <string name="pump_started">Pump started</string>
+    <string name="pump_paused">Pump paused</string>
+    <string name="short_status_last_connected">Last conn: %1$d min ago</string>
+    <string name="short_status_tbr">TBR: %1$d%% for %2$d / %3$d min</string>
+    <string name="short_status_extended">Extended: %1$.2f / %2$.2f U for %3$d min</string>
+    <string name="short_status_multiwave">Multiwave: %1$.2f / %2$.2f U for %3$d min</string>
+    <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Reser.: %1$.2f U</string>
+    <string name="short_status_battery">Batt.: %1$d%%</string>
+    <string name="confirm">Confirm</string>
+    <string name="mute_alert">Mute</string>
+    <string name="release_software_version">Release software version</string>
+    <string name="ui_processor_software_version">UI processor software version</string>
+    <string name="pc_processor_software_version">PC processor software version</string>
+    <string name="md_tel_processor_software_version">MD tel processor software version</string>
+    <string name="safety_processor_software_version">Safety processor software version</string>
+    <string name="bt_info_page_version">BT info page version</string>
+    <string name="bluetooth_address">Bluetooth address</string>
+    <string name="system_id_appendix">System ID appendix</string>
+    <string name="manufacturing_date">Manufacturing date</string>
+    <string name="delete_pairing">Delete pairing</string>
+    <string name="log_site_changes">Log site changes</string>
+    <string name="log_reservoir_changes">Log reservoir changes</string>
+    <string name="log_tube_changes">Log tube changes</string>
+    <string name="log_battery_changes">Log battery changes</string>
+    <string name="log_operating_mode_changes">Log operating mode changes</string>
+    <string name="log_alerts">Log alerts</string>
+    <string name="enable_tbr_emulation">Enable TBR emulation</string>
+    <string name="enable_tbr_emulation_summary">Use extended boluses instead of TBRs to bypass the 250%% limit</string>
+    <string name="disconnect_delay">Disconnect delay [s]</string>
+    <string name="max_recovery_duration">Max. recovery duration [s]</string>
+    <string name="min_recovery_duration">Min. recovery duration [s]</string>
+    <string name="pump_alert">Pump alert</string>
+    <string name="pairing_information">Pairing information</string>
+</resources>
\ No newline at end of file
diff --git a/insight/src/main/res/values/styles.xml b/insight/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..cd046a25b7
--- /dev/null
+++ b/insight/src/main/res/values/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="InsightAlertDialog" parent="Theme.AppCompat.Dialog.MinWidth">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_insight_local_full.xml b/insight/src/main/res/xml/pref_insight_local_full.xml
similarity index 100%
rename from app/src/main/res/xml/pref_insight_local_full.xml
rename to insight/src/main/res/xml/pref_insight_local_full.xml
diff --git a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml b/insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml
similarity index 100%
rename from app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
rename to insight/src/main/res/xml/pref_insight_local_pumpcontrol.xml
diff --git a/medtronic/src/main/AndroidManifest.xml b/medtronic/src/main/AndroidManifest.xml
index ef3ab38a46..7f19bbfdae 100644
--- a/medtronic/src/main/AndroidManifest.xml
+++ b/medtronic/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
         <service
             android:name=".service.RileyLinkMedtronicService"
             android:enabled="true"
-            android:exported="true" />
+            android:exported="false" />
 
         <activity android:name=".dialog.MedtronicHistoryActivity" />
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt
new file mode 100644
index 0000000000..0a324648e8
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
+import info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity
+import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
+import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
+
+@Module
+@Suppress("unused")
+abstract class MedtronicModule {
+    @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity
+    @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
+
+    @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
+
+    @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager
+    @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): MedtronicUITask
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusDeviceMedtronic(): RileyLinkStatusDeviceMedtronic
+}
\ No newline at end of file
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
index 336f123ce3..453f1f7f86 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
@@ -9,8 +9,10 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.data.RLHistoryItemOm
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.RileyLinkOmnipodService
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.ErosPodHistoryActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.ErosPodManagementActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.OmnipodErosOverviewFragment
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.ErosPodActivationWizardActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.ErosPodDeactivationWizardActivity
 
@@ -19,6 +21,11 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivati
 abstract class OmnipodErosModule {
 
     // ACTIVITIES
+
+    @ContributesAndroidInjector
+    abstract fun contributesPodManagementActivity(): ErosPodManagementActivity
+    @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): ErosPodHistoryActivity
+
     @ActivityScope
     @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodErosWizardViewModelsModule::class])
     abstract fun contributesActivationWizardActivity(): ErosPodActivationWizardActivity
@@ -27,14 +34,17 @@ abstract class OmnipodErosModule {
     @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodErosWizardViewModelsModule::class])
     abstract fun contributesDeactivationWizardActivity(): ErosPodDeactivationWizardActivity
 
+    // FRAGMENTS
+
     @ContributesAndroidInjector
-    abstract fun contributesPodManagementActivity(): ErosPodManagementActivity
-    @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): ErosPodHistoryActivity
+    abstract fun contributesOmnipodFragment(): OmnipodErosOverviewFragment
 
     // SERVICES
 
     @ContributesAndroidInjector
     abstract fun omnipodCommunicationManagerProvider(): OmnipodRileyLinkCommunicationManager
+    @ContributesAndroidInjector
+    abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 
     // DATA
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dagger/RileyLinkModule.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
similarity index 62%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dagger/RileyLinkModule.kt
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
index 40227b9269..ac6f4747ce 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dagger/RileyLinkModule.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt
@@ -1,13 +1,18 @@
-package info.nightscout.androidaps.plugins.pump.common.dagger
+package info.nightscout.androidaps.plugins.pump.common.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEConfigActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.*
 
 @Module
@@ -25,4 +30,12 @@ abstract class RileyLinkModule {
     @ContributesAndroidInjector abstract fun sendAndListenProvider(): SendAndListen
     @ContributesAndroidInjector abstract fun setPreambleProvider(): SetPreamble
     @ContributesAndroidInjector abstract fun radioPacketProvider(): RadioPacket
+
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusGeneral(): RileyLinkStatusGeneralFragment
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusHistoryFragment(): RileyLinkStatusHistoryFragment
+
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): RileyLinkStatusActivity
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBLEConfigActivity(): RileyLinkBLEConfigActivity
+
+    @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index c1f4057c12..304e781d25 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,14 @@
-include ':app', ':database', ':wear', ':core', ':dana', ':danar', ':danars', ':rileylink', ':medtronic', ':omnipod-common', ':omnipod-eros', ':omnipod-dash'
-
+include ':insight'
+include ':app'
+include ':wear'
+include ':database'
+include ':core'
+include ':combo'
+include ':dana'
+include ':danar'
+include ':danars'
+include ':rileylink'
+include ':medtronic'
+include ':omnipod-common'
+include ':omnipod-eros'
+include ':omnipod-dash'
\ No newline at end of file