diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0b8b273bc0..28801cb027 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -52,8 +52,8 @@
             android:name=".plugins.Overview.Dialogs.ErrorHelperActivity"
             android:theme="@style/Theme.AppCompat.Translucent" />
         <activity android:name=".activities.AgreementActivity" />
-        <activity android:name=".plugins.PumpDanaR.activities.DanaRHistoryActivity" />
-        <activity android:name=".plugins.PumpDanaR.activities.DanaRUserOptionsActivity" />
+        <activity android:name=".plugins.pump.danaR.activities.DanaRHistoryActivity" />
+        <activity android:name=".plugins.pump.danaR.activities.DanaRUserOptionsActivity" />
         <activity android:name=".activities.TDDStatsActivity" />
         <activity android:name=".plugins.Overview.activities.QuickWizardListActivity">
             <intent-filter>
@@ -62,14 +62,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".plugins.PumpDanaRS.activities.BLEScanActivity">
+        <activity android:name=".plugins.pump.danaRS.activities.BLEScanActivity">
             <intent-filter>
                 <action android:name="info.nightscout.androidaps.plugins.PumpDanaRS.activities.BLEScanActivity" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".plugins.PumpDanaRS.activities.PairingHelperActivity" />
+        <activity android:name=".plugins.pump.danaRS.activities.PairingHelperActivity" />
         <activity android:name=".activities.HistoryBrowseActivity" />
 
         <receiver
@@ -150,19 +150,19 @@
             android:name=".services.DataService"
             android:exported="false" />
         <service
-            android:name=".plugins.PumpDanaR.services.DanaRExecutionService"
+            android:name=".plugins.pump.danaR.services.DanaRExecutionService"
             android:enabled="true"
             android:exported="false" />
         <service
-            android:name=".plugins.PumpDanaRKorean.services.DanaRKoreanExecutionService"
+            android:name=".plugins.pump.danaRKorean.services.DanaRKoreanExecutionService"
             android:enabled="true"
             android:exported="false" />
         <service
-            android:name=".plugins.PumpDanaRv2.services.DanaRv2ExecutionService"
+            android:name=".plugins.pump.danaRv2.services.DanaRv2ExecutionService"
             android:enabled="true"
             android:exported="false" />
         <service
-            android:name=".plugins.PumpDanaRS.services.DanaRSService"
+            android:name=".plugins.pump.danaRS.services.DanaRSService"
             android:enabled="true"
             android:exported="true" />
         <service
@@ -185,8 +185,8 @@
             android:exported="false" />
 
         <service android:name=".plugins.Persistentnotification.DummyService" />
-        <service android:name=".plugins.PumpInsightLocal.connection_service.InsightConnectionService" />
-        <service android:name=".plugins.PumpInsightLocal.InsightAlertService" />
+        <service android:name=".plugins.pump.insight.connection_service.InsightConnectionService" />
+        <service android:name=".plugins.pump.insight.InsightAlertService" />
 
         <meta-data
             android:name="io.fabric.ApiKey"
@@ -203,15 +203,15 @@
             android:theme="@style/AppTheme" />
         <activity android:name=".plugins.Maintenance.activities.LogSettingActivity"></activity>
         <activity
-            android:name=".plugins.PumpInsightLocal.activities.InsightPairingActivity"
+            android:name=".plugins.pump.insight.activities.InsightPairingActivity"
             android:theme="@style/AppTheme"
             android:label="@string/insight_pairing" />
         <activity
-            android:name=".plugins.PumpInsightLocal.activities.InsightAlertActivity"
+            android:name=".plugins.pump.insight.activities.InsightAlertActivity"
             android:label="@string/pump_alert"
             android:theme="@style/InsightAlertDialog" />
         <activity
-            android:name=".plugins.PumpInsightLocal.activities.InsightPairingInformationActivity"
+            android:name=".plugins.pump.insight.activities.InsightPairingInformationActivity"
             android:theme="@style/AppTheme"
             android:label="@string/pairing_information" />
     </application>
diff --git a/app/src/main/java/info/nightscout/androidaps/Constants.java b/app/src/main/java/info/nightscout/androidaps/Constants.java
index ffe227dc1b..183975b984 100644
--- a/app/src/main/java/info/nightscout/androidaps/Constants.java
+++ b/app/src/main/java/info/nightscout/androidaps/Constants.java
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps;
 
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 07.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index 844f218803..889d6b725e 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -53,12 +53,12 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity;
 import info.nightscout.androidaps.tabs.TabPageAdapter;
-import info.nightscout.utils.AndroidPermission;
-import info.nightscout.utils.LocaleHelper;
-import info.nightscout.utils.OKDialog;
-import info.nightscout.utils.PasswordProtection;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.VersionChecker;
+import info.nightscout.androidaps.utils.AndroidPermission;
+import info.nightscout.androidaps.utils.LocaleHelper;
+import info.nightscout.androidaps.utils.OKDialog;
+import info.nightscout.androidaps.utils.PasswordProtection;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.VersionChecker;
 
 public class MainActivity extends AppCompatActivity {
     private static Logger log = LoggerFactory.getLogger(L.CORE);
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 3612cd023d..ec5dfa3683 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -53,14 +53,14 @@ import info.nightscout.androidaps.plugins.Persistentnotification.PersistentNotif
 import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfilePlugin;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.ProfileSimple.SimpleProfilePlugin;
-import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.LocalInsightPlugin;
-import info.nightscout.androidaps.plugins.PumpMDI.MDIPlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref1Plugin;
@@ -82,7 +82,7 @@ import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.receivers.KeepAliveReceiver;
 import info.nightscout.androidaps.receivers.NSAlarmReceiver;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.plugins.Maintenance.LoggerUtils;
 import io.fabric.sdk.android.Fabric;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/AgreementActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/AgreementActivity.java
index 582b10d57d..32352e1371 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/AgreementActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/AgreementActivity.java
@@ -2,16 +2,14 @@ package info.nightscout.androidaps.activities;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
 
 import info.nightscout.androidaps.MainActivity;
 import info.nightscout.androidaps.R;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class AgreementActivity extends Activity {
     boolean IUnderstand;
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java
index 7303eb9d97..a27482410f 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java
@@ -42,8 +42,8 @@ import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventIobCalcul
 import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.graphData.GraphData;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.T;
 
 public class HistoryBrowseActivity extends AppCompatActivity {
     private static Logger log = LoggerFactory.getLogger(HistoryBrowseActivity.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
index bed5e36aea..b3f3ee8a81 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
@@ -27,13 +27,13 @@ import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
-import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.LocalInsightPlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref1Plugin;
@@ -42,9 +42,9 @@ import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorPlugin;
 import info.nightscout.androidaps.plugins.Source.SourceDexcomG5Plugin;
 import info.nightscout.androidaps.plugins.Wear.WearPlugin;
 import info.nightscout.androidaps.plugins.XDripStatusline.StatuslinePlugin;
-import info.nightscout.utils.LocaleHelper;
-import info.nightscout.utils.OKDialog;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.LocaleHelper;
+import info.nightscout.androidaps.utils.OKDialog;
+import info.nightscout.androidaps.utils.SP;
 
 public class PreferencesActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
     MyPreferenceFragment myPreferenceFragment;
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.java
index 04fd7a6be7..2a381cd0a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.java
@@ -10,9 +10,8 @@ import android.view.MenuItem;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.activities.PreferencesActivity;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.utils.PasswordProtection;
+import info.nightscout.androidaps.utils.PasswordProtection;
 
 public class SingleFragmentActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
index cce26aabae..97735ec8bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
@@ -41,16 +41,16 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRSyncStatus;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
 
 public class TDDStatsActivity extends Activity {
     private static Logger log = LoggerFactory.getLogger(TDDStatsActivity.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java b/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
index 6789bc277a..156e649851 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
@@ -12,9 +12,9 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.Round;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.Round;
 
 /**
  * Created by mike on 04.01.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
index a87b77be07..73f75b9c7d 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
@@ -9,8 +9,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.Round;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.Round;
 
 public class IobTotal {
     private static Logger log = LoggerFactory.getLogger(IobTotal.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Profile.java b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
index e6df495c40..d0ebadd746 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
-import java.util.Calendar;
 import java.util.TimeZone;
 
 import info.nightscout.androidaps.Constants;
@@ -20,10 +19,10 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.MidnightTime;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.MidnightTime;
 
 public class Profile {
     private static Logger log = LoggerFactory.getLogger(Profile.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
index 9343596eee..8938b53936 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
@@ -10,7 +10,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.interfaces.Interval;
-import info.nightscout.utils.DateUtil;
 
 /**
  * Created by mike on 09.05.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
index 404833b77c..d38b355634 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
@@ -1,8 +1,5 @@
 package info.nightscout.androidaps.data;
 
-import android.text.Html;
-import android.text.Spanned;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -11,8 +8,8 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.Round;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.Round;
 
 public class PumpEnactResult {
     private static Logger log = LoggerFactory.getLogger(L.APS);
diff --git a/app/src/main/java/info/nightscout/androidaps/data/QuickWizard.java b/app/src/main/java/info/nightscout/androidaps/data/QuickWizard.java
index 25c768cdda..80a6e1b457 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/QuickWizard.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/QuickWizard.java
@@ -1,16 +1,12 @@
 package info.nightscout.androidaps.data;
 
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 12.10.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/data/QuickWizardEntry.java b/app/src/main/java/info/nightscout/androidaps/data/QuickWizardEntry.java
index 04f297d7a9..ae649895ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/QuickWizardEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/QuickWizardEntry.java
@@ -15,9 +15,9 @@ import info.nightscout.androidaps.plugins.IobCobCalculator.CobInfo;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.BolusWizard;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.BolusWizard;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 25.12.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
index 3b5963b83b..88b8f77c38 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.db;
 
-import android.content.res.Resources;
-
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
@@ -14,15 +12,13 @@ import java.util.Objects;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_BGREADINGS)
 public class BgReading implements DataPointWithLabelInterface {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index 92a2b221ff..c4890139e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.EnumSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -31,9 +30,9 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSMbg;
 import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.T;
-import info.nightscout.utils.Translator;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.Translator;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_CAREPORTALEVENTS)
 public class CareportalEvent implements DataPointWithLabelInterface, Interval {
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 f0fed6fd2f..04001184ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -48,15 +48,15 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRNSHistorySync;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.database.InsightBolusID;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.database.InsightHistoryOffset;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.database.InsightPumpID;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
-import info.nightscout.utils.JsonHelper;
-import info.nightscout.utils.PercentageSplitter;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRNSHistorySync;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
+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;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * This Helper contains all resource to provide a central DB management functionality. Only methods handling
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
index b4fda73ab6..493dbb7f64 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
@@ -9,7 +9,6 @@ import android.graphics.Color;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,10 +25,10 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.JsonHelper;
-import info.nightscout.utils.Round;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.JsonHelper;
+import info.nightscout.androidaps.utils.Round;
 
 /**
  * Created by mike on 21.05.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
index f7252e97df..00d0e9a72f 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
@@ -6,7 +6,6 @@ import android.support.annotation.Nullable;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,9 +23,9 @@ import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWith
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfilePlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.T;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_PROFILESWITCHES)
 public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
@@ -104,7 +103,7 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
     /**
      * Note: the name returned here is used as the PS name when uploading to NS. When such a PS is retrieved
      * again from NS, the added parts must be removed again, see
-     * {@link info.nightscout.utils.PercentageSplitter#pureName}
+     * {@link info.nightscout.androidaps.utils.PercentageSplitter#pureName}
      */
     public String getCustomizedName() {
         String name = profileName;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java b/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
index 15692cbdfe..a496af802b 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
@@ -6,14 +6,13 @@ import com.j256.ormlite.table.DatabaseTable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
 import java.util.Objects;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.interfaces.Interval;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 @DatabaseTable(tableName = DatabaseHelper.DATABASE_TEMPTARGETS)
 public class TempTarget implements Interval {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index eeaa8c0ee7..778e69ba21 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Objects;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.data.IobTotal;
@@ -19,9 +18,9 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 21.05.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.java b/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.java
index 57050bdcc9..546d6f8624 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.java
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.java
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.events;
 
 
-import info.nightscout.utils.StringUtils;
+import info.nightscout.androidaps.utils.StringUtils;
 
 public class EventNetworkChange extends Event {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
index 34221b203f..e4a02883e8 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.interfaces;
 
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpCapability;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpTempBasalType;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpCapability;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpTempBasalType;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 
 /**
  * Created by mike on 08.12.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/L.java b/app/src/main/java/info/nightscout/androidaps/logging/L.java
index 0fde02f4ed..2c9201bd79 100644
--- a/app/src/main/java/info/nightscout/androidaps/logging/L.java
+++ b/app/src/main/java/info/nightscout/androidaps/logging/L.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.logging;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class L {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
index a71b447d82..f9549d9a56 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
@@ -35,8 +35,8 @@ import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.SingleClickButton;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.SingleClickButton;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
index aed10c9e2f..6d9e229250 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
@@ -37,15 +37,15 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.ToastUtils;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 
 public class FillDialog extends DialogFragment implements OnClickListener {
     private static Logger log = LoggerFactory.getLogger(FillDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
index 710874a790..71754988c7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
@@ -12,7 +12,6 @@ import android.view.ViewGroup;
 
 import com.crashlytics.android.answers.CustomEvent;
 
-import org.mozilla.javascript.tools.jsc.Main;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,9 +23,9 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SafeParse;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SafeParse;
 
 public class NewExtendedBolusDialog extends DialogFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(NewExtendedBolusDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java
index 95abf173db..92bb8c398d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java
@@ -28,9 +28,9 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SafeParse;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SafeParse;
 
 public class NewTempBasalDialog extends DialogFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener {
     private static Logger log = LoggerFactory.getLogger(NewTempBasalDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
index e39480691e..eca8a2d228 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
@@ -27,7 +27,7 @@ import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
 import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 public class CareportalFragment extends SubscriberFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(CareportalFragment.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
index cb495059b8..8613e4bf0a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
@@ -53,15 +53,15 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DefaultValueHelper;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.HardLimits;
-import info.nightscout.utils.JsonHelper;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.Translator;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DefaultValueHelper;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.HardLimits;
+import info.nightscout.androidaps.utils.JsonHelper;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.Translator;
 
 public class NewNSTreatmentDialog extends DialogFragment implements View.OnClickListener, DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener {
     private static Logger log = LoggerFactory.getLogger(NewNSTreatmentDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
index 3df78c9a28..2ee844d1ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
@@ -42,10 +42,10 @@ import info.nightscout.androidaps.interfaces.SensitivityInterface;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefRapidActingPlugin;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref0Plugin;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.PasswordProtection;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.PasswordProtection;
 
 
 public class ConfigBuilderFragment extends SubscriberFragment {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
index 588ba2ac93..e3fa1acfed 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
@@ -21,10 +21,10 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.SensitivityInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefRapidActingPlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref0Plugin;
 import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ProfileFunctions.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ProfileFunctions.java
index 312c0cd9ae..813436fb5a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ProfileFunctions.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ProfileFunctions.java
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 public class ProfileFunctions {
     private static Logger log = LoggerFactory.getLogger(L.PROFILE);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java
index 3dcec0920f..f77319c37f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.objectives.Objective;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 public class ObjectivesFragment extends SubscriberFragment {
     RecyclerView recyclerView;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
index cc50189346..53760be454 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
@@ -27,7 +27,7 @@ import info.nightscout.androidaps.plugins.ConstraintsObjectives.objectives.Objec
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.objectives.Objective6;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.objectives.Objective7;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.objectives.Objective8;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java
index 5127f64b34..991d345c6c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java
@@ -8,8 +8,8 @@ import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
 
 public abstract class Objective {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective1.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective1.java
index 39127c4d45..1c3dd03a27 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective1.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective1.java
@@ -11,10 +11,10 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 public class Objective1 extends Objective {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective2.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective2.java
index ac5485f953..203a43cb1e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective2.java
@@ -5,7 +5,7 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.T;
 
 public class Objective2 extends Objective {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective4.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective4.java
index 4cac10e514..b4bfb82440 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective4.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective4.java
@@ -5,7 +5,7 @@ import java.util.List;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.T;
 
 public class Objective4 extends Objective {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective5.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective5.java
index 8472f26c6c..5cfe73e07e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective5.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective5.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.T;
 
 public class Objective5 extends Objective {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective6.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective6.java
index 7867b28e70..7e4e2ddcf8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective6.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective6.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.ConstraintsObjectives.objectives;
 import java.util.List;
 
 import info.nightscout.androidaps.R;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.T;
 
 public class Objective6 extends Objective {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective7.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective7.java
index 670cffe746..2baac54ac9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective7.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective7.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.ConstraintsObjectives.objectives;
 import java.util.List;
 
 import info.nightscout.androidaps.R;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.T;
 
 public class Objective7 extends Objective {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective8.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective8.java
index 9ac4f9b6d7..9e6da6e723 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective8.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective8.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.ConstraintsObjectives.objectives;
 import java.util.List;
 
 import info.nightscout.androidaps.R;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.T;
 
 public class Objective8 extends Objective {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java
index ac3f06b769..076f61f3e7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java
@@ -20,10 +20,10 @@ import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref1Plugin;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.HardLimits;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.HardLimits;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Food/Food.java b/app/src/main/java/info/nightscout/androidaps/plugins/Food/Food.java
index 49da1d6ac5..0726ca89aa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Food/Food.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Food/Food.java
@@ -8,7 +8,7 @@ import org.json.JSONObject;
 
 import java.util.Objects;
 
-import info.nightscout.utils.JsonHelper;
+import info.nightscout.androidaps.utils.JsonHelper;
 
 /**
  * Created by mike on 20.09.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java
index 677fac5fb2..deae342f55 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java
@@ -32,9 +32,9 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SpinnerHelper;
+import info.nightscout.androidaps.utils.SpinnerHelper;
 
 /**
  * Created by mike on 16.10.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFragment.java
index 79db5e1a8b..16ea821b25 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFragment.java
@@ -11,7 +11,7 @@ import android.widget.TextView;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 /**
  * Created by mike on 17.04.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java
index c1fc44438f..08471e637d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.Insulin;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by adrian on 14/08/17.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java
index 56af4ba12f..95764e0cb9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java
@@ -21,8 +21,7 @@ import info.nightscout.androidaps.plugins.Overview.graphExtensions.Scale;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 25.04.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/CobInfo.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/CobInfo.java
index d8b6d7674a..996cbeb70d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/CobInfo.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/CobInfo.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.IobCobCalculator;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 public class CobInfo {
     /** All COB up to now, including carbs not yet processed by IobCob calculation. */
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java
index b94076a377..e4e0a7c424 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java
@@ -38,10 +38,10 @@ import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref1Plugin;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.T;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 
 /**
  * Created by mike on 24.04.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobOref1Thread.java
index 172a6bbc47..ae170f3c87 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobOref1Thread.java
@@ -35,14 +35,14 @@ import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.MidnightTime;
-import info.nightscout.utils.Profiler;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.MidnightTime;
+import info.nightscout.androidaps.utils.Profiler;
+import info.nightscout.androidaps.utils.SP;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 import static java.util.Calendar.MINUTE;
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java
index aa1f09592e..269669fc20 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java
@@ -35,14 +35,14 @@ import info.nightscout.androidaps.plugins.Sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.MidnightTime;
-import info.nightscout.utils.Profiler;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.MidnightTime;
+import info.nightscout.androidaps.utils.Profiler;
+import info.nightscout.androidaps.utils.SP;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 
 /**
  * Created by mike on 23.01.2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
index 3678617c96..a43bf7e81e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
@@ -25,8 +25,8 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 09.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java
index 0c0e31fb03..6f6f8b998d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java
@@ -13,9 +13,6 @@ import android.widget.TextView;
 import com.crashlytics.android.answers.CustomEvent;
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -25,7 +22,7 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.Loop.events.EventLoopSetLastRunGui;
 import info.nightscout.androidaps.plugins.Loop.events.EventLoopUpdateGui;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 public class LoopFragment extends SubscriberFragment {
     @BindView(R.id.loop_run)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
index 0b20ddf582..1e62361433 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
@@ -51,16 +51,16 @@ import info.nightscout.androidaps.plugins.Loop.events.EventLoopSetLastRunGui;
 import info.nightscout.androidaps.plugins.Loop.events.EventLoopUpdateGui;
 import info.nightscout.androidaps.plugins.Loop.events.EventNewOpenLoopNotification;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.plugins.Wear.ActionStringHandler;
 import info.nightscout.androidaps.events.EventAcceptOpenLoopChange;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/ImportExportPrefs.java b/app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/ImportExportPrefs.java
index d108382c92..de79f427e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/ImportExportPrefs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/ImportExportPrefs.java
@@ -4,7 +4,6 @@ import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Environment;
@@ -29,9 +28,8 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.utils.OKDialog;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.OKDialog;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * Created by mike on 03.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/MaintenancePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/MaintenancePlugin.java
index c73a5160ac..1edf87c2de 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/MaintenancePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/MaintenancePlugin.java
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class MaintenancePlugin extends PluginBase {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientFragment.java
index 9eff2ca84c..a1e472c6c0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientFragment.java
@@ -20,18 +20,14 @@ import android.widget.TextView;
 import com.crashlytics.android.answers.CustomEvent;
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientNewLog;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientUpdateGUI;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.SP;
 
 public class NSClientFragment extends SubscriberFragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
     private TextView logTextView;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientPlugin.java
index 69de5934f8..c201d90dc8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientPlugin.java
@@ -34,8 +34,8 @@ import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientN
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientStatus;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientUpdateGUI;
 import info.nightscout.androidaps.plugins.NSClientInternal.services.NSClientService;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 public class NSClientPlugin extends PluginBase {
     private Logger log = LoggerFactory.getLogger(L.NSCLIENT);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSUpload.java
index 9ae8f3b0ec..c8f1371b4e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSUpload.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSUpload.java
@@ -40,9 +40,9 @@ import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.plugins.Loop.DeviceStatus;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.DbLogger;
-import info.nightscout.utils.BatteryLevel;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.BatteryLevel;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 26.05.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegate.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegate.java
index ba6ec2c80b..5dc1eda164 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegate.java
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.events.EventNetworkChange;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.receivers.ChargingStateReceiver;
 import info.nightscout.androidaps.receivers.NetworkChangeReceiver;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 class NsClientReceiverDelegate {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java
index f94f9e51aa..f1d771e4fa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAckAlarm.java
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSAlarm;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 11.06.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java
index 8f75d92365..f47ba60947 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAlarm.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 26.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java
index 5e1b01f225..6fed87b0f7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastAnnouncement.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 26.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java
index 4e49785f82..311083b688 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastCals.java
@@ -10,7 +10,7 @@ import org.json.JSONArray;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 26.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java
index e6fec32ffa..ca03468dad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastClearAlarm.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 26.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java
index 4915608673..f5b504e6b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java
@@ -12,7 +12,7 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 
 public class BroadcastDeviceStatus {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastFood.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastFood.java
index f38141ec6d..12a170cedc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastFood.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastFood.java
@@ -12,7 +12,7 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 20.02.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java
index e91c3e2fd6..d9a5c953c4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastMbgs.java
@@ -10,7 +10,7 @@ import org.json.JSONArray;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 26.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java
index 6bd6bbc81a..83b7ff735b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java
index dea4cf8713..f122d1b876 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastSgvs.java
@@ -12,7 +12,7 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 22.02.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
index a0e8607efc..f672cd623c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
 import info.nightscout.androidaps.plugins.NSClientInternal.services.NSClientService;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 24.02.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
index 4f36d85348..c8b8dffe18 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
@@ -17,7 +17,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 20.02.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java
index c8988141d7..630f2da4aa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastUrgentAlarm.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 26.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/DbLogger.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/DbLogger.java
index ec31141002..655286cd44 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/DbLogger.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/DbLogger.java
@@ -11,7 +11,7 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * Created by mike on 02.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
index b48319f979..48448c3d4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
@@ -21,9 +21,9 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.logging.BundleLogger;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 25.06.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/AckAlarmReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/AckAlarmReceiver.java
index f23533e9ab..373c0c436b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/AckAlarmReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/AckAlarmReceiver.java
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.AlarmAck;
 import info.nightscout.androidaps.plugins.NSClientInternal.services.NSClientService;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class AckAlarmReceiver extends BroadcastReceiver {
     private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
index 896382d818..3f94c64627 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
@@ -20,8 +20,8 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastTreatment;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 public class DBAccessReceiver extends BroadcastReceiver {
     private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
index 2066aaa423..6e3fe308a3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java
@@ -63,11 +63,11 @@ import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientU
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.JsonHelper;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.JsonHelper;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
index 50e79d1e37..2adb216489 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
@@ -31,7 +31,7 @@ import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.androidaps.plugins.OpenAPSMA.LoggerCallback;
 import info.nightscout.androidaps.plugins.OpenAPSSMB.SMBDefaults;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class DetermineBasalAdapterAMAJS {
     private static Logger log = LoggerFactory.getLogger(L.APS);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
index 77c8d8a860..f2ed354496 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class DetermineBasalResultAMA extends APSResult {
     private static Logger log = LoggerFactory.getLogger(L.APS);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java
index 1874816ddc..0b3fdb0678 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAFragment.java
@@ -22,9 +22,9 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.JSONFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.JSONFormatter;
 
 public class OpenAPSAMAFragment extends SubscriberFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(L.APS);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
index 3bf1301416..d2bd50edd9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
@@ -11,7 +11,6 @@ import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
@@ -28,10 +27,10 @@ import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.HardLimits;
-import info.nightscout.utils.Profiler;
-import info.nightscout.utils.Round;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.HardLimits;
+import info.nightscout.androidaps.utils.Profiler;
+import info.nightscout.androidaps.utils.Round;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
index 1574665dc4..bc607cfa88 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
@@ -25,7 +25,7 @@ import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class DetermineBasalAdapterMAJS {
     private static Logger log = LoggerFactory.getLogger(L.APS);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java
index 12d7988a16..de6e99247a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java
@@ -15,9 +15,9 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.JSONFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.JSONFormatter;
 
 public class OpenAPSMAFragment extends SubscriberFragment implements View.OnClickListener {
     Button run;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
index 5b59252ea1..e07a463c94 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
@@ -11,7 +11,6 @@ import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
@@ -25,13 +24,13 @@ import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.HardLimits;
-import info.nightscout.utils.Profiler;
-import info.nightscout.utils.Round;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.HardLimits;
+import info.nightscout.androidaps.utils.Profiler;
+import info.nightscout.androidaps.utils.Round;
 
-import static info.nightscout.utils.HardLimits.checkOnlyHardLimits;
-import static info.nightscout.utils.HardLimits.verifyHardLimits;
+import static info.nightscout.androidaps.utils.HardLimits.checkOnlyHardLimits;
+import static info.nightscout.androidaps.utils.HardLimits.verifyHardLimits;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java
index 820c4da98e..009a73da0e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -30,8 +30,8 @@ import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugi
 import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.androidaps.plugins.OpenAPSMA.LoggerCallback;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
 
 public class DetermineBasalAdapterSMBJS {
     private static Logger log = LoggerFactory.getLogger(L.APS);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalResultSMB.java
index 364731bea5..a10f5ad059 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalResultSMB.java
@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class DetermineBasalResultSMB extends APSResult {
     private static final Logger log = LoggerFactory.getLogger(L.APS);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBFragment.java
index d27f8b31d0..576005c86b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBFragment.java
@@ -25,9 +25,9 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.JSONFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.JSONFormatter;
 
 public class OpenAPSSMBFragment extends SubscriberFragment {
     private static Logger log = LoggerFactory.getLogger(L.APS);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java
index 1d6b558c74..00310feeb1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java
@@ -4,8 +4,6 @@ import org.json.JSONException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.GlucoseStatus;
@@ -13,7 +11,6 @@ import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginBase;
@@ -32,11 +29,11 @@ import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.HardLimits;
-import info.nightscout.utils.Profiler;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.HardLimits;
+import info.nightscout.androidaps.utils.Profiler;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
index f1f62c0bc4..0d1002e23f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/CalibrationDialog.java
@@ -19,15 +19,14 @@ import org.slf4j.LoggerFactory;
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.XdripCalibrations;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.XdripCalibrations;
 
 public class CalibrationDialog extends DialogFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(CalibrationDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/EditQuickWizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/EditQuickWizardDialog.java
index 50de25b656..1c2c5c0d8d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/EditQuickWizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/EditQuickWizardDialog.java
@@ -24,8 +24,8 @@ import info.nightscout.androidaps.data.QuickWizard;
 import info.nightscout.androidaps.data.QuickWizardEntry;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventQuickWizardChange;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SafeParse;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SafeParse;
 
 public class EditQuickWizardDialog extends DialogFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(EditQuickWizardDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/ErrorHelperActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/ErrorHelperActivity.java
index c556a6c844..c9a0cab812 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/ErrorHelperActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/ErrorHelperActivity.java
@@ -5,7 +5,7 @@ import android.support.v7.app.AppCompatActivity;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class ErrorHelperActivity extends AppCompatActivity {
     public ErrorHelperActivity() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
index 40450adf77..b0ae73da76 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
@@ -42,14 +42,14 @@ import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.plugins.Treatments.CarbsGenerator;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.DefaultValueHelper;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DefaultValueHelper;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.ToastUtils;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 
 public class NewCarbsDialog extends DialogFragment implements OnClickListener, CompoundButton.OnCheckedChangeListener {
     private static Logger log = LoggerFactory.getLogger(NewCarbsDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
index 8545858d4e..80db6ccb1f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java
@@ -44,16 +44,16 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.T;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.ToastUtils;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 
 public class NewInsulinDialog extends DialogFragment implements OnClickListener {
     private static Logger log = LoggerFactory.getLogger(NewInsulinDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
index b1a8bf172a..d376a5064d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@@ -35,11 +35,11 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 public class NewTreatmentDialog extends DialogFragment implements OnClickListener {
     private static Logger log = LoggerFactory.getLogger(NewTreatmentDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index 1b6a4f2ff8..bb0cdd51e0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -64,14 +64,14 @@ import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensC
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.BolusWizard;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.BolusWizard;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 public class WizardDialog extends DialogFragment implements OnClickListener, CompoundButton.OnCheckedChangeListener, Spinner.OnItemSelectedListener {
     private static Logger log = LoggerFactory.getLogger(WizardDialog.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index c39a3c9be8..dad4b8e712 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -116,19 +116,19 @@ import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.plugins.Treatments.fragments.ProfileViewerDialog;
 import info.nightscout.androidaps.plugins.Wear.ActionStringHandler;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.BolusWizard;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.DefaultValueHelper;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.OKDialog;
-import info.nightscout.utils.Profiler;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SingleClickButton;
-import info.nightscout.utils.T;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.BolusWizard;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DefaultValueHelper;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.OKDialog;
+import info.nightscout.androidaps.utils.Profiler;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SingleClickButton;
+import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.ToastUtils;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 
 public class OverviewFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener {
     private static Logger log = LoggerFactory.getLogger(L.OVERVIEW);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java
index b184201908..9ed06189c8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.NotificationStore;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/activities/QuickWizardListActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/activities/QuickWizardListActivity.java
index 237575c328..440fd9365c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/activities/QuickWizardListActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/activities/QuickWizardListActivity.java
@@ -21,8 +21,8 @@ import info.nightscout.androidaps.data.QuickWizard;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.EditQuickWizardDialog;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventQuickWizardChange;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 public class QuickWizardListActivity extends AppCompatActivity implements View.OnClickListener {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java
index 2bd7790c37..f1b5d6a4bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java
@@ -45,7 +45,7 @@ import info.nightscout.androidaps.plugins.Overview.graphExtensions.ScaledDataPoi
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.TimeAsXAxisLabelFormatter;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.Round;
+import info.nightscout.androidaps.utils.Round;
 
 /**
  * Created by mike on 18.10.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
index 29f7460693..f8890a4c74 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
@@ -1,9 +1,6 @@
 
 package info.nightscout.androidaps.plugins.Overview.notifications;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Date;
 
 import info.nightscout.androidaps.MainApp;
@@ -11,7 +8,7 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSAlarm;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 // Added by Rumen for debugging
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationRecyclerViewAdapter.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationRecyclerViewAdapter.java
index 9af6be3be3..19ad37af44 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationRecyclerViewAdapter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationRecyclerViewAdapter.java
@@ -21,8 +21,8 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastAckAlarm;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 public class NotificationRecyclerViewAdapter extends RecyclerView.Adapter<NotificationRecyclerViewAdapter.NotificationsViewHolder> {
     private static Logger log = LoggerFactory.getLogger(L.NOTIFICATION);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
index 7c4469521d..f1ba81f9c2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
@@ -26,7 +26,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.services.AlarmSoundService;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 03.12.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
index 6b93b7a715..1dfd4929e6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
@@ -14,8 +14,6 @@ import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
 
 // Android Auto
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.app.RemoteInput;
 
 
@@ -48,7 +46,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 /**
  * Created by adrian on 23/12/16.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java
index 0445ef3402..78fa3cc217 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java
@@ -15,9 +15,6 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.MainApp;
@@ -25,16 +22,15 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Careportal.CareportalFragment;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
 import info.nightscout.androidaps.plugins.Careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.TimeListEdit;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.NumberPicker;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.TimeListEdit;
 
 public class LocalProfileFragment extends SubscriberFragment {
     NumberPicker diaView;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java
index 7a06860327..f0e01b4c5b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java
@@ -18,8 +18,8 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java
index 4edaef1761..c2a47b1101 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java
@@ -27,8 +27,8 @@ import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.ProfileNS.events.EventNSProfileUpdateGUI;
 import info.nightscout.androidaps.plugins.Treatments.fragments.ProfileGraph;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.OKDialog;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.OKDialog;
 
 import static butterknife.OnItemSelected.Callback.NOTHING_SELECTED;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
index 99e4ad9115..4e8a01a15b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.plugins.ProfileNS.events.EventNSProfileUpdateGUI;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java
index b4338366bd..c1530d4ab8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java
@@ -15,9 +15,6 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventInitializationChanged;
@@ -26,7 +23,7 @@ import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialo
 import info.nightscout.androidaps.plugins.Careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.utils.SafeParse;
+import info.nightscout.androidaps.utils.SafeParse;
 
 public class SimpleProfileFragment extends SubscriberFragment {
     EditText diaView;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java
index 09742bd3f9..2ceeec9edf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/CloseConfigurationWriteSessionMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/CloseConfigurationWriteSessionMessage.java
deleted file mode 100644
index 3bf10ba6c0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/CloseConfigurationWriteSessionMessage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-
-public class CloseConfigurationWriteSessionMessage extends AppLayerMessage {
-
-    public CloseConfigurationWriteSessionMessage() {
-        super(MessagePriority.NORMAL, false, false, Service.CONFIGURATION);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/OpenConfigurationWriteSessionMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/OpenConfigurationWriteSessionMessage.java
deleted file mode 100644
index fe7e39c013..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/OpenConfigurationWriteSessionMessage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-
-public class OpenConfigurationWriteSessionMessage extends AppLayerMessage {
-
-    public OpenConfigurationWriteSessionMessage() {
-        super(MessagePriority.NORMAL, false, false, Service.CONFIGURATION);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ConnectMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ConnectMessage.java
deleted file mode 100644
index 5f728731d7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ConnectMessage.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection;
-
-import org.spongycastle.util.encoders.Hex;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-
-public class ConnectMessage extends AppLayerMessage {
-
-    public ConnectMessage() {
-        super(MessagePriority.NORMAL, false, false, Service.CONNECTION);
-    }
-
-    @Override
-    protected ByteBuf getData() {
-        return ByteBuf.from(Hex.decode("0000080100196000"));
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/DisconnectMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/DisconnectMessage.java
deleted file mode 100644
index 992523b5b5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/DisconnectMessage.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection;
-
-import org.spongycastle.util.encoders.Hex;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-
-public class DisconnectMessage extends AppLayerMessage {
-
-    public DisconnectMessage() {
-        super(MessagePriority.NORMAL, false, false, Service.CONNECTION);
-    }
-
-    @Override
-    protected ByteBuf getData() {
-        return ByteBuf.from(Hex.decode("0360"));
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/HistoryReadingDirection.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/HistoryReadingDirection.java
deleted file mode 100644
index 77d40214d5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/HistoryReadingDirection.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history;
-
-public enum HistoryReadingDirection {
-
-    FORWARD,
-    BACKWARD;
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/StopReadingHistoryMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/StopReadingHistoryMessage.java
deleted file mode 100644
index 16dcab7d27..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/StopReadingHistoryMessage.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-
-public class StopReadingHistoryMessage extends AppLayerMessage {
-
-    public StopReadingHistoryMessage() {
-        super(MessagePriority.NORMAL, false, false, Service.HISTORY);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CartridgeInsertedEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CartridgeInsertedEvent.java
deleted file mode 100644
index 750c481116..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CartridgeInsertedEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
-
-public class CartridgeInsertedEvent extends HistoryEvent {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CartridgeRemovedEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CartridgeRemovedEvent.java
deleted file mode 100644
index e32e9a1c23..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CartridgeRemovedEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
-
-public class CartridgeRemovedEvent extends HistoryEvent {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/DefaultDateTimeSetEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/DefaultDateTimeSetEvent.java
deleted file mode 100644
index 2c0971f474..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/DefaultDateTimeSetEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
-
-public class DefaultDateTimeSetEvent extends HistoryEvent {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfErrorEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfErrorEvent.java
deleted file mode 100644
index 0c17f9a6be..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfErrorEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
-
-public class OccurrenceOfErrorEvent extends OccurrenceOfAlertEvent {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java
deleted file mode 100644
index e18de9ab27..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
-
-public class OccurrenceOfMaintenanceEvent extends OccurrenceOfAlertEvent {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfWarningEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfWarningEvent.java
deleted file mode 100644
index 95d40e36c2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfWarningEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
-
-public class OccurrenceOfWarningEvent extends OccurrenceOfAlertEvent {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/PowerDownEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/PowerDownEvent.java
deleted file mode 100644
index 939f028fd8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/PowerDownEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
-
-public class PowerDownEvent extends HistoryEvent {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/PowerUpEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/PowerUpEvent.java
deleted file mode 100644
index e5ec8184cb..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/PowerUpEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
-
-public class PowerUpEvent extends HistoryEvent {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile1Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile1Block.java
deleted file mode 100644
index 99c9c1bd74..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile1Block.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile1Block extends BRProfileBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile1NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile1NameBlock.java
deleted file mode 100644
index 670b889292..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile1NameBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile1NameBlock extends NameBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile2Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile2Block.java
deleted file mode 100644
index 11a275196f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile2Block.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile2Block extends BRProfileBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile2NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile2NameBlock.java
deleted file mode 100644
index 0da19911a9..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile2NameBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile2NameBlock extends NameBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile3Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile3Block.java
deleted file mode 100644
index 8c9875bfea..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile3Block.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile3Block extends BRProfileBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile3NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile3NameBlock.java
deleted file mode 100644
index 1b63926131..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile3NameBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile3NameBlock extends NameBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile4Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile4Block.java
deleted file mode 100644
index 2a22a34e63..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile4Block.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile4Block extends BRProfileBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile4NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile4NameBlock.java
deleted file mode 100644
index 26d0a52fa3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile4NameBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile4NameBlock extends NameBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile5Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile5Block.java
deleted file mode 100644
index ebb5fac320..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile5Block.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile5Block extends BRProfileBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile5NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile5NameBlock.java
deleted file mode 100644
index 15df4436b7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfile5NameBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class BRProfile5NameBlock extends NameBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java
deleted file mode 100644
index 638470a159..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class FactoryMaxBasalAmountBlock extends InsulinAmountLimitationBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java
deleted file mode 100644
index 7626546f71..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class FactoryMaxBolusAmountBlock extends InsulinAmountLimitationBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java
deleted file mode 100644
index 15da6dee8b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class FactoryMinBasalAmountBlock extends InsulinAmountLimitationBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java
deleted file mode 100644
index 43daa70db5..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class FactoryMinBolusAmountBlock extends InsulinAmountLimitationBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/MaxBasalAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/MaxBasalAmountBlock.java
deleted file mode 100644
index e7c4f5a089..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/MaxBasalAmountBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class MaxBasalAmountBlock extends InsulinAmountLimitationBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/MaxBolusAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/MaxBolusAmountBlock.java
deleted file mode 100644
index eae1404127..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/MaxBolusAmountBlock.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-public class MaxBolusAmountBlock extends InsulinAmountLimitationBlock {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/ParameterBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/ParameterBlock.java
deleted file mode 100644
index 1a64f0776e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/ParameterBlock.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-
-public abstract class ParameterBlock {
-
-    public abstract void parse(ByteBuf byteBuf);
-    public abstract ByteBuf getData();
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/CancelTBRMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/CancelTBRMessage.java
deleted file mode 100644
index b331e846ac..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/CancelTBRMessage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-
-public class CancelTBRMessage extends AppLayerMessage {
-    public CancelTBRMessage() {
-        super(MessagePriority.HIGHER, false, false, Service.REMOTE_CONTROL);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetOperatingModeMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetOperatingModeMessage.java
deleted file mode 100644
index a217ab54f7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetOperatingModeMessage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.OperatingMode;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.OperatingModeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-
-public class SetOperatingModeMessage extends AppLayerMessage {
-
-    private OperatingMode operatingMode;
-
-    public SetOperatingModeMessage() {
-        super(MessagePriority.HIGHEST, false, true, Service.REMOTE_CONTROL);
-    }
-
-    @Override
-    protected ByteBuf getData() {
-        ByteBuf byteBuf = new ByteBuf(2);
-        byteBuf.putUInt16LE(OperatingModeIDs.IDS.getID(operatingMode));
-        return byteBuf;
-    }
-
-    public void setOperatingMode(OperatingMode operatingMode) {
-        this.operatingMode = operatingMode;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetOperatingModeMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetOperatingModeMessage.java
deleted file mode 100644
index ebf7607801..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetOperatingModeMessage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.OperatingMode;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.OperatingModeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-
-public class GetOperatingModeMessage extends AppLayerMessage {
-
-    private OperatingMode operatingMode;
-
-    public GetOperatingModeMessage() {
-        super(MessagePriority.NORMAL, true, false, Service.STATUS);
-    }
-
-    @Override
-    protected void parse(ByteBuf byteBuf) {
-        this.operatingMode = OperatingModeIDs.IDS.getType(byteBuf.readUInt16LE());
-    }
-
-    public OperatingMode getOperatingMode() {
-        return this.operatingMode;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertStatus.java
deleted file mode 100644
index 0920e0b1a8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertStatus.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
-
-public enum AlertStatus {
-
-    ACTIVE,
-    SNOOZED;
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BatteryType.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BatteryType.java
deleted file mode 100644
index d161d1eafa..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BatteryType.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
-
-public enum BatteryType {
-
-    ALKALI,
-    LITHIUM,
-    NI_MH;
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BolusType.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BolusType.java
deleted file mode 100644
index 89b8c883fc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BolusType.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
-
-public enum BolusType {
-
-    STANDARD,
-    EXTENDED,
-    MULTIWAVE;
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/CartridgeType.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/CartridgeType.java
deleted file mode 100644
index 399296e033..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/CartridgeType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
-
-public enum CartridgeType {
-
-    PREFILLED,
-    SELF_FILLED;
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/MessagePriority.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/MessagePriority.java
deleted file mode 100644
index 7dd8159737..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/MessagePriority.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
-
-public enum MessagePriority {
-
-    NORMAL,
-    HIGHER,
-    HIGHEST;
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/OperatingMode.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/OperatingMode.java
deleted file mode 100644
index 17c6ca01a1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/OperatingMode.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
-
-public enum OperatingMode {
-
-    STARTED,
-    STOPPED,
-    PAUSED;
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/SymbolStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/SymbolStatus.java
deleted file mode 100644
index 529f408e42..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/SymbolStatus.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
-
-public enum SymbolStatus {
-
-    FULL,
-    LOW,
-    EMPTY;
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/AppLayerException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/AppLayerException.java
deleted file mode 100644
index 4fb957d64d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/AppLayerException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public abstract class AppLayerException extends InsightException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ConnectionLostException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ConnectionLostException.java
deleted file mode 100644
index 7068a25e98..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ConnectionLostException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class ConnectionLostException extends InsightException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/DisconnectedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/DisconnectedException.java
deleted file mode 100644
index 2f5d59c54a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/DisconnectedException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class DisconnectedException extends InsightException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InsightException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InsightException.java
deleted file mode 100644
index 1db85c723d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InsightException.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public abstract class InsightException extends Exception {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidAppCRCException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidAppCRCException.java
deleted file mode 100644
index b1253b26b9..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidAppCRCException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class InvalidAppCRCException extends AppLayerException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidMacTrailerException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidMacTrailerException.java
deleted file mode 100644
index 3a80494762..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidMacTrailerException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class InvalidMacTrailerException extends SatlException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidNonceException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidNonceException.java
deleted file mode 100644
index 53dc504cf3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidNonceException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class InvalidNonceException extends SatlException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidPacketLengthsException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidPacketLengthsException.java
deleted file mode 100644
index d5eaff3a81..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidPacketLengthsException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class InvalidPacketLengthsException extends SatlException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidPreambleException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidPreambleException.java
deleted file mode 100644
index dabf025d87..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidPreambleException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class InvalidPreambleException extends SatlException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidSatlCRCException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidSatlCRCException.java
deleted file mode 100644
index 21c61d5379..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidSatlCRCException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class InvalidSatlCRCException extends SatlException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidSatlCommandException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidSatlCommandException.java
deleted file mode 100644
index d720eab1c3..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/InvalidSatlCommandException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class InvalidSatlCommandException extends SatlException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SatlException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SatlException.java
deleted file mode 100644
index 0dc295fd8d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SatlException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public abstract class SatlException extends InsightException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/TimeoutException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/TimeoutException.java
deleted file mode 100644
index 2c03b9d8cc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/TimeoutException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class TimeoutException extends InsightException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/TooChattyPumpException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/TooChattyPumpException.java
deleted file mode 100644
index f46862846c..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/TooChattyPumpException.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class TooChattyPumpException extends InsightException {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/UnknownServiceException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/UnknownServiceException.java
deleted file mode 100644
index f4d54ed5ce..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/UnknownServiceException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
-
-public class UnknownServiceException extends AppLayerException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlCompatibleStateErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlCompatibleStateErrorException.java
deleted file mode 100644
index 703bb7cccc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlCompatibleStateErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlCompatibleStateErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlErrorException.java
deleted file mode 100644
index eb3ee0a703..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlErrorException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InsightException;
-
-public abstract class SatlErrorException extends InsightException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidCRCErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidCRCErrorException.java
deleted file mode 100644
index d96a5920e6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidCRCErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlInvalidCRCErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidCommIdErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidCommIdErrorException.java
deleted file mode 100644
index 9fa4e095aa..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidCommIdErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlInvalidCommIdErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidMacErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidMacErrorException.java
deleted file mode 100644
index c207dc20a4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidMacErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlInvalidMacErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java
deleted file mode 100644
index d52a81a168..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlInvalidMessageTypeErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidNonceErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidNonceErrorException.java
deleted file mode 100644
index 309fa6916b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidNonceErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlInvalidNonceErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidPacketErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidPacketErrorException.java
deleted file mode 100644
index dd5e611d66..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidPacketErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlInvalidPacketErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlNoneErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlNoneErrorException.java
deleted file mode 100644
index d55280118b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlNoneErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlNoneErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlPairingRejectedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlPairingRejectedException.java
deleted file mode 100644
index 2e5be0efe0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlPairingRejectedException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlPairingRejectedException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlUndefinedErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlUndefinedErrorException.java
deleted file mode 100644
index a905fa2e31..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlUndefinedErrorException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlUndefinedErrorException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlWrongStateException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlWrongStateException.java
deleted file mode 100644
index 2f75c664cf..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlWrongStateException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
-
-public class SatlWrongStateException extends SatlErrorException {
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertStatusIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertStatusIDs.java
deleted file mode 100644
index 626ebb93c0..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertStatusIDs.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
-
-public class AlertStatusIDs {
-
-    public static final IDStorage<AlertStatus, Integer> IDS = new IDStorage<>();
-
-    static {
-        IDS.put(AlertStatus.ACTIVE, 31);
-        IDS.put(AlertStatus.SNOOZED, 227);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AppCommandIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AppCommandIDs.java
deleted file mode 100644
index e13870517b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AppCommandIDs.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.SetDateTimeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.ReadParameterBlockMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.CloseConfigurationWriteSessionMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.OpenConfigurationWriteSessionMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.WriteConfigurationBlockMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.ActivateServiceMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.BindMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.ConnectMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.DisconnectMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.ServiceChallengeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.ReadHistoryEventsMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.StartReadingHistoryMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.StopReadingHistoryMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.CancelBolusMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.CancelTBRMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.ChangeTBRMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.ConfirmAlertMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.DeliverBolusMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.GetAvailableBolusTypesMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.SetOperatingModeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.SetTBRMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.SnoozeAlertMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveAlertMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveBasalRateMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveBolusesMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveTBRMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetBatteryStatusMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetCartridgeStatusMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetDateTimeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetFirmwareVersionsMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetOperatingModeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetPumpStatusRegisterMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetTotalDailyDoseMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.ResetPumpStatusRegisterMessage;
-
-public class AppCommandIDs {
-
-    public static final IDStorage<Class<? extends AppLayerMessage>, Integer> IDS = new IDStorage<>();
-
-    static {
-        IDS.put(ConnectMessage.class, 61451);
-        IDS.put(BindMessage.class, 62413);
-        IDS.put(DisconnectMessage.class, 61460);
-        IDS.put(ActivateServiceMessage.class, 61687);
-        IDS.put(ServiceChallengeMessage.class, 62418);
-        IDS.put(GetActiveAlertMessage.class, 985);
-        IDS.put(GetActiveBolusesMessage.class, 1647);
-        IDS.put(GetActiveTBRMessage.class, 1462);
-        IDS.put(GetAvailableBolusTypesMessage.class, 6362);
-        IDS.put(GetBatteryStatusMessage.class, 805);
-        IDS.put(GetCartridgeStatusMessage.class, 826);
-        IDS.put(GetDateTimeMessage.class, 227);
-        IDS.put(GetFirmwareVersionsMessage.class, 11992);
-        IDS.put(GetOperatingModeMessage.class, 252);
-        IDS.put(GetPumpStatusRegisterMessage.class, 31);
-        IDS.put(ResetPumpStatusRegisterMessage.class, 35476);
-        IDS.put(GetActiveBasalRateMessage.class, 1449);
-        IDS.put(GetTotalDailyDoseMessage.class, 966);
-        IDS.put(CancelTBRMessage.class, 6201);
-        IDS.put(CancelBolusMessage.class, 7136);
-        IDS.put(SetOperatingModeMessage.class, 6182);
-        IDS.put(ReadParameterBlockMessage.class, 7766);
-        IDS.put(WriteConfigurationBlockMessage.class, 7850);
-        IDS.put(CloseConfigurationWriteSessionMessage.class, 7861);
-        IDS.put(OpenConfigurationWriteSessionMessage.class, 7753);
-        IDS.put(DeliverBolusMessage.class, 6915);
-        IDS.put(SetTBRMessage.class, 6341);
-        IDS.put(ChangeTBRMessage.class, 42067);
-        IDS.put(ReadHistoryEventsMessage.class, 10408);
-        IDS.put(StartReadingHistoryMessage.class, 10324);
-        IDS.put(StopReadingHistoryMessage.class, 38887);
-        IDS.put(ConfirmAlertMessage.class, 1683);
-        IDS.put(SnoozeAlertMessage.class, 1676);
-        IDS.put(SetDateTimeMessage.class, 7167);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AppErrorIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AppErrorIDs.java
deleted file mode 100644
index 7ab4804109..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AppErrorIDs.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.AlreadyConnectedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.AppLayerErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.BolusAmountNotInRangeException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.BolusDurationNotInRangeException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.BolusLagTimeFeatureDisabledException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.BolusTypeAndParameterMismatchException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.CommandExecutionFailedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.ConfigMemoryAccessException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.CustomBolusNotConfiguredException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.ImplausiblePortionLengthValueException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.IncompatibleVersionException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidAlertInstanceIdException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidConfigBlockCRCException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidConfigBlockIdException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidConfigBlockLengthException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidDateParameterException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidDurationPresetException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidLagTimeException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidParameterTypeException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidPayloadCRCException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidPayloadException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidPayloadLengthException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidServicePasswordException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidTBRDurationException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidTBRFactorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidTBRTemplateException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidTimeParameterException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.InvalidValuesOfTwoChannelTransmission;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.MaximumNumberOfBolusTypeAlreadyRunningException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoActiveTBRToChangeException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoConfigBlockDataException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoServicePasswordNeededException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoSuchBolusToCancelException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NotAllowedToAccessPositionZeroException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NotConnectedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NotReferencedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.PauseModeNotAllowedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.PositionProtectedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.PumpAlreadyInThatStateException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.PumpBusyException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.PumpStoppedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.ReadingHistoryAlreadyStartedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.ReadingHistoryNotStartedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.RunModeNotAllowedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.ServiceAlreadyActivatedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.ServiceCommandNotAvailableException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.ServiceIncompatibleException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.ServiceNotActivatedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.StepCountOutOfRangeException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.UnknownCommandException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.UnknownServiceException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.WriteSessionAlreadyOpenException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.WriteSessionClosedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.WrongStateException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
-
-public class AppErrorIDs {
-
-    public static final IDStorage<Class<? extends AppLayerErrorException>, Integer> IDS = new IDStorage<>();
-
-    static {
-        IDS.put(PumpStoppedException.class, 3178);
-        IDS.put(BolusAmountNotInRangeException.class, 6017);
-        IDS.put(PumpAlreadyInThatStateException.class, 3324);
-        IDS.put(InvalidServicePasswordException.class, 61593);
-        IDS.put(UnknownCommandException.class, 61455);
-        IDS.put(AlreadyConnectedException.class, 61530);
-        IDS.put(WrongStateException.class, 61680);
-        IDS.put(ServiceIncompatibleException.class, 61542);
-        IDS.put(UnknownServiceException.class, 61545);
-        IDS.put(NoServicePasswordNeededException.class, 61695);
-        IDS.put(ServiceAlreadyActivatedException.class, 61644);
-        IDS.put(IncompatibleVersionException.class, 61491);
-        IDS.put(InvalidPayloadLengthException.class, 61500);
-        IDS.put(NotConnectedException.class, 61525);
-        IDS.put(ServiceCommandNotAvailableException.class, 61605);
-        IDS.put(ServiceNotActivatedException.class, 61610);
-        IDS.put(PumpBusyException.class, 61635);
-        IDS.put(NotReferencedException.class, 5335);
-        IDS.put(StepCountOutOfRangeException.class, 5348);
-        IDS.put(InvalidPayloadCRCException.class, 2805);
-        IDS.put(InvalidParameterTypeException.class, 2810);
-        IDS.put(CommandExecutionFailedException.class, 22796);
-        IDS.put(InvalidAlertInstanceIdException.class, 3238);
-        IDS.put(InvalidTBRFactorException.class, 3241);
-        IDS.put(InvalidTBRDurationException.class, 3264);
-        IDS.put(InvalidTBRTemplateException.class, 6363);
-        IDS.put(PauseModeNotAllowedException.class, 3315);
-        IDS.put(RunModeNotAllowedException.class, 3279);
-        IDS.put(NoActiveTBRToCanceLException.class, 3840);
-        IDS.put(BolusTypeAndParameterMismatchException.class, 3925);
-        IDS.put(InvalidDurationPresetException.class, 5924);
-        IDS.put(BolusLagTimeFeatureDisabledException.class, 90);
-        IDS.put(BolusDurationNotInRangeException.class, 6014);
-        IDS.put(InvalidValuesOfTwoChannelTransmission.class, 0x0F96);
-        IDS.put(NoSuchBolusToCancelException.class, 4005);
-        IDS.put(MaximumNumberOfBolusTypeAlreadyRunningException.class, 4010);
-        IDS.put(CustomBolusNotConfiguredException.class, 6270);
-        IDS.put(InvalidDateParameterException.class, 4044);
-        IDS.put(InvalidTimeParameterException.class, 4080);
-        IDS.put(NoConfigBlockDataException.class, 4471);
-        IDS.put(InvalidConfigBlockIdException.class, 4472);
-        IDS.put(InvalidConfigBlockCRCException.class, 4487);
-        IDS.put(InvalidConfigBlockLengthException.class, 6286);
-        IDS.put(WriteSessionAlreadyOpenException.class, 4539);
-        IDS.put(WriteSessionClosedException.class, 4562);
-        IDS.put(ConfigMemoryAccessException.class, 4573);
-        IDS.put(ReadingHistoryAlreadyStartedException.class, 11794);
-        IDS.put(ReadingHistoryNotStartedException.class, 4680);
-        IDS.put(InvalidPayloadException.class, 6210);
-        IDS.put(ImplausiblePortionLengthValueException.class, 4824);
-        IDS.put(NotAllowedToAccessPositionZeroException.class, 4830);
-        IDS.put(PositionProtectedException.class, 4845);
-        IDS.put(InvalidLagTimeException.class, 3891);
-        IDS.put(NoActiveTBRToChangeException.class, 6322);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/HistoryEventIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/HistoryEventIDs.java
deleted file mode 100644
index 4604ffccb8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/HistoryEventIDs.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.BasalDeliveryChangedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.BolusDeliveredEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.BolusProgrammedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.CannulaFilledEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.CartridgeInsertedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.CartridgeRemovedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.DateTimeChangedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.DefaultDateTimeSetEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.EndOfTBREvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.HistoryEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.OccurrenceOfErrorEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.OccurrenceOfMaintenanceEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.OccurrenceOfWarningEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.OperatingModeChangedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.PowerDownEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.PowerUpEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.SniffingDoneEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.StartOfTBREvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.TotalDailyDoseEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.TubeFilledEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
-
-public class HistoryEventIDs {
-
-    public static final IDStorage<Class<? extends HistoryEvent>, Integer> IDS = new IDStorage<>();
-
-    static {
-        IDS.put(BolusDeliveredEvent.class, 917);
-        IDS.put(BolusProgrammedEvent.class, 874);
-        IDS.put(CannulaFilledEvent.class, 3264);
-        IDS.put(DateTimeChangedEvent.class, 165);
-        IDS.put(DefaultDateTimeSetEvent.class, 170);
-        IDS.put(EndOfTBREvent.class, 771);
-        IDS.put(OccurrenceOfErrorEvent.class, 1011);
-        IDS.put(OccurrenceOfMaintenanceEvent.class, 1290);
-        IDS.put(OccurrenceOfWarningEvent.class, 1360);
-        IDS.put(OperatingModeChangedEvent.class, 195);
-        IDS.put(PowerUpEvent.class, 15);
-        IDS.put(PowerDownEvent.class, 51);
-        IDS.put(SniffingDoneEvent.class, 102);
-        IDS.put(StartOfTBREvent.class, 240);
-        IDS.put(TotalDailyDoseEvent.class, 960);
-        IDS.put(TubeFilledEvent.class, 105);
-        IDS.put(CartridgeInsertedEvent.class, 60);
-        IDS.put(CartridgeRemovedEvent.class, 85);
-        IDS.put(BasalDeliveryChangedEvent.class, 204);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ParameterBlockIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ParameterBlockIDs.java
deleted file mode 100644
index 9dbcfe90cc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ParameterBlockIDs.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.FactoryMaxBasalAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.FactoryMinBasalAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.MaxBasalAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.ParameterBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.TBROverNotificationBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.ActiveBRProfileBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile1Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile1NameBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile2Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile2NameBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile3Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile3NameBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile4Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile4NameBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile5Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile5NameBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.FactoryMaxBolusAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.FactoryMinBolusAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.MaxBolusAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.SystemIdentificationBlock;
-
-public class ParameterBlockIDs {
-
-    public static final IDStorage<Class<? extends ParameterBlock>, Integer> IDS = new IDStorage<>();
-
-    static {
-        IDS.put(FactoryMaxBolusAmountBlock.class, 41222);
-        IDS.put(MaxBolusAmountBlock.class, 31);
-        IDS.put(FactoryMinBolusAmountBlock.class, 60183);
-        IDS.put(SystemIdentificationBlock.class, 35476);
-        IDS.put(BRProfile1Block.class, 7136);
-        IDS.put(BRProfile2Block.class, 7167);
-        IDS.put(BRProfile3Block.class, 7532);
-        IDS.put(BRProfile4Block.class, 7539);
-        IDS.put(BRProfile5Block.class, 7567);
-        IDS.put(BRProfile1NameBlock.class, 48265);
-        IDS.put(BRProfile2NameBlock.class, 48278);
-        IDS.put(BRProfile3NameBlock.class, 48975);
-        IDS.put(BRProfile4NameBlock.class, 48976);
-        IDS.put(BRProfile5NameBlock.class, 49068);
-        IDS.put(ActiveBRProfileBlock.class, 7568);
-        IDS.put(MaxBasalAmountBlock.class, 6940);
-        IDS.put(FactoryMinBasalAmountBlock.class, 60395);
-        IDS.put(FactoryMaxBasalAmountBlock.class, 41241);
-        IDS.put(TBROverNotificationBlock.class, 25814);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SatlCommandIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SatlCommandIDs.java
deleted file mode 100644
index 268573293e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SatlCommandIDs.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.SatlMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.ConnectionRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.ConnectionResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.DataMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.DisconnectMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.ErrorMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.KeyRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.KeyResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.SynAckResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.SynRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.VerifyConfirmRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.VerifyConfirmResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.VerifyDisplayRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.VerifyDisplayResponse;
-
-public class SatlCommandIDs {
-
-    public static final IDStorage<Class<? extends SatlMessage>, Byte> IDS = new IDStorage<>();
-
-    static {
-        IDS.put(DataMessage.class, (byte) 3);
-        IDS.put(ErrorMessage.class, (byte) 6);
-        IDS.put(ConnectionRequest.class, (byte) 9);
-        IDS.put(ConnectionResponse.class, (byte) 10);
-        IDS.put(KeyRequest.class, (byte) 12);
-        IDS.put(VerifyConfirmRequest.class, (byte) 14);
-        IDS.put(KeyResponse.class, (byte) 17);
-        IDS.put(VerifyDisplayRequest.class, (byte) 18);
-        IDS.put(VerifyDisplayResponse.class, (byte) 20);
-        IDS.put(SynRequest.class, (byte) 23);
-        IDS.put(SynAckResponse.class, (byte) 24);
-        IDS.put(DisconnectMessage.class, (byte) 27);
-        IDS.put(VerifyConfirmResponse.class, (byte) 30);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ConnectionRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ConnectionRequest.java
deleted file mode 100644
index 534d2361ea..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ConnectionRequest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
-
-public class ConnectionRequest extends SatlMessage {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ConnectionResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ConnectionResponse.java
deleted file mode 100644
index 3685935fca..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ConnectionResponse.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
-
-public class ConnectionResponse extends SatlMessage {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/DisconnectMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/DisconnectMessage.java
deleted file mode 100644
index 897c719480..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/DisconnectMessage.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
-
-public class DisconnectMessage extends SatlMessage {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SynAckResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SynAckResponse.java
deleted file mode 100644
index c28cb1101f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SynAckResponse.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
-
-public class SynAckResponse extends SatlMessage {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SynRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SynRequest.java
deleted file mode 100644
index 7c2f04439e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SynRequest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
-
-public class SynRequest extends SatlMessage {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyDisplayRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyDisplayRequest.java
deleted file mode 100644
index 5c9499840e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyDisplayRequest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
-
-public class VerifyDisplayRequest extends SatlMessage {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyDisplayResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyDisplayResponse.java
deleted file mode 100644
index 32e014764f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyDisplayResponse.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
-
-public class VerifyDisplayResponse extends SatlMessage {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/AbstractSensitivityPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/AbstractSensitivityPlugin.java
index 9f72f1b119..b0bf9db728 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/AbstractSensitivityPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/AbstractSensitivityPlugin.java
@@ -10,9 +10,9 @@ import info.nightscout.androidaps.interfaces.SensitivityInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
 
 public abstract class AbstractSensitivityPlugin extends PluginBase implements SensitivityInterface {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityAAPSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityAAPSPlugin.java
index 432420df85..a773089c3a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityAAPSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityAAPSPlugin.java
@@ -22,8 +22,8 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 24.06.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref0Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref0Plugin.java
index 53a8be8661..510539244a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref0Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref0Plugin.java
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 /**
  * Created by mike on 24.06.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref1Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref1Plugin.java
index 7d91c7fc4a..03b7a30c63 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref1Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityOref1Plugin.java
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 /**
  * Created by mike on 19.06.2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityWeightedAveragePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityWeightedAveragePlugin.java
index 2aeb26bd1a..515f8014e5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityWeightedAveragePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Sensitivity/SensitivityWeightedAveragePlugin.java
@@ -20,8 +20,8 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 24.06.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java
index 3f218063ef..b873bcadc8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorFragment.java
@@ -21,8 +21,8 @@ import java.util.Comparator;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventSmsCommunicatorUpdateGui;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java
index b3800cbe82..57e660ebbf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java
@@ -44,13 +44,13 @@ import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventSmsCommunicatorUpdateGui;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.T;
-import info.nightscout.utils.XdripCalibrations;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.XdripCalibrations;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/BGSourceFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/BGSourceFragment.java
index 5c084eac29..61d67f145b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/BGSourceFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/BGSourceFragment.java
@@ -25,9 +25,9 @@ import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 16.10.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java
index 5e5bed20c0..e50e35748c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java
@@ -23,8 +23,8 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 28.11.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG6Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG6Plugin.java
index b496b19532..bc68b5a11b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG6Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG6Plugin.java
@@ -21,8 +21,8 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 30.11.2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceEversensePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceEversensePlugin.java
index 60f147e3a4..36a16d399b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceEversensePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceEversensePlugin.java
@@ -21,8 +21,8 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 28.11.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java
index f70c443d6e..7a55095931 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java
@@ -8,7 +8,6 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.BgReading;
@@ -19,8 +18,8 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
-import info.nightscout.utils.JsonHelper;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.JsonHelper;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourcePoctechPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourcePoctechPlugin.java
index 6a63922426..091ad84674 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourcePoctechPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourcePoctechPlugin.java
@@ -9,7 +9,6 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -19,9 +18,9 @@ import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.JsonHelper;
+import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceTomatoPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceTomatoPlugin.java
index fe2151430e..08ec7847dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceTomatoPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceTomatoPlugin.java
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/CarbsGenerator.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/CarbsGenerator.java
index 9eae9b9d07..9b70cf5b34 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/CarbsGenerator.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/CarbsGenerator.java
@@ -11,9 +11,9 @@ import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.T;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 
 public class CarbsGenerator {
     public static void generateCarbs(int amount, long startTime, int duration, @Nullable String notes) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/Treatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/Treatment.java
index bd3526c043..3895b85644 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/Treatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/Treatment.java
@@ -8,8 +8,6 @@ import com.j256.ormlite.table.DatabaseTable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 import java.util.Objects;
@@ -18,16 +16,15 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Iob;
-import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.JsonHelper;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.JsonHelper;
 
 @DatabaseTable(tableName = Treatment.TABLE_TREATMENTS)
 public class Treatment implements DataPointWithLabelInterface {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentService.java
index 8c01db13fd..9b8c265aa0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentService.java
@@ -15,7 +15,6 @@ import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -39,7 +38,7 @@ import info.nightscout.androidaps.events.EventReloadTreatmentData;
 import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventNewHistoryData;
-import info.nightscout.utils.JsonHelper;
+import info.nightscout.androidaps.utils.JsonHelper;
 
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
index 32feb9fe7f..6157dc7b7c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
@@ -10,9 +10,6 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
@@ -24,7 +21,7 @@ import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsExtende
 import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsProfileSwitchFragment;
 import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsTempTargetFragment;
 import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsTemporaryBasalsFragment;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 public class TreatmentsFragment extends SubscriberFragment implements View.OnClickListener {
     TextView treatmentsTab;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
index aeacddb89c..164850301d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
@@ -48,11 +48,11 @@ import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotificati
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityWeightedAveragePlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java
index 25ffc946a2..8786633c53 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java
@@ -6,17 +6,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
 import org.json.JSONObject;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.JsonHelper;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.JsonHelper;
 
 public class WizardInfoDialog extends DialogFragment implements OnClickListener {
     JSONObject json;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/ProfileGraph.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/ProfileGraph.java
index 99019e5fd7..e5528528fe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/ProfileGraph.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/ProfileGraph.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.utils.Round;
+import info.nightscout.androidaps.utils.Round;
 
 /**
  * Created by Adrian on 15.04.2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/ProfileViewerDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/ProfileViewerDialog.java
index c2263d81b5..ffa5634c0b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/ProfileViewerDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/ProfileViewerDialog.java
@@ -9,19 +9,15 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.plugins.PumpDanaR.Dialogs.ProfileViewDialog;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 /**
  * Created by adrian on 17/08/17.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
index b99ad97685..6c258cd724 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
@@ -21,8 +21,6 @@ import android.widget.TextView;
 import com.crashlytics.android.answers.CustomEvent;
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONObject;
-
 import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
@@ -40,12 +38,12 @@ import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.plugins.Treatments.dialogs.WizardInfoDialog;
 import info.nightscout.androidaps.services.Intents;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.SP;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 
 public class TreatmentsBolusFragment extends SubscriberFragment implements View.OnClickListener {
     RecyclerView recyclerView;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsCareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsCareportalFragment.java
index 56709963f7..f434e3088c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsCareportalFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsCareportalFragment.java
@@ -27,10 +27,10 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.Translator;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.Translator;
 
 /**
  * Created by mike on 13/01/17.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java
index 037a1a0023..7a65902dc2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java
@@ -29,9 +29,9 @@ import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java
index 0edc704eb6..60666ab6af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java
@@ -36,10 +36,10 @@ import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.events.EventProfileSwitchChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 13/01/17.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java
index d60dfc9e4c..007e65a22a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java
@@ -30,10 +30,10 @@ import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 13/01/17.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java
index ba3d2efb86..23b7472013 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java
@@ -31,9 +31,9 @@ import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
index 100a9ad636..648e0bd8a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
@@ -40,22 +40,22 @@ import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugi
 import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
 import info.nightscout.androidaps.plugins.Treatments.CarbsGenerator;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.BolusWizard;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.HardLimits;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.BolusWizard;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.HardLimits;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * Created by adrian on 09/02/17.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/WearPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/WearPlugin.java
index 72b2397213..ff4f9f4578 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/WearPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/WearPlugin.java
@@ -23,7 +23,7 @@ import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.Wear.wearintegration.WatchUpdaterService;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by adrian on 17/11/16.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
index 8007e03164..11d594ac4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
@@ -38,7 +38,6 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.IobCobCalculator.CobInfo;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.interfaces.PluginType;
@@ -50,10 +49,10 @@ import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.plugins.Wear.ActionStringHandler;
 import info.nightscout.androidaps.plugins.Wear.WearPlugin;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 public class WatchUpdaterService extends WearableListenerService implements
         GoogleApiClient.ConnectionCallbacks,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
index 9c4ec1551a..8965406889 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
@@ -9,7 +9,6 @@ import android.support.annotation.NonNull;
 
 import com.squareup.otto.Subscribe;
 
-import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
@@ -29,11 +28,10 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.IobCobCalculator.CobInfo;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 /**
  * Created by adrian on 17/11/16.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
index e1ae0286de..cc7de11f01 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
@@ -1,8 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpCombo;
+package info.nightscout.androidaps.plugins.pump.combo;
 
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
@@ -15,19 +14,17 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
-import org.apache.commons.lang3.StringUtils;
-
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI;
+import info.nightscout.androidaps.plugins.pump.combo.events.EventComboPumpUpdateGUI;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 public class ComboFragment extends SubscriberFragment implements View.OnClickListener {
     private TextView stateView;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index 08e8edfb92..269a2da58c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo;
+package info.nightscout.androidaps.plugins.pump.combo;
 
 import android.content.DialogInterface;
 import android.os.SystemClock;
@@ -46,24 +46,24 @@ import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotificati
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyCommands;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.combo.events.EventComboPumpUpdateGUI;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BasalProfile;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.CommandResult;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.RuffyCommands;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.RuffyScripter;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.WarningOrErrorCode;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistory;
+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.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
similarity index 59%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
index aef0f2abd5..cfe459fb58 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo;
+package info.nightscout.androidaps.plugins.pump.combo;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -6,11 +6,11 @@ import android.support.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BasalProfile;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpAlert;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tdd;
 
 class ComboPump {
     boolean initialized = false;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/events/EventComboPumpUpdateGUI.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.java
similarity index 57%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/events/EventComboPumpUpdateGUI.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.java
index e9bf3f8415..72359b7db2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/events/EventComboPumpUpdateGUI.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.events;
+package info.nightscout.androidaps.plugins.pump.combo.events;
 
 /**
  * Created by mike on 24.05.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BasalProfile.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java
index fa9c2dceb0..9cdee1c9fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BolusProgressReporter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java
similarity index 77%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BolusProgressReporter.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java
index 59d334fe6f..6fb7c54201 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BolusProgressReporter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
 public interface BolusProgressReporter {
     enum State {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/CommandResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/CommandResult.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
index b595d13d28..180f10f69d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/CommandResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
 import android.support.annotation.Nullable;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistory;
 
 public class CommandResult {
     /** True if a condition indicating a broken pump setup/configuration is detected */
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpErrorCodes.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpErrorCodes.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java
index 63cd81e3a6..d557c067c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpErrorCodes.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
 public class PumpErrorCodes {
     public static final int CARTRIDGE_EMPTY = 1;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpState.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpState.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java
index 963cdd8b4c..117ea88eb9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpState.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
 /** State displayed on the main screen of the pump. */
 public class PumpState {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpWarningCodes.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpWarningCodes.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java
index 60d1898834..b3f87e6b92 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpWarningCodes.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
 public class PumpWarningCodes {
     public static final int CARTRIDGE_LOW = 1;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyCommands.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyCommands.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java
index 5918023d1e..0567e1cb12 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyCommands.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
 
 public interface RuffyCommands {
     /** Issues a bolus issues updates on progress through via {@link BolusProgressReporter}. */
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyScripter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyScripter.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
index e69cf3b462..eb01c92c60 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -26,18 +26,18 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadQuickInfoCommand;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.BolusCommand;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.CancelTbrCommand;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.Command;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.CommandException;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ConfirmAlertCommand;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadBasalProfileCommand;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadHistoryCommand;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadPumpStateCommand;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.SetBasalProfileCommand;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.SetTbrCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.ReadQuickInfoCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.BolusCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.CancelTbrCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.Command;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.CommandException;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.ConfirmAlertCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.ReadBasalProfileCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.ReadHistoryCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.ReadPumpStateCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.SetBasalProfileCommand;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.SetTbrCommand;
 
 /**
  * Provides scripting 'runtime' and operations. consider moving operations into a separate
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/WarningOrErrorCode.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/WarningOrErrorCode.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
index a4e21da289..ae4723046e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/WarningOrErrorCode.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
 import android.support.annotation.Nullable;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BaseCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BaseCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
index 5cc3e98b23..6cd89f2938 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BaseCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import android.support.annotation.NonNull;
 
@@ -12,10 +12,10 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.CommandResult;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.RuffyScripter;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
 
 public abstract class BaseCommand implements Command {
     // RS will inject itself here
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BolusCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BolusCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
index 4188716553..da18cc5c53 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BolusCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import android.os.SystemClock;
 
@@ -11,18 +11,16 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.WarningOrErrorCode;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.RuffyScripter;
 
-import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.DELIVERED;
-import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.DELIVERING;
-import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.PROGRAMMING;
-import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.STOPPED;
-import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.STOPPING;
+import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter.State.DELIVERED;
+import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter.State.DELIVERING;
+import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter.State.PROGRAMMING;
+import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter.State.STOPPED;
+import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter.State.STOPPING;
 
 public class BolusCommand extends BaseCommand {
     private static final Logger log = LoggerFactory.getLogger(BolusCommand.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CancelTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
similarity index 83%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CancelTbrCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
index b1787005e1..4b54c87c42 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CancelTbrCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import org.monkey.d.ruffy.ruffy.driver.display.MenuType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
 
 public class CancelTbrCommand extends BaseCommand {
     private static final Logger log = LoggerFactory.getLogger(CancelTbrCommand.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/Command.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java
similarity index 69%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/Command.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java
index 152befe00d..cd6c30439a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/Command.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.RuffyScripter;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.CommandResult;
 
 /**
  * Interface for all commands to be executed by the pump.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CommandException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java
similarity index 75%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CommandException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java
index 77c1db5437..e92e5e32cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CommandException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 public class CommandException extends RuntimeException {
     public CommandException(String message) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ConfirmAlertCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ConfirmAlertCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java
index 636b6a624d..0b1fcc3821 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ConfirmAlertCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 public class ConfirmAlertCommand extends BaseCommand {
     private final int warningCode;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadBasalProfileCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
index 2c23d5814b..b7145d233d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadBasalProfileCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import org.monkey.d.ruffy.ruffy.driver.display.Menu;
 import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
@@ -9,8 +9,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BasalProfile;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 
 public class ReadBasalProfileCommand extends BaseCommand {
     private static final Logger log = LoggerFactory.getLogger(ReadBasalProfileCommand.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadHistoryCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadHistoryCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
index 04298acd56..5f23b7e66d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadHistoryCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import android.support.annotation.NonNull;
 
@@ -12,12 +12,12 @@ import org.slf4j.LoggerFactory;
 import java.util.Calendar;
 import java.util.Date;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tbr;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpAlert;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistory;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tbr;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tdd;
 
 public class ReadHistoryCommand extends BaseCommand {
     private static Logger log = LoggerFactory.getLogger(ReadHistoryCommand.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadPumpStateCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java
similarity index 82%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadPumpStateCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java
index cfa8d0f329..19beb26fe6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadPumpStateCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 public class ReadPumpStateCommand extends BaseCommand {
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadQuickInfoCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadQuickInfoCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
index 654861fddb..eb68f1c5e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadQuickInfoCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
 import org.monkey.d.ruffy.ruffy.driver.display.MenuType;
@@ -9,8 +9,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistory;
 
 public class ReadQuickInfoCommand extends BaseCommand {
     private static final Logger log = LoggerFactory.getLogger(ReadQuickInfoCommand.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetBasalProfileCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
index f403c2a89b..4d18b3d24e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetBasalProfileCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import android.os.SystemClock;
 
@@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BasalProfile;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
 
 public class SetBasalProfileCommand extends BaseCommand {
     private static final Logger log = LoggerFactory.getLogger(SetBasalProfileCommand.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetTbrCommand.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
index f618d50156..a4459cea66 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetTbrCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
 import android.os.SystemClock;
 
@@ -12,9 +12,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.WarningOrErrorCode;
 
 public class SetTbrCommand extends BaseCommand {
     private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Bolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java
index a5d989c331..cf1450feb2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Bolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/HistoryRecord.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/HistoryRecord.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java
index 57e173bb49..3857a8b877 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/HistoryRecord.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
 
 public abstract class HistoryRecord {
     public final long timestamp;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpAlert.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpAlert.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java
index 413a9ca69b..0797d77151 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpAlert.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistory.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistory.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
index ecc8a1a29f..0fffe13c50 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistory.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
 
 import android.support.annotation.NonNull;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistoryRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistoryRequest.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java
index e785c1d67c..a121ea9425 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistoryRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tbr.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tbr.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java
index 41ec245e89..401fc026b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tbr.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tdd.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tdd.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java
index 5f799f229e..35d3d31df9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tdd.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
+package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/data/DoseSettings.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/DoseSettings.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/data/DoseSettings.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/DoseSettings.java
index 21a893e943..f0cd1dbbf9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/data/DoseSettings.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/DoseSettings.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCommon.data;
+package info.nightscout.androidaps.plugins.pump.common.data;
 
 /**
  * Created by andy on 02/05/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/DoseStepSize.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/DoseStepSize.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java
index 421c441c32..7e4bd7762e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/DoseStepSize.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCommon.defs;
+package info.nightscout.androidaps.plugins.pump.common.defs;
 
 /**
  * Created by andy on 02/05/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpCapability.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpCapability.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java
index d3e29ded0a..dc6059eed7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpCapability.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCommon.defs;
+package info.nightscout.androidaps.plugins.pump.common.defs;
 
 /**
  * Created by andy on 03/05/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpTempBasalType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTempBasalType.java
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpTempBasalType.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTempBasalType.java
index 167e886ea7..90304ca45f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpTempBasalType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTempBasalType.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCommon.defs;
+package info.nightscout.androidaps.plugins.pump.common.defs;
 
 /**
  * Created by andy on 02/05/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
index ab97f2cff2..e1e7f2bf2b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCommon.defs;
+package info.nightscout.androidaps.plugins.pump.common.defs;
 
 
 import java.util.HashMap;
@@ -6,7 +6,7 @@ import java.util.Map;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.PumpCommon.data.DoseSettings;
+import info.nightscout.androidaps.plugins.pump.common.data.DoseSettings;
 
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 75eb9bdf3c..0bc6982ebc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR;
+package info.nightscout.androidaps.plugins.pump.danaR;
 
 import android.support.annotation.Nullable;
 
@@ -31,13 +31,13 @@ import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotificati
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractDanaRExecutionService;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
+import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 28.01.2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java
index e39fdcfdaa..d02bf4690a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR;
+package info.nightscout.androidaps.plugins.pump.danaR;
 
 import android.bluetooth.*;
 import android.content.Context;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.java
index 33d371dca3..07cce36e00 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR;
+package info.nightscout.androidaps.plugins.pump.danaR;
 
 
 import android.app.Activity;
@@ -34,16 +34,16 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.Dialogs.ProfileViewDialog;
-import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRHistoryActivity;
-import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRUserOptionsActivity;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.dialogs.ProfileViewDialog;
+import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActivity;
+import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.SetWarnColor;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.SetWarnColor;
 
 public class DanaRFragment extends SubscriberFragment {
     private static Logger log = LoggerFactory.getLogger(L.PUMP);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
index dfdca746cb..15157047f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR;
+package info.nightscout.androidaps.plugins.pump.danaR;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -23,13 +23,13 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStartWithSpeed;
-import info.nightscout.androidaps.plugins.PumpDanaR.services.DanaRExecutionService;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
+import info.nightscout.androidaps.plugins.pump.danaR.services.DanaRExecutionService;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.java
index df9b48f795..baa636ea81 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR;
+package info.nightscout.androidaps.plugins.pump.danaR;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -7,14 +7,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
-import java.util.Date;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 04.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/Dialogs/ProfileViewDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/Dialogs/ProfileViewDialog.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/Dialogs/ProfileViewDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/Dialogs/ProfileViewDialog.java
index 06906aa0b4..b40a086beb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/Dialogs/ProfileViewDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/Dialogs/ProfileViewDialog.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.Dialogs;
+package info.nightscout.androidaps.plugins.pump.danaR.dialogs;
 
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
@@ -8,14 +8,13 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Treatments.fragments.ProfileGraph;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 /**
  * Created by mike on 10.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
index a319353d63..c8141d1265 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR;
+package info.nightscout.androidaps.plugins.pump.danaR;
 
 import android.bluetooth.BluetoothSocket;
 import android.os.SystemClock;
@@ -11,10 +11,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageHashTable;
-import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractSerialIOThread;
-import info.nightscout.utils.CRC;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTable;
+import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
+import info.nightscout.androidaps.utils.CRC;
 
 /**
  * Created by mike on 17.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRHistoryActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRHistoryActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
index 5a3e127b9a..b85798e135 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRHistoryActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.activities;
+package info.nightscout.androidaps.plugins.pump.danaR.activities;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -34,14 +34,14 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRSyncStatus;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 public class DanaRHistoryActivity extends Activity {
     private static Logger log = LoggerFactory.getLogger(L.PUMP);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRNSHistorySync.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRNSHistorySync.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java
index eab9e8bc6e..bf66a584ea 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRNSHistorySync.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.activities;
+package info.nightscout.androidaps.plugins.pump.danaR.activities;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -15,9 +15,9 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DanaRHistoryRecord;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRSyncStatus;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.java
index d2d08a5d0b..a284ccbbd2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.activities;
+package info.nightscout.androidaps.plugins.pump.danaR.activities;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -21,11 +21,11 @@ import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.utils.NumberPicker;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.utils.NumberPicker;
 
 /**
  * Created by Rumen Georgiev on 5/31/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageBase.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageBase.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
index 0fd444412f..57244ecc20 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -13,7 +13,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.CRC;
+import info.nightscout.androidaps.utils.CRC;
 
 /*
  *  00  01   02  03   04   05  06
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageHashTable.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTable.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageHashTable.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTable.java
index e7f1adca07..d7ec39f6b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageHashTable.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTable.java
@@ -1,7 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import java.util.HashMap;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageOriginalNames.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageOriginalNames.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java
index a285ce5120..2cba96f838 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageOriginalNames.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusProgress.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusProgress.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java
index 873824f966..5e5ba2a586 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusProgress.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStart.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java
index 06200d1f0c..4b7cd2ff41 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartWithSpeed.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartWithSpeed.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java
index a3160ff887..0c174807b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartWithSpeed.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStop.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java
index fe5d47c131..1bf08212bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgCheckValue.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgCheckValue.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.java
index e04d9243e7..d40f8f0cd6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgCheckValue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.java
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 30.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgError.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgError.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java
index a8e67a98a0..699ee2799f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgError.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAlarm.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java
index 7adb335e93..8abbf55c31 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAlarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAll.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAll.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java
index 0fe64a20f5..7de2489c91 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAll.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java
@@ -1,15 +1,13 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.db.DanaRHistoryRecord;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRSyncStatus;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class MsgHistoryAll extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllDone.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java
index e78771f99d..7b110dd45f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllDone.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBasalHour.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBasalHour.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java
index f56e2af273..2599cc7434 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBasalHour.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java
index d675ddc488..88978be98c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryCarbo.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryCarbo.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java
index 6755800bba..5682c3c85f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryCarbo.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDailyInsulin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDailyInsulin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java
index 68d46f0d20..2bed9419dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDailyInsulin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDone.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java
index 63e51e24ba..eeaffd33a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDone.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryError.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryError.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java
index 8d6d0615d4..0666e8915a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryError.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryGlucose.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryGlucose.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java
index 10fd68e3ab..114d392f40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryGlucose.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNew.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNew.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java
index 01f7197434..e93c440fac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNew.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewDone.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java
index fb9118e629..c58f55f2cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewDone.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryRefill.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryRefill.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java
index 238a606cfb..1ccae856af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryRefill.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistorySuspend.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistorySuspend.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java
index 7182722f97..1dac016f4d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistorySuspend.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBasic.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBasic.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.java
index 61150079cd..9b7d7feaed 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBasic.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class MsgInitConnStatusBasic extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.java
index df9447cc45..1d46433820 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 28.05.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusOption.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusOption.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.java
index f8f82e16d0..648a6503b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusOption.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 28.05.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTime.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.java
index 5404c58837..8bb25e8903 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.java
@@ -1,10 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventRefreshGui;
@@ -13,10 +11,10 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class MsgInitConnStatusTime extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStart.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java
index 6f92c3241c..3d2084371c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStop.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java
index 255bb17532..e942f6b6e8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetActivateBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetActivateBasalProfile.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java
index 2d222f9601..22f962713b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetActivateBasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetBasalProfile.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java
index 3e87e4bf41..b5e0a7ac25 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetBasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetCarbsEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetCarbsEntry.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java
index 59cbcdafa0..a00b5bfd72 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetCarbsEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStart.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java
index 2577435e11..dad437ac72 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStop.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java
index 504db719ea..a19efe7488 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetSingleBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetSingleBasalProfile.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java
index eabf383b94..5d50382d05 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetSingleBasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStart.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java
index c756af3491..adc6a0b4da 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStop.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java
index 7b14e8e3e3..19427ee965 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTime.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java
index 6842344959..2840ff3faa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Date;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 /**
  * Created by mike on 09.12.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetUserOptions.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetUserOptions.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.java
index 7484966dba..07e4ff669d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetUserOptions.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingActiveProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.java
similarity index 84%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingActiveProfile.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.java
index 57ab6367b0..1776c48a20 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingActiveProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasal.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.java
index 899a5a08f0..dc05848b34 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalProfileAll.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalProfileAll.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.java
index f231412e06..89a4228ab7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalProfileAll.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingGlucose.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingGlucose.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.java
index ded78c6272..70964a98b2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingGlucose.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMaxValues.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMaxValues.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.java
index 3c640e1870..1eb3defb90 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMaxValues.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMeal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMeal.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.java
index 558b8953c0..02d026c9fe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMeal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,8 +10,8 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 
 /**
  * Created by mike on 13.12.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatios.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatios.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.java
index 5b6ea9b6cf..17f18cb160 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatios.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosAll.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosAll.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.java
index 10d424657b..becdf5a745 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosAll.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingPumpTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingPumpTime.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java
index 0e57c6c2f8..d22352e69f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingPumpTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -6,8 +6,8 @@ import org.slf4j.LoggerFactory;
 import java.util.Date;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class MsgSettingPumpTime extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingShippingInfo.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingShippingInfo.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.java
index b700b0baa0..7362ecfdb1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingShippingInfo.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingUserOptions.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingUserOptions.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.java
index e45e2050db..2dce2a6e1f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingUserOptions.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Arrays;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by Rumen Georgiev on 6/11/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.java
index 474c29daa1..70c0d3b944 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class MsgStatus extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBasic.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBasic.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.java
index 8f81220885..6a0635c378 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBasic.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 
 public class MsgStatusBasic extends MessageBase {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBolusExtended.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBolusExtended.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java
index 30e41e2704..4b40a244ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBolusExtended.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.java
@@ -1,19 +1,17 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import android.support.annotation.NonNull;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class MsgStatusBolusExtended extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusProfile.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.java
index 079357c6ee..f4ee2be0a6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTempBasal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTempBasal.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java
index db6080f74a..4dca9a864f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTempBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import android.support.annotation.NonNull;
 
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 
 public class MsgStatusTempBasal extends MessageBase {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/RecordTypes.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/RecordTypes.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.java
index f0de05810a..36f3402cc7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/RecordTypes.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 /**
  * Created by mike on 28.05.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRNewStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.java
similarity index 69%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRNewStatus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.java
index 55b0ab0998..9efdee1057 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRNewStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.events;
+package info.nightscout.androidaps.plugins.pump.danaR.events;
 
 import info.nightscout.androidaps.events.Event;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRSyncStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRSyncStatus.java
similarity index 77%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRSyncStatus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRSyncStatus.java
index f2a5dc7b2a..5fc0bd740f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRSyncStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRSyncStatus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.events;
+package info.nightscout.androidaps.plugins.pump.danaR.events;
 
 import info.nightscout.androidaps.events.Event;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractDanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractDanaRExecutionService.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
index ae09281c91..1e8d87be01 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractDanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.services;
+package info.nightscout.androidaps.plugins.pump.danaR.services;
 
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
@@ -23,26 +23,25 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAlarm;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBasalHour;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBolus;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryCarbo;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDailyInsulin;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDone;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryError;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryGlucose;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryRefill;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistorySuspend;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryAlarm;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryBasalHour;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryBolus;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryCarbo;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryDailyInsulin;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryDone;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryError;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryGlucose;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryRefill;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistorySuspend;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * Created by mike on 28.01.2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractSerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractSerialIOThread.java
similarity index 62%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractSerialIOThread.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractSerialIOThread.java
index 1cca0b2512..6d2cba9741 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractSerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractSerialIOThread.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.services;
+package info.nightscout.androidaps.plugins.pump.danaR.services;
 
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 /**
  * Created by mike on 28.01.2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index 268d5378c1..193f417b0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.services;
+package info.nightscout.androidaps.plugins.pump.danaR.services;
 
 import android.bluetooth.BluetoothDevice;
 import android.content.IntentFilter;
@@ -29,43 +29,43 @@ import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.SerialIOThread;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusProgress;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStartWithSpeed;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgCheckValue;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetActivateBasalProfile;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetBasalProfile;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTime;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetUserOptions;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingActiveProfile;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingBasal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingGlucose;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMaxValues;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMeal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatios;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatiosAll;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingPumpTime;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingShippingInfo;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingUserOptions;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatus;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBasic;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgCheckValue;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetActivateBasalProfile;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetBasalProfile;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTime;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetUserOptions;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingActiveProfile;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingBasal;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingGlucose;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMaxValues;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMeal;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatios;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatiosAll;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingPumpTime;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingShippingInfo;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingUserOptions;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatus;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
index 54f0beb89b..7907833927 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean;
+package info.nightscout.androidaps.plugins.pump.danaRKorean;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -23,15 +23,15 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.androidaps.plugins.PumpDanaR.AbstractDanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.services.DanaRKoreanExecutionService;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/SerialIOThread.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/SerialIOThread.java
index ea12b2b9c4..5c47d7c7d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/SerialIOThread.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean;
+package info.nightscout.androidaps.plugins.pump.danaRKorean;
 
 import android.bluetooth.BluetoothSocket;
 import android.os.SystemClock;
@@ -11,11 +11,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractSerialIOThread;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MessageHashTable_k;
-import info.nightscout.utils.CRC;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MessageHashTable_k;
+import info.nightscout.androidaps.utils.CRC;
 
 /**
  * Created by mike on 17.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MessageHashTable_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTable_k.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MessageHashTable_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTable_k.java
index 422391c127..30ac710724 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MessageHashTable_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTable_k.java
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.*;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.*;
 
 /**
  * Created by mike on 28.05.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgCheckValue_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.java
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgCheckValue_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.java
index 7bde73d5a1..731c25d4d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgCheckValue_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.java
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 
 /**
  * Created by mike on 30.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBasic_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBasic_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.java
index 32253b0007..50195a0cc9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBasic_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,8 +9,8 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 public class MsgInitConnStatusBasic_k extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBolus_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBolus_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.java
index b8bdfd053c..814759f286 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBolus_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,8 +10,8 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 /**
  * Created by mike on 28.05.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusTime_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusTime_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.java
index d713bb5a6c..6ff9451a2b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusTime_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,11 +11,11 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class MsgInitConnStatusTime_k extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasalProfileAll_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasalProfileAll_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.java
index 2455f59e14..cb131634ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasalProfileAll_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasal_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.java
similarity index 80%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasal_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.java
index b149ceb2ad..99ad848289 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasal_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.java
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 
 /**
  * Created by mike on 05.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgStatusBasic_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgStatusBasic_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.java
index d22c6e376a..e7752cfb8f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgStatusBasic_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 
 public class MsgStatusBasic_k extends MessageBase {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgStatus_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgStatus_k.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.java
index 4d8b012244..4ef29247b2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgStatus_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.comm;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 public class MsgStatus_k extends MessageBase {
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
index f3588c4efa..3e7d687824 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRKorean.services;
+package info.nightscout.androidaps.plugins.pump.danaRKorean.services;
 
 import android.bluetooth.BluetoothDevice;
 import android.content.IntentFilter;
@@ -28,36 +28,36 @@ import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusProgress;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetSingleBasalProfile;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTime;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingBasal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingGlucose;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMaxValues;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMeal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatios;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingPumpTime;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingShippingInfo;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
-import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractDanaRExecutionService;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.SerialIOThread;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgCheckValue_k;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgSettingBasal_k;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgStatusBasic_k;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetSingleBasalProfile;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTime;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingBasal;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingGlucose;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMaxValues;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMeal;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatios;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingPumpTime;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingShippingInfo;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.SerialIOThread;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgCheckValue_k;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgSettingBasal_k;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgStatusBasic_k;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.T;
 
 public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 33422d55f1..a817c56235 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS;
+package info.nightscout.androidaps.plugins.pump.danaRS;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -43,20 +43,20 @@ import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotificati
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Start;
-import info.nightscout.androidaps.plugins.PumpDanaRS.events.EventDanaRSDeviceChange;
-import info.nightscout.androidaps.plugins.PumpDanaRS.services.DanaRSService;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Start;
+import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange;
+import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 03.09.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/BLEScanActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/BLEScanActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
index 7594e917c5..502c18cbc9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/BLEScanActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
@@ -1,16 +1,12 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.activities;
+package info.nightscout.androidaps.plugins.pump.danaRS.activities;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothManager;
 import android.bluetooth.le.BluetoothLeScanner;
 import android.bluetooth.le.ScanCallback;
 import android.bluetooth.le.ScanResult;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,17 +14,14 @@ import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.PumpDanaRS.events.EventDanaRSDeviceChange;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange;
+import info.nightscout.androidaps.utils.SP;
 
 public class BLEScanActivity extends AppCompatActivity {
     private ListView listView = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/PairingHelperActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/PairingHelperActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.java
index c67534ac75..a98d541963 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/PairingHelperActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.activities;
+package info.nightscout.androidaps.plugins.pump.danaRS.activities;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/PairingProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingProgressDialog.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/PairingProgressDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingProgressDialog.java
index 08c0ce0372..1d9943a5f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/PairingProgressDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingProgressDialog.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.activities;
+package info.nightscout.androidaps.plugins.pump.danaRS.activities;
 
 
 import android.app.Activity;
@@ -17,7 +17,7 @@ import com.squareup.otto.Subscribe;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.PumpDanaRS.events.EventDanaRSPairingSuccess;
+import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess;
 
 
 public class PairingProgressDialog extends DialogFragment implements View.OnClickListener {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRSMessageHashTable.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRSMessageHashTable.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.java
index bda5d42207..a81aa3c9bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRSMessageHashTable.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.java
@@ -1,9 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import java.util.HashMap;
 
-import info.nightscout.androidaps.logging.L;
-
 /**
  * Created by mike on 28.05.2016.
  */
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
index d913f50b94..28a081aaa8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import android.annotation.TargetApi;
 import android.os.Build;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java
index c33cd7b405..c850eace0a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_History_Events.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_History_Events.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.java
index 98e08a7ee3..484c260d92 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_History_Events.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -18,9 +18,9 @@ import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class DanaRS_Packet_APS_History_Events extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_History.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
index f31bdf66e2..fda5f33959 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -9,8 +9,8 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class DanaRS_Packet_APS_Set_Event_History extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java
index 3cb5523dfc..0345261797 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import com.cozmo.danar.util.BleCommandUtil;
@@ -12,7 +12,7 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Basal_Get_Basal_Rate extends DanaRS_Packet {
 	private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java
index 60b9f6da51..04aa4cefb3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Basal_Get_Profile_Basal_Rate extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java
index 1beadfd705..6da58c7a43 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Basal_Get_Profile_Number extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
index 748d88f242..5724c5ff80 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import android.support.annotation.NonNull;
 
@@ -8,8 +8,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class DanaRS_Packet_Basal_Get_Temporary_Basal_State extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java
index 188c1df093..cef7c8ab92 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java
index f0f2691315..0020e3ffa1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java
index a42176cc59..d6ae1c94a7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java
index 4f39fcfd2f..ab6f4174da 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java
index 65ef6ae1b1..5fbda1d902 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java
index bde3b622db..82c282adad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java
index 1f6106ab83..f2abcbc164 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java
index 0e5a3d79c4..89a3747039 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Bolus_Get_Bolus_Option extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java
index 9b5636eaaf..5dca32bdd3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import com.cozmo.danar.util.BleCommandUtil;
@@ -7,7 +7,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Bolus_Get_CIR_CF_Array extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java
index 194edd5d55..b024dd056c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Bolus_Get_Calculation_Information extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java
index 476ae7167f..60da3683ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java
index 7d561bd679..5f1bbc5a39 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Bolus_Get_Dual_Bolus extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java
index 785d8d3fbe..2b857e3fc8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Bolus_Get_Extended_Bolus extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java
index a07652218f..15d2678451 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Bolus_Get_Extended_Bolus_State extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java
index fda8778d08..9e66d9458b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java
index 15ad57d83a..37c9d9138e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java
index a9968eb7eb..755fff3829 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory;
 import java.util.Date;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class DanaRS_Packet_Bolus_Get_Step_Bolus_Information extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java
index cc4a26f24f..2013bd74eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java
index 15bde78a76..50a6871bd4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java
index 023458e5dc..da11d172fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java
index 504b21bbc9..4337663d6d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java
index 587e87df9d..e8d9df360c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java
index 2e7b9be1ff..206a61b6f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java
index e50fbd70b5..7ff91fa9ef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.data.ConstraintChecker;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.logging.L;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java
index e12b3db7f1..5655cf5750 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java
index 8adf46f742..306787d4ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java
index 1c9af359e2..7c0b652979 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Delivery_Status.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Delivery_Status.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.java
index c64680379f..0f5e4a8e02 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Delivery_Status.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_More_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_More_Information.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.java
index b1553a2c05..f14197ac41 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_More_Information.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Date;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_General_Get_More_Information extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Password.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Password.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.java
index dc5cbc59f0..0a4d15d456 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Password.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_General_Get_Password extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java
index 5c26e2ce74..2c5333427a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_General_Get_Pump_Check extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java
index f2cb14cf73..e1efa91296 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,8 +6,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class DanaRS_Packet_General_Get_Shipping_Information extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java
index 2a3b136279..c154ac3476 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_General_Get_Today_Delivery_Total extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java
index 0d07ecc33d..65bf066023 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java
index d8e5b95c14..75b969b1bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_General_Initial_Screen_Information extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java
index f66c3c4afe..21a15b1dbd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java
index 9f7570d4ce..b8771c1939 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.java
index aab933e787..ceaf49908b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,9 +10,9 @@ import java.util.GregorianCalendar;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.db.DanaRHistoryRecord;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRSyncStatus;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public abstract class DanaRS_Packet_History_ extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Alarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Alarm.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.java
index e586166783..437804b102 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Alarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.java
@@ -1,12 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-
 import info.nightscout.androidaps.logging.L;
 
 public class DanaRS_Packet_History_Alarm extends DanaRS_Packet_History_ {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_All_History.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_All_History.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.java
index f6411dca5f..68940dd4c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_All_History.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Basal.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Basal.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.java
index 76d485695c..0a94f16a40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Basal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Blood_Glucose.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Blood_Glucose.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.java
index e66db9bb78..dc0e00d844 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Blood_Glucose.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Bolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.java
index 41a2bd0995..64fb26dd09 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Bolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Carbohydrate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Carbohydrate.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.java
index 58d9fac3dc..9cd931718d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Carbohydrate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Daily.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Daily.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.java
index b480f76258..35a154f5e6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Daily.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Prime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Prime.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.java
index 28ea4c30f0..7ec05fc0e0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Prime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Refill.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Refill.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.java
index 685c8e519e..e031ee1460 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Refill.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Suspend.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Suspend.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.java
index ef787746ce..20f4de5098 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Suspend.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Temporary.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Temporary.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.java
index 68526b5fb2..65f86c5b7f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Temporary.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Alarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Alarm.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.java
index 799b3c248c..38066ec610 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Alarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java
index 836a52cb65..8ef50ddf3b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java
index c2eb232dac..1b9be4b515 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java
index 8239bb34b7..0d7d9af2c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
index b4bcbaef98..d12ed52c79 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Date;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Option_Get_Pump_Time extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_User_Option.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_User_Option.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.java
index 6c6d7d7185..457b7ab2b8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_User_Option.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Option_Get_User_Option extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java
index f43f82fb15..58bf00e6a6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_User_Option.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_User_Option.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.java
index a64e1e5142..30fc07cfd0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_User_Option.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 
 public class DanaRS_Packet_Option_Set_User_Option extends DanaRS_Packet {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java
index 7a2421c310..50edd71bd6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import com.cozmo.danar.util.BleCommandUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSDeviceChange.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.java
similarity index 70%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSDeviceChange.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.java
index dd9b86ebce..224f939ad7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSDeviceChange.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.events;
+package info.nightscout.androidaps.plugins.pump.danaRS.events;
 
 import info.nightscout.androidaps.events.Event;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSPacket.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPacket.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSPacket.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPacket.java
index e42b6b1440..e0c401a27f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSPacket.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPacket.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.events;
+package info.nightscout.androidaps.plugins.pump.danaRS.events;
 
 import info.nightscout.androidaps.events.Event;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet;
 
 /**
  * Created by mike on 01.09.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSPairingSuccess.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.java
similarity index 70%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSPairingSuccess.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.java
index 433cdec9bf..e332e9e0b2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSPairingSuccess.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.events;
+package info.nightscout.androidaps.plugins.pump.danaRS.events;
 
 import info.nightscout.androidaps.events.Event;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
index 48bb311385..e8630752cb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.services;
+package info.nightscout.androidaps.plugins.pump.danaRS.services;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -28,15 +28,15 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRS.activities.PairingHelperActivity;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRSMessageHashTable;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet;
-import info.nightscout.androidaps.plugins.PumpDanaRS.events.EventDanaRSPacket;
-import info.nightscout.androidaps.plugins.PumpDanaRS.events.EventDanaRSPairingSuccess;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet;
+import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPacket;
+import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 23.09.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
similarity index 83%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
index cb823a3c88..70b5dbe281 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.services;
+package info.nightscout.androidaps.plugins.pump.danaRS.services;
 
 import android.app.Service;
 import android.content.Intent;
@@ -31,57 +31,57 @@ import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_APS_History_Events;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_APS_Set_Event_History;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Basal_Get_Basal_Rate;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Basal_Get_Profile_Number;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Basal_Get_Temporary_Basal_State;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Basal_Set_Profile_Basal_Rate;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Basal_Set_Profile_Number;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Basal_Set_Temporary_Basal;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Get_Bolus_Option;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Get_CIR_CF_Array;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Get_Calculation_Information;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Get_Extended_Bolus_State;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Get_Step_Bolus_Information;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Set_Extended_Bolus;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Start;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Stop;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_General_Get_Pump_Check;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_General_Get_Shipping_Information;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_General_Initial_Screen_Information;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_General_Set_History_Upload_Mode;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Alarm;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Basal;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Blood_Glucose;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Bolus;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Carbohydrate;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Daily;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Prime;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Refill;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_History_Suspend;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Notify_Delivery_Complete;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Notify_Delivery_Rate_Display;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Option_Get_Pump_Time;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Option_Get_User_Option;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Option_Set_Pump_Time;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Option_Set_User_Option;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_History_Events;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_Set_Event_History;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Get_Basal_Rate;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Get_Profile_Number;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Get_Temporary_Basal_State;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Set_Profile_Basal_Rate;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Set_Profile_Number;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Set_Temporary_Basal;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_Bolus_Option;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_CIR_CF_Array;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_Calculation_Information;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_Extended_Bolus_State;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_Step_Bolus_Information;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Extended_Bolus;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Start;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Stop;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Get_Pump_Check;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Get_Shipping_Information;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Initial_Screen_Information;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Set_History_Upload_Mode;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Alarm;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Basal;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Blood_Glucose;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Bolus;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Carbohydrate;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Daily;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Prime;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Refill;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Suspend;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Notify_Delivery_Complete;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Notify_Delivery_Rate_Display;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Get_Pump_Time;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Get_User_Option;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Set_Pump_Time;
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Set_User_Option;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
 
 public class DanaRSService extends Service {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
index 86c07b89ff..bc00ad1246 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2;
+package info.nightscout.androidaps.plugins.pump.danaRv2;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -21,17 +21,17 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.androidaps.plugins.PumpDanaR.AbstractDanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStartWithSpeed;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.services.DanaRv2ExecutionService;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
+import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.Round;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/SerialIOThread.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/SerialIOThread.java
index 61047a8d5a..ba1fdc5cb2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/SerialIOThread.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2;
+package info.nightscout.androidaps.plugins.pump.danaRv2;
 
 import android.bluetooth.BluetoothSocket;
 import android.os.SystemClock;
@@ -11,11 +11,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractSerialIOThread;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MessageHashTable_v2;
-import info.nightscout.utils.CRC;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
+import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MessageHashTable_v2;
+import info.nightscout.androidaps.utils.CRC;
 
 /**
  * Created by mike on 17.07.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MessageHashTable_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MessageHashTable_v2.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2.java
index c95a800128..66376290af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MessageHashTable_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import java.util.HashMap;
 
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.*;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.*;
 
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgCheckValue_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgCheckValue_v2.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.java
index 034c7648a0..4bd52eb89b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgCheckValue_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,11 +11,11 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
 
 /**
  * Created by mike on 30.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents_v2.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java
index 32ac8862ee..268fbcaa34 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgHistoryEvents_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java
@@ -1,9 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
 import java.util.GregorianCalendar;
 
 import info.nightscout.androidaps.MainApp;
@@ -15,10 +14,10 @@ import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class MsgHistoryEvents_v2 extends MessageBase {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgSetAPSTempBasalStart_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgSetAPSTempBasalStart_v2.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java
index 42964a64c6..875cd4ac64 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgSetAPSTempBasalStart_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 public class MsgSetAPSTempBasalStart_v2 extends MessageBase {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgSetHistoryEntry_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgSetHistoryEntry_v2.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java
index 0c55b29a3f..b817495ba3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgSetHistoryEntry_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,7 +7,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 public class MsgSetHistoryEntry_v2 extends MessageBase {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusAPS_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.java
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusAPS_v2.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.java
index 5d0238f2f7..601a5d4933 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusAPS_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 public class MsgStatusAPS_v2 extends MessageBase {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusBolusExtended_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusBolusExtended_v2.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java
index 5a442e39c1..578be6d4b6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusBolusExtended_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import android.support.annotation.NonNull;
 
@@ -6,8 +6,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 
 public class MsgStatusBolusExtended_v2 extends MessageBase {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusTempBasal_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusTempBasal_v2.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java
index fb26d2c0de..a92c534d92 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgStatusTempBasal_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import android.support.annotation.NonNull;
 
@@ -6,9 +6,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.utils.DateUtil;
 
 public class MsgStatusTempBasal_v2 extends MessageBase {
     private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
index f51f846978..7a9ef59981 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRv2.services;
+package info.nightscout.androidaps.plugins.pump.danaRv2.services;
 
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
@@ -31,49 +31,49 @@ import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusProgress;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStartWithSpeed;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetActivateBasalProfile;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetBasalProfile;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTime;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetUserOptions;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingActiveProfile;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingBasal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingGlucose;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMaxValues;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMeal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatios;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatiosAll;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingPumpTime;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingShippingInfo;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingUserOptions;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatus;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBasic;
-import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
-import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractDanaRExecutionService;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.SerialIOThread;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgCheckValue_v2;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgHistoryEvents_v2;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgSetAPSTempBasalStart_v2;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgSetHistoryEntry_v2;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusBolusExtended_v2;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusTempBasal_v2;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetActivateBasalProfile;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetBasalProfile;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStart;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStop;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTime;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetUserOptions;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingActiveProfile;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingBasal;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingGlucose;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMaxValues;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMeal;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatios;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatiosAll;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingPumpTime;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingShippingInfo;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingUserOptions;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatus;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.SerialIOThread;
+import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgCheckValue_v2;
+import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgHistoryEvents_v2;
+import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetAPSTempBasalStart_v2;
+import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetHistoryEntry_v2;
+import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusBolusExtended_v2;
+import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusTempBasal_v2;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
 
 public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/EventLocalInsightUpdateGUI.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/EventLocalInsightUpdateGUI.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/EventLocalInsightUpdateGUI.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/EventLocalInsightUpdateGUI.java
index cc2fc15f86..89b001891c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/EventLocalInsightUpdateGUI.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/EventLocalInsightUpdateGUI.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal;
+package info.nightscout.androidaps.plugins.pump.insight;
 
 import info.nightscout.androidaps.events.EventUpdateGui;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/InsightAlertService.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 676f64bf21..d851389aaf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal;
+package info.nightscout.androidaps.plugins.pump.insight;
 
 import android.app.Service;
 import android.content.ComponentName;
@@ -21,18 +21,18 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.activities.InsightAlertActivity;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.ConfirmAlertMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.SnoozeAlertMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveAlertMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service.InsightConnectionService;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.Alert;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.InsightState;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InsightException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.AppLayerErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ExceptionTranslator;
+import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ConfirmAlertMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SnoozeAlertMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveAlertMessage;
+import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertStatus;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
 
 public class InsightAlertService extends Service implements InsightConnectionService.StateCallback {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightFragment.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index 9d51425218..cc11bec4b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal;
+package info.nightscout.androidaps.plugins.pump.insight;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -21,16 +21,16 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.TBROverNotificationBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveBasalRate;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveBolus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveTBR;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.CartridgeStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.InsightState;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.TotalDailyDose;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock;
+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;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.CartridgeStatus;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.TotalDailyDose;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 public class LocalInsightFragment extends SubscriberFragment implements View.OnClickListener {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index a285149393..84a8c75349 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal;
+package info.nightscout.androidaps.plugins.pump.insight;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -49,76 +49,76 @@ import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotificati
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.HistoryReadingDirection;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.ReadHistoryEventsMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.StartReadingHistoryMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.StopReadingHistoryMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.BolusDeliveredEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.BolusProgrammedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.CannulaFilledEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.DateTimeChangedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.DefaultDateTimeSetEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.EndOfTBREvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.HistoryEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.OccurrenceOfAlertEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.OperatingModeChangedEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.PowerUpEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.SniffingDoneEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.StartOfTBREvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.TotalDailyDoseEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.TubeFilledEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfile1Block;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.BRProfileBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.FactoryMinBolusAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.MaxBasalAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.MaxBolusAmountBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.TBROverNotificationBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.CancelBolusMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.CancelTBRMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.ChangeTBRMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.ConfirmAlertMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.DeliverBolusMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.SetDateTimeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.SetOperatingModeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control.SetTBRMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveAlertMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveBasalRateMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveBolusesMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetActiveTBRMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetBatteryStatusMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetCartridgeStatusMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetDateTimeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetOperatingModeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetPumpStatusRegisterMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetTotalDailyDoseMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.ResetPumpStatusRegisterMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service.InsightConnectionService;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.database.InsightBolusID;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.database.InsightHistoryOffset;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.database.InsightPumpID;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveBasalRate;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveBolus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveTBR;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BasalProfileBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BatteryStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BolusType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.CartridgeStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.InsightState;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.OperatingMode;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.PumpTime;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.TotalDailyDose;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InsightException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.AppLayerErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ExceptionTranslator;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ParameterBlockUtil;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.HistoryReadingDirection;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.ReadHistoryEventsMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.StartReadingHistoryMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.StopReadingHistoryMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.BolusDeliveredEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.BolusProgrammedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.CannulaFilledEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.DateTimeChangedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.DefaultDateTimeSetEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.EndOfTBREvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.HistoryEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.OccurrenceOfAlertEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.OperatingModeChangedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.PowerUpEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.SniffingDoneEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.StartOfTBREvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.TotalDailyDoseEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.TubeFilledEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile1Block;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfileBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.FactoryMinBolusAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.MaxBasalAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.MaxBolusAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.CancelBolusMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.CancelTBRMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ChangeTBRMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ConfirmAlertMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.DeliverBolusMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SetDateTimeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SetOperatingModeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SetTBRMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveAlertMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveBasalRateMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveBolusesMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveTBRMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetBatteryStatusMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetCartridgeStatusMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetDateTimeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetOperatingModeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetPumpStatusRegisterMessage;
+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.plugins.pump.insight.descriptors.ActiveBasalRate;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BasalProfileBlock;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BatteryStatus;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BolusType;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.CartridgeStatus;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.OperatingMode;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.PumpTime;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.TotalDailyDose;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ParameterBlockUtil;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 public class LocalInsightPlugin extends PluginBase implements PumpInterface, ConstraintsInterface, InsightConnectionService.StateCallback {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightAlertActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightAlertActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
index 5262ad9de5..c40cb99ed6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightAlertActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.activities;
+package info.nightscout.androidaps.plugins.pump.insight.activities;
 
 import android.content.ComponentName;
 import android.content.Intent;
@@ -17,9 +17,9 @@ import android.widget.TextView;
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.InsightAlertService;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.Alert;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertStatus;
+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;
 
 public class InsightAlertActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightPairingActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightPairingActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
index f97a74e94a..7ea52ed271 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightPairingActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.activities;
+package info.nightscout.androidaps.plugins.pump.insight.activities;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -26,9 +26,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service.InsightConnectionService;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.InsightState;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ExceptionTranslator;
+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;
 
 public class InsightPairingActivity extends AppCompatActivity implements InsightConnectionService.StateCallback, View.OnClickListener, InsightConnectionService.ExceptionCallback {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightPairingInformationActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightPairingInformationActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
index 27528cfeab..8580b30dca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/activities/InsightPairingInformationActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.activities;
+package info.nightscout.androidaps.plugins.pump.insight.activities;
 
 import android.content.ComponentName;
 import android.content.Intent;
@@ -11,7 +11,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service.InsightConnectionService;
+import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
 
 public class InsightPairingInformationActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/AppLayerMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java
similarity index 70%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/AppLayerMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java
index 69243dde63..7783abe063 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/AppLayerMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java
@@ -1,18 +1,18 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.IncompatibleAppVersionException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidAppCRCException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.UnknownAppCommandException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.UnknownServiceException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.AppLayerErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.UnknownAppLayerErrorCodeException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.AppCommandIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.AppErrorIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.ServiceIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.DataMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto.Cryptograph;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.IncompatibleAppVersionException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidAppCRCException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.UnknownAppCommandException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.UnknownServiceException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.UnknownAppLayerErrorCodeException;
+import info.nightscout.androidaps.plugins.pump.insight.ids.AppCommandIDs;
+import info.nightscout.androidaps.plugins.pump.insight.ids.AppErrorIDs;
+import info.nightscout.androidaps.plugins.pump.insight.ids.ServiceIDs;
+import info.nightscout.androidaps.plugins.pump.insight.satl.DataMessage;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.Cryptograph;
 
 public class AppLayerMessage implements Comparable<AppLayerMessage> {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/ReadParameterBlockMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java
similarity index 73%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/ReadParameterBlockMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java
index 43aae60e75..221cf80462 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/ReadParameterBlockMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.ParameterBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.ParameterBlockIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.ParameterBlock;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.ParameterBlockIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ReadParameterBlockMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/Service.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/Service.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/Service.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/Service.java
index 685dc8a52c..aeec3150d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/Service.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/Service.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer;
 
 public enum Service {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/CloseConfigurationWriteSessionMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/CloseConfigurationWriteSessionMessage.java
new file mode 100644
index 0000000000..2e6133b79e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/CloseConfigurationWriteSessionMessage.java
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+
+public class CloseConfigurationWriteSessionMessage extends AppLayerMessage {
+
+    public CloseConfigurationWriteSessionMessage() {
+        super(MessagePriority.NORMAL, false, false, Service.CONFIGURATION);
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/OpenConfigurationWriteSessionMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/OpenConfigurationWriteSessionMessage.java
new file mode 100644
index 0000000000..0706742559
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/OpenConfigurationWriteSessionMessage.java
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+
+public class OpenConfigurationWriteSessionMessage extends AppLayerMessage {
+
+    public OpenConfigurationWriteSessionMessage() {
+        super(MessagePriority.NORMAL, false, false, Service.CONFIGURATION);
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/WriteConfigurationBlockMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/WriteConfigurationBlockMessage.java
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/WriteConfigurationBlockMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/WriteConfigurationBlockMessage.java
index e842beb69f..a33530d48e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/configuration/WriteConfigurationBlockMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/configuration/WriteConfigurationBlockMessage.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.ParameterBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.ParameterBlockIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.ParameterBlock;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.ParameterBlockIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class WriteConfigurationBlockMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ActivateServiceMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ActivateServiceMessage.java
similarity index 72%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ActivateServiceMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ActivateServiceMessage.java
index 9a07ea7ecb..322864bffe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ActivateServiceMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ActivateServiceMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.connection;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ActivateServiceMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/BindMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/BindMessage.java
similarity index 52%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/BindMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/BindMessage.java
index 94a67d25b9..b636797464 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/BindMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/BindMessage.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.connection;
 
 import org.spongycastle.util.encoders.Hex;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class BindMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ConnectMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ConnectMessage.java
new file mode 100644
index 0000000000..c56864209c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ConnectMessage.java
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.connection;
+
+import org.spongycastle.util.encoders.Hex;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+
+public class ConnectMessage extends AppLayerMessage {
+
+    public ConnectMessage() {
+        super(MessagePriority.NORMAL, false, false, Service.CONNECTION);
+    }
+
+    @Override
+    protected ByteBuf getData() {
+        return ByteBuf.from(Hex.decode("0000080100196000"));
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/DisconnectMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/DisconnectMessage.java
new file mode 100644
index 0000000000..22ddbc7608
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/DisconnectMessage.java
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.connection;
+
+import org.spongycastle.util.encoders.Hex;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+
+public class DisconnectMessage extends AppLayerMessage {
+
+    public DisconnectMessage() {
+        super(MessagePriority.NORMAL, false, false, Service.CONNECTION);
+    }
+
+    @Override
+    protected ByteBuf getData() {
+        return ByteBuf.from(Hex.decode("0360"));
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ServiceChallengeMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ServiceChallengeMessage.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ServiceChallengeMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ServiceChallengeMessage.java
index d43f523ec2..07be4dd469 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/connection/ServiceChallengeMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/connection/ServiceChallengeMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.connection;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ServiceChallengeMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/HistoryReadingDirection.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/HistoryReadingDirection.java
new file mode 100644
index 0000000000..327304eb21
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/HistoryReadingDirection.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history;
+
+public enum HistoryReadingDirection {
+
+    FORWARD,
+    BACKWARD;
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/ReadHistoryEventsMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/ReadHistoryEventsMessage.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/ReadHistoryEventsMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/ReadHistoryEventsMessage.java
index 324ce9d44f..f4c8cb4557 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/ReadHistoryEventsMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/ReadHistoryEventsMessage.java
@@ -1,13 +1,13 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events.HistoryEvent;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.HistoryEvent;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ReadHistoryEventsMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/StartReadingHistoryMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StartReadingHistoryMessage.java
similarity index 59%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/StartReadingHistoryMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StartReadingHistoryMessage.java
index cb5779f9e7..9b8c2c6b16 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/StartReadingHistoryMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StartReadingHistoryMessage.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.HistoryReadingDirectionIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.HistoryReadingDirectionIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class StartReadingHistoryMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StopReadingHistoryMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StopReadingHistoryMessage.java
new file mode 100644
index 0000000000..56749fcffe
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/StopReadingHistoryMessage.java
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+
+public class StopReadingHistoryMessage extends AppLayerMessage {
+
+    public StopReadingHistoryMessage() {
+        super(MessagePriority.NORMAL, false, false, Service.HISTORY);
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BasalDeliveryChangedEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BasalDeliveryChangedEvent.java
similarity index 73%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BasalDeliveryChangedEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BasalDeliveryChangedEvent.java
index 9e21c54311..1eb62c6c42 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BasalDeliveryChangedEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BasalDeliveryChangedEvent.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class BasalDeliveryChangedEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BolusDeliveredEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusDeliveredEvent.java
similarity index 77%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BolusDeliveredEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusDeliveredEvent.java
index 913a576662..05ba09ccf3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BolusDeliveredEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusDeliveredEvent.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BolusType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.BolusTypeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.BOCUtil;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BolusType;
+import info.nightscout.androidaps.plugins.pump.insight.ids.BolusTypeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class BolusDeliveredEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BolusProgrammedEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusProgrammedEvent.java
similarity index 73%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BolusProgrammedEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusProgrammedEvent.java
index 9e355a0555..0a456406d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/BolusProgrammedEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/BolusProgrammedEvent.java
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BolusType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.BolusTypeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BolusType;
+import info.nightscout.androidaps.plugins.pump.insight.ids.BolusTypeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class BolusProgrammedEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CannulaFilledEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CannulaFilledEvent.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CannulaFilledEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CannulaFilledEvent.java
index ed49da1f18..4ee16e35e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/CannulaFilledEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CannulaFilledEvent.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class CannulaFilledEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeInsertedEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeInsertedEvent.java
new file mode 100644
index 0000000000..94ebcc442e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeInsertedEvent.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+
+public class CartridgeInsertedEvent extends HistoryEvent {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeRemovedEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeRemovedEvent.java
new file mode 100644
index 0000000000..f65d85b06e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/CartridgeRemovedEvent.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+
+public class CartridgeRemovedEvent extends HistoryEvent {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/DateTimeChangedEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DateTimeChangedEvent.java
similarity index 82%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/DateTimeChangedEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DateTimeChangedEvent.java
index 338422832d..1397bb2529 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/DateTimeChangedEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DateTimeChangedEvent.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.BOCUtil;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class DateTimeChangedEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DefaultDateTimeSetEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DefaultDateTimeSetEvent.java
new file mode 100644
index 0000000000..b3b468f09a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/DefaultDateTimeSetEvent.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+
+public class DefaultDateTimeSetEvent extends HistoryEvent {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/EndOfTBREvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/EndOfTBREvent.java
similarity index 78%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/EndOfTBREvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/EndOfTBREvent.java
index 9fdcb14fcf..2edbec2dd4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/EndOfTBREvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/EndOfTBREvent.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.BOCUtil;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class EndOfTBREvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/HistoryEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/HistoryEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
index 44f60e62c6..874c908ca5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/HistoryEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.HistoryEventIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.BOCUtil;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.ids.HistoryEventIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class HistoryEvent implements Comparable<HistoryEvent> {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfAlertEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfAlertEvent.java
similarity index 56%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfAlertEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfAlertEvent.java
index fc0e732bd5..e6edc8c95c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OccurrenceOfAlertEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfAlertEvent.java
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.AlertTypeIncrementalIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType;
+import info.nightscout.androidaps.plugins.pump.insight.ids.AlertTypeIncrementalIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public abstract class OccurrenceOfAlertEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfErrorEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfErrorEvent.java
new file mode 100644
index 0000000000..7d6c61e9c2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfErrorEvent.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+
+public class OccurrenceOfErrorEvent extends OccurrenceOfAlertEvent {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java
new file mode 100644
index 0000000000..6884797250
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfMaintenanceEvent.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+
+public class OccurrenceOfMaintenanceEvent extends OccurrenceOfAlertEvent {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfWarningEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfWarningEvent.java
new file mode 100644
index 0000000000..b504e4e09a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OccurrenceOfWarningEvent.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+
+public class OccurrenceOfWarningEvent extends OccurrenceOfAlertEvent {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OperatingModeChangedEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OperatingModeChangedEvent.java
similarity index 59%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OperatingModeChangedEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OperatingModeChangedEvent.java
index 47f5707f97..067b46e51f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/OperatingModeChangedEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/OperatingModeChangedEvent.java
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.OperatingMode;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.OperatingModeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.OperatingMode;
+import info.nightscout.androidaps.plugins.pump.insight.ids.OperatingModeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class OperatingModeChangedEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerDownEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerDownEvent.java
new file mode 100644
index 0000000000..ff73ce0383
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerDownEvent.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+
+public class PowerDownEvent extends HistoryEvent {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerUpEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerUpEvent.java
new file mode 100644
index 0000000000..d31690e9e9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/PowerUpEvent.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+
+public class PowerUpEvent extends HistoryEvent {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/SniffingDoneEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/SniffingDoneEvent.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/SniffingDoneEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/SniffingDoneEvent.java
index b176324e38..4afe3c72ba 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/SniffingDoneEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/SniffingDoneEvent.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class SniffingDoneEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/StartOfTBREvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/StartOfTBREvent.java
similarity index 69%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/StartOfTBREvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/StartOfTBREvent.java
index 062804ff06..99795ed12c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/StartOfTBREvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/StartOfTBREvent.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class StartOfTBREvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/TotalDailyDoseEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TotalDailyDoseEvent.java
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/TotalDailyDoseEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TotalDailyDoseEvent.java
index 4c3ab74213..c7f52ce1ef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/TotalDailyDoseEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TotalDailyDoseEvent.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.BOCUtil;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class TotalDailyDoseEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/TubeFilledEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TubeFilledEvent.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/TubeFilledEvent.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TubeFilledEvent.java
index 217d362eb5..58a1851936 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/history/history_events/TubeFilledEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/TubeFilledEvent.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.history_events;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class TubeFilledEvent extends HistoryEvent {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/ActiveBRProfileBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ActiveBRProfileBlock.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/ActiveBRProfileBlock.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ActiveBRProfileBlock.java
index f40ffbe421..1d5630ea94 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/ActiveBRProfileBlock.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ActiveBRProfileBlock.java
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BasalProfile;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.ActiveBasalProfileIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BasalProfile;
+import info.nightscout.androidaps.plugins.pump.insight.ids.ActiveBasalProfileIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ActiveBRProfileBlock extends ParameterBlock {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1Block.java
new file mode 100644
index 0000000000..5f6be32181
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1Block.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile1Block extends BRProfileBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1NameBlock.java
new file mode 100644
index 0000000000..1135eac5ac
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile1NameBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile1NameBlock extends NameBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2Block.java
new file mode 100644
index 0000000000..0b961458f2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2Block.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile2Block extends BRProfileBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2NameBlock.java
new file mode 100644
index 0000000000..591dd4d08c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile2NameBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile2NameBlock extends NameBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3Block.java
new file mode 100644
index 0000000000..31e0ac0409
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3Block.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile3Block extends BRProfileBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3NameBlock.java
new file mode 100644
index 0000000000..390e3be0dc
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile3NameBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile3NameBlock extends NameBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4Block.java
new file mode 100644
index 0000000000..06eaeb943c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4Block.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile4Block extends BRProfileBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4NameBlock.java
new file mode 100644
index 0000000000..5e2a5eb811
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile4NameBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile4NameBlock extends NameBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5Block.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5Block.java
new file mode 100644
index 0000000000..738ea270f1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5Block.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile5Block extends BRProfileBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5NameBlock.java
new file mode 100644
index 0000000000..1ff159aeb2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfile5NameBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class BRProfile5NameBlock extends NameBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfileBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfileBlock.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfileBlock.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfileBlock.java
index 2d6538dff3..c6b4a515a1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/BRProfileBlock.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/BRProfileBlock.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BasalProfileBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BasalProfileBlock;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public abstract class BRProfileBlock extends ParameterBlock {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java
new file mode 100644
index 0000000000..9db116edaf
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBasalAmountBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class FactoryMaxBasalAmountBlock extends InsulinAmountLimitationBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java
new file mode 100644
index 0000000000..9df9cf4dff
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMaxBolusAmountBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class FactoryMaxBolusAmountBlock extends InsulinAmountLimitationBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java
new file mode 100644
index 0000000000..70cd39c07b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBasalAmountBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class FactoryMinBasalAmountBlock extends InsulinAmountLimitationBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java
new file mode 100644
index 0000000000..46ae394834
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/FactoryMinBolusAmountBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class FactoryMinBolusAmountBlock extends InsulinAmountLimitationBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java
index 837e8f561d..a753a62567 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/InsulinAmountLimitationBlock.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public abstract class InsulinAmountLimitationBlock extends ParameterBlock {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBasalAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBasalAmountBlock.java
new file mode 100644
index 0000000000..d09b4681c0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBasalAmountBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class MaxBasalAmountBlock extends InsulinAmountLimitationBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBolusAmountBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBolusAmountBlock.java
new file mode 100644
index 0000000000..d53fe5e742
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/MaxBolusAmountBlock.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+public class MaxBolusAmountBlock extends InsulinAmountLimitationBlock {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/NameBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/NameBlock.java
similarity index 74%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/NameBlock.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/NameBlock.java
index af019bbbff..d4cf2060cb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/NameBlock.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/NameBlock.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public abstract class NameBlock extends ParameterBlock {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ParameterBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ParameterBlock.java
new file mode 100644
index 0000000000..6ed2ca15c1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/ParameterBlock.java
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
+
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+
+public abstract class ParameterBlock {
+
+    public abstract void parse(ByteBuf byteBuf);
+    public abstract ByteBuf getData();
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/SystemIdentificationBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/SystemIdentificationBlock.java
similarity index 71%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/SystemIdentificationBlock.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/SystemIdentificationBlock.java
index fcc7f75447..e4e5d10c70 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/SystemIdentificationBlock.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/SystemIdentificationBlock.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.SystemIdentification;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.SystemIdentification;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class SystemIdentificationBlock extends ParameterBlock {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/TBROverNotificationBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/TBROverNotificationBlock.java
similarity index 78%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/TBROverNotificationBlock.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/TBROverNotificationBlock.java
index 26563b1d1f..aec41ded44 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/parameter_blocks/TBROverNotificationBlock.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/parameter_blocks/TBROverNotificationBlock.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class TBROverNotificationBlock extends ParameterBlock {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/CancelBolusMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelBolusMessage.java
similarity index 51%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/CancelBolusMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelBolusMessage.java
index 92e72a41bf..559d5dfcbd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/CancelBolusMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelBolusMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class CancelBolusMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelTBRMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelTBRMessage.java
new file mode 100644
index 0000000000..09b1762d2f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/CancelTBRMessage.java
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+
+public class CancelTBRMessage extends AppLayerMessage {
+    public CancelTBRMessage() {
+        super(MessagePriority.HIGHER, false, false, Service.REMOTE_CONTROL);
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/ChangeTBRMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ChangeTBRMessage.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/ChangeTBRMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ChangeTBRMessage.java
index 9dbda3ecb0..f9ea0b9d2f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/ChangeTBRMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ChangeTBRMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ChangeTBRMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/ConfirmAlertMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ConfirmAlertMessage.java
similarity index 52%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/ConfirmAlertMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ConfirmAlertMessage.java
index dd56282834..1d8e905c1c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/ConfirmAlertMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/ConfirmAlertMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ConfirmAlertMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/DeliverBolusMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
similarity index 72%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/DeliverBolusMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
index c2879beb96..f1b4c3f6de 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/DeliverBolusMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BolusType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.BolusTypeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BolusType;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.BolusTypeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class DeliverBolusMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/GetAvailableBolusTypesMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/GetAvailableBolusTypesMessage.java
similarity index 58%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/GetAvailableBolusTypesMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/GetAvailableBolusTypesMessage.java
index 50395edcc1..965d0bd3fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/GetAvailableBolusTypesMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/GetAvailableBolusTypesMessage.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AvailableBolusTypes;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AvailableBolusTypes;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetAvailableBolusTypesMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetDateTimeMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetDateTimeMessage.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetDateTimeMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetDateTimeMessage.java
index 5ceea4f168..5fe99f2bdf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetDateTimeMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetDateTimeMessage.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.PumpTime;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.PumpTime;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class SetDateTimeMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetOperatingModeMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetOperatingModeMessage.java
new file mode 100644
index 0000000000..41dff43ed4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetOperatingModeMessage.java
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.OperatingMode;
+import info.nightscout.androidaps.plugins.pump.insight.ids.OperatingModeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+
+public class SetOperatingModeMessage extends AppLayerMessage {
+
+    private OperatingMode operatingMode;
+
+    public SetOperatingModeMessage() {
+        super(MessagePriority.HIGHEST, false, true, Service.REMOTE_CONTROL);
+    }
+
+    @Override
+    protected ByteBuf getData() {
+        ByteBuf byteBuf = new ByteBuf(2);
+        byteBuf.putUInt16LE(OperatingModeIDs.IDS.getID(operatingMode));
+        return byteBuf;
+    }
+
+    public void setOperatingMode(OperatingMode operatingMode) {
+        this.operatingMode = operatingMode;
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetTBRMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetTBRMessage.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetTBRMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetTBRMessage.java
index 76959ed025..0bdff3295d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SetTBRMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SetTBRMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class SetTBRMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SnoozeAlertMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SnoozeAlertMessage.java
similarity index 51%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SnoozeAlertMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SnoozeAlertMessage.java
index 2278ae84e8..139ea7e82b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/remote_control/SnoozeAlertMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/SnoozeAlertMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.remote_control;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class SnoozeAlertMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveAlertMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveAlertMessage.java
similarity index 69%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveAlertMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveAlertMessage.java
index 291726d35d..899ba182e8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveAlertMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveAlertMessage.java
@@ -1,13 +1,13 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.Alert;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.AlertCategoryIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.AlertStatusIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.AlertTypeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.AlertCategoryIDs;
+import info.nightscout.androidaps.plugins.pump.insight.ids.AlertStatusIDs;
+import info.nightscout.androidaps.plugins.pump.insight.ids.AlertTypeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetActiveAlertMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveBasalRateMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBasalRateMessage.java
similarity index 58%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveBasalRateMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBasalRateMessage.java
index b5aa73f2a7..4b68739583 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveBasalRateMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBasalRateMessage.java
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveBasalRate;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.ActiveBasalProfileIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.ActiveBasalProfileIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetActiveBasalRateMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveBolusesMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBolusesMessage.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveBolusesMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBolusesMessage.java
index 90cd93c127..4bcb988afd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveBolusesMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveBolusesMessage.java
@@ -1,14 +1,14 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveBolus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.ActiveBolusTypeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.ActiveBolusTypeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetActiveBolusesMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveTBRMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveTBRMessage.java
similarity index 57%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveTBRMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveTBRMessage.java
index d839a5a394..b685c65304 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetActiveTBRMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetActiveTBRMessage.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.ActiveTBR;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetActiveTBRMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetBatteryStatusMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetBatteryStatusMessage.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetBatteryStatusMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetBatteryStatusMessage.java
index d6d8668f56..af4b7dc17a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetBatteryStatusMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetBatteryStatusMessage.java
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BatteryStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.BatteryTypeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.SymbolStatusIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BatteryStatus;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.BatteryTypeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.ids.SymbolStatusIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetBatteryStatusMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetCartridgeStatusMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetCartridgeStatusMessage.java
similarity index 53%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetCartridgeStatusMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetCartridgeStatusMessage.java
index c2c941e236..33740c5ce1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetCartridgeStatusMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetCartridgeStatusMessage.java
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.CartridgeStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.CartridgeTypeIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.SymbolStatusIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.CartridgeStatus;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.ids.CartridgeTypeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.ids.SymbolStatusIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetCartridgeStatusMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetDateTimeMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetDateTimeMessage.java
similarity index 57%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetDateTimeMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetDateTimeMessage.java
index 8d80a7e465..e29bc5eaa2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetDateTimeMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetDateTimeMessage.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.PumpTime;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.PumpTime;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetDateTimeMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetFirmwareVersionsMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetFirmwareVersionsMessage.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetFirmwareVersionsMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetFirmwareVersionsMessage.java
index ef97fc3861..705a5e228c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetFirmwareVersionsMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetFirmwareVersionsMessage.java
@@ -1,14 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import android.util.Log;
-
-import org.spongycastle.util.encoders.Hex;
-
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.FirmwareVersions;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.FirmwareVersions;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetFirmwareVersionsMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetOperatingModeMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetOperatingModeMessage.java
new file mode 100644
index 0000000000..27053a2a6a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetOperatingModeMessage.java
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.OperatingMode;
+import info.nightscout.androidaps.plugins.pump.insight.ids.OperatingModeIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+
+public class GetOperatingModeMessage extends AppLayerMessage {
+
+    private OperatingMode operatingMode;
+
+    public GetOperatingModeMessage() {
+        super(MessagePriority.NORMAL, true, false, Service.STATUS);
+    }
+
+    @Override
+    protected void parse(ByteBuf byteBuf) {
+        this.operatingMode = OperatingModeIDs.IDS.getType(byteBuf.readUInt16LE());
+    }
+
+    public OperatingMode getOperatingMode() {
+        return this.operatingMode;
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetPumpStatusRegisterMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetPumpStatusRegisterMessage.java
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetPumpStatusRegisterMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetPumpStatusRegisterMessage.java
index 2fd63c76fe..11d777c197 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetPumpStatusRegisterMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetPumpStatusRegisterMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetPumpStatusRegisterMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetTotalDailyDoseMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetTotalDailyDoseMessage.java
similarity index 53%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetTotalDailyDoseMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetTotalDailyDoseMessage.java
index 1f208c97e0..e622614eea 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/GetTotalDailyDoseMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/GetTotalDailyDoseMessage.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.TotalDailyDose;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.TotalDailyDose;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class GetTotalDailyDoseMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/ResetPumpStatusRegisterMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/ResetPumpStatusRegisterMessage.java
similarity index 83%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/ResetPumpStatusRegisterMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/ResetPumpStatusRegisterMessage.java
index f215165be5..eacdf14769 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/app_layer/status/ResetPumpStatusRegisterMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/status/ResetPumpStatusRegisterMessage.java
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status;
+package info.nightscout.androidaps.plugins.pump.insight.app_layer.status;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.MessagePriority;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.MessagePriority;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ResetPumpStatusRegisterMessage extends AppLayerMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/ConfigurationMessageRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/ConfigurationMessageRequest.java
similarity index 69%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/ConfigurationMessageRequest.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/ConfigurationMessageRequest.java
index cb2703e3c7..44812eb48b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/ConfigurationMessageRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/ConfigurationMessageRequest.java
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service;
+package info.nightscout.androidaps.plugins.pump.insight.connection_service;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.CloseConfigurationWriteSessionMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.OpenConfigurationWriteSessionMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.CloseConfigurationWriteSessionMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.OpenConfigurationWriteSessionMessage;
 
 public class ConfigurationMessageRequest<T extends AppLayerMessage> extends MessageRequest<T> {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
index 51ff6e341d..e964c9fa20 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service;
+package info.nightscout.androidaps.plugins.pump.insight.connection_service;
 
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
@@ -20,69 +20,69 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.ReadParameterBlockMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.CloseConfigurationWriteSessionMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.OpenConfigurationWriteSessionMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.WriteConfigurationBlockMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.ActivateServiceMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.BindMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.ConnectMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.DisconnectMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.connection.ServiceChallengeMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.SystemIdentificationBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.status.GetFirmwareVersionsMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.FirmwareVersions;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.InsightState;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.SystemIdentification;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.ConnectionFailedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.ConnectionLostException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.DisconnectedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InsightException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidNonceException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidSatlCommandException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.ReceivedPacketInInvalidStateException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.TimeoutException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.TooChattyPumpException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlCompatibleStateErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlDecryptVerifyFailedErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlIncompatibleVersionErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlInvalidCRCErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlInvalidCommIdErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlInvalidMacErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlInvalidMessageTypeErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlInvalidNonceErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlInvalidPacketErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlInvalidPayloadLengthErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlNoneErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlPairingRejectedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlUndefinedErrorException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlWrongStateException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.ServiceIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.ConnectionRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.ConnectionResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.DataMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.ErrorMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.KeyRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.KeyResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.SatlMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.SynAckResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.SynRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.VerifyConfirmRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.VerifyConfirmResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.VerifyDisplayRequest;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.VerifyDisplayResponse;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ConnectionEstablisher;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.DelayedActionThread;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.InputStreamReader;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.Nonce;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.OutputStreamWriter;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.PairingDataStorage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto.Cryptograph;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto.DerivedKeys;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto.KeyPair;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.ReadParameterBlockMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.CloseConfigurationWriteSessionMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.OpenConfigurationWriteSessionMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.WriteConfigurationBlockMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.ActivateServiceMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.BindMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.ConnectMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.DisconnectMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.ServiceChallengeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.SystemIdentificationBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetFirmwareVersionsMessage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.FirmwareVersions;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.SystemIdentification;
+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;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidNonceException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidSatlCommandException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.ReceivedPacketInInvalidStateException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.TimeoutException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.TooChattyPumpException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlCompatibleStateErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlDecryptVerifyFailedErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlIncompatibleVersionErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlInvalidCRCErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlInvalidCommIdErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlInvalidMacErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlInvalidMessageTypeErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlInvalidNonceErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlInvalidPacketErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlInvalidPayloadLengthErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlNoneErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlPairingRejectedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlUndefinedErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlWrongStateException;
+import info.nightscout.androidaps.plugins.pump.insight.ids.ServiceIDs;
+import info.nightscout.androidaps.plugins.pump.insight.satl.ConnectionRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.ConnectionResponse;
+import info.nightscout.androidaps.plugins.pump.insight.satl.DataMessage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.ErrorMessage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.KeyRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.KeyResponse;
+import info.nightscout.androidaps.plugins.pump.insight.satl.SatlMessage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.SynAckResponse;
+import info.nightscout.androidaps.plugins.pump.insight.satl.SynRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.VerifyConfirmRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.VerifyConfirmResponse;
+import info.nightscout.androidaps.plugins.pump.insight.satl.VerifyDisplayRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.VerifyDisplayResponse;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ConnectionEstablisher;
+import info.nightscout.androidaps.plugins.pump.insight.utils.DelayedActionThread;
+import info.nightscout.androidaps.plugins.pump.insight.utils.InputStreamReader;
+import info.nightscout.androidaps.plugins.pump.insight.utils.Nonce;
+import info.nightscout.androidaps.plugins.pump.insight.utils.OutputStreamWriter;
+import info.nightscout.androidaps.plugins.pump.insight.utils.PairingDataStorage;
+import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.Cryptograph;
+import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.DerivedKeys;
+import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.KeyPair;
+import info.nightscout.androidaps.utils.SP;
 
 public class InsightConnectionService extends Service implements ConnectionEstablisher.Callback, InputStreamReader.Callback, OutputStreamWriter.Callback {
 
@@ -114,7 +114,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
     private KeyPair keyPair;
     private byte[] randomBytes;
     private MessageQueue messageQueue = new MessageQueue();
-    private List<info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service> activatedServices = new ArrayList<>();
+    private List<info.nightscout.androidaps.plugins.pump.insight.app_layer.Service> activatedServices = new ArrayList<>();
     private long lastDataTime;
     private long lastConnected;
     private long recoveryDuration = 0;
@@ -227,8 +227,8 @@ public class InsightConnectionService extends Service implements ConnectionEstab
     private void requestNextMessage() {
         while (messageQueue.getActiveRequest() == null && messageQueue.hasPendingMessages()) {
             messageQueue.nextRequest();
-            info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service service = messageQueue.getActiveRequest().request.getService();
-            if (service != info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service.CONNECTION && !activatedServices.contains(service)) {
+            info.nightscout.androidaps.plugins.pump.insight.app_layer.Service service = messageQueue.getActiveRequest().request.getService();
+            if (service != info.nightscout.androidaps.plugins.pump.insight.app_layer.Service.CONNECTION && !activatedServices.contains(service)) {
                 if (service.getServicePassword() == null) {
                     ActivateServiceMessage activateServiceMessage = new ActivateServiceMessage();
                     activateServiceMessage.setServiceID(ServiceIDs.IDS.getID(service));
@@ -395,7 +395,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
     private synchronized void disconnect() {
         if (state == InsightState.CONNECTED) {
             sendAppLayerMessage(new DisconnectMessage());
-            sendSatlMessageAndWait(new info.nightscout.androidaps.plugins.PumpInsightLocal.satl.DisconnectMessage());
+            sendSatlMessageAndWait(new info.nightscout.androidaps.plugins.pump.insight.satl.DisconnectMessage());
         }
         cleanup(true);
         setState(pairingDataStorage.isPaired() ? InsightState.DISCONNECTED : InsightState.NOT_PAIRED);
@@ -684,9 +684,9 @@ public class InsightConnectionService extends Service implements ConnectionEstab
         }
         setState(InsightState.APP_ACTIVATE_STATUS_SERVICE);
         ActivateServiceMessage activateServiceMessage = new ActivateServiceMessage();
-        activateServiceMessage.setServiceID(ServiceIDs.IDS.getID(info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service.STATUS));
+        activateServiceMessage.setServiceID(ServiceIDs.IDS.getID(info.nightscout.androidaps.plugins.pump.insight.app_layer.Service.STATUS));
         activateServiceMessage.setServicePassword(new byte[16]);
-        activateServiceMessage.setVersion(info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service.STATUS.getVersion());
+        activateServiceMessage.setVersion(info.nightscout.androidaps.plugins.pump.insight.app_layer.Service.STATUS.getVersion());
         sendAppLayerMessage(activateServiceMessage);
     }
 
@@ -698,9 +698,9 @@ public class InsightConnectionService extends Service implements ConnectionEstab
         pairingDataStorage.setFirmwareVersions(message.getFirmwareVersions());
         setState(InsightState.APP_ACTIVATE_PARAMETER_SERVICE);
         ActivateServiceMessage activateServiceMessage = new ActivateServiceMessage();
-        activateServiceMessage.setServiceID(ServiceIDs.IDS.getID(info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service.PARAMETER));
+        activateServiceMessage.setServiceID(ServiceIDs.IDS.getID(info.nightscout.androidaps.plugins.pump.insight.app_layer.Service.PARAMETER));
         activateServiceMessage.setServicePassword(new byte[16]);
-        activateServiceMessage.setVersion(info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service.PARAMETER.getVersion());
+        activateServiceMessage.setVersion(info.nightscout.androidaps.plugins.pump.insight.app_layer.Service.PARAMETER.getVersion());
         sendAppLayerMessage(activateServiceMessage);
     }
 
@@ -714,14 +714,14 @@ public class InsightConnectionService extends Service implements ConnectionEstab
 
     private void processActivateServiceMessage() {
         if (state == InsightState.APP_ACTIVATE_PARAMETER_SERVICE) {
-            activatedServices.add(info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service.PARAMETER);
+            activatedServices.add(info.nightscout.androidaps.plugins.pump.insight.app_layer.Service.PARAMETER);
             setState(InsightState.APP_SYSTEM_IDENTIFICATION);
             ReadParameterBlockMessage message = new ReadParameterBlockMessage();
             message.setParameterBlockId(SystemIdentificationBlock.class);
-            message.setService(info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service.PARAMETER);
+            message.setService(info.nightscout.androidaps.plugins.pump.insight.app_layer.Service.PARAMETER);
             sendAppLayerMessage(message);
         } else if (state == InsightState.APP_ACTIVATE_STATUS_SERVICE) {
-            activatedServices.add(info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service.STATUS);
+            activatedServices.add(info.nightscout.androidaps.plugins.pump.insight.app_layer.Service.STATUS);
             setState(InsightState.APP_FIRMWARE_VERSIONS);
             sendAppLayerMessage(new GetFirmwareVersionsMessage());
         } else {
@@ -753,7 +753,7 @@ public class InsightConnectionService extends Service implements ConnectionEstab
         if (messageQueue.getActiveRequest() == null) {
             handleException(new TooChattyPumpException());
         } else {
-            info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service service = messageQueue.getActiveRequest().request.getService();
+            info.nightscout.androidaps.plugins.pump.insight.app_layer.Service service = messageQueue.getActiveRequest().request.getService();
             ActivateServiceMessage activateServiceMessage = new ActivateServiceMessage();
             activateServiceMessage.setServiceID(ServiceIDs.IDS.getID(service));
             activateServiceMessage.setVersion(service.getVersion());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/MessageQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageQueue.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/MessageQueue.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageQueue.java
index 74b557d8a0..f54f437564 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/MessageQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageQueue.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service;
+package info.nightscout.androidaps.plugins.pump.insight.connection_service;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
 
 public class MessageQueue {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/MessageRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageRequest.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/MessageRequest.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageRequest.java
index 1d5c4f1b02..70fdf63649 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/MessageRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/MessageRequest.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service;
+package info.nightscout.androidaps.plugins.pump.insight.connection_service;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
 
 public class MessageRequest<T extends AppLayerMessage> implements Comparable<MessageRequest> {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightBolusID.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightBolusID.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.java
index 44ad0ec582..16fa232a40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightBolusID.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.database;
+package info.nightscout.androidaps.plugins.pump.insight.database;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightHistoryOffset.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.java
similarity index 84%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightHistoryOffset.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.java
index 4608fd8d46..05f9d2d5e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightHistoryOffset.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.database;
+package info.nightscout.androidaps.plugins.pump.insight.database;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightPumpID.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightPumpID.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.java
index 0eae421655..7bd70b9185 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/database/InsightPumpID.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.database;
+package info.nightscout.androidaps.plugins.pump.insight.database;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveBasalRate.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBasalRate.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveBasalRate.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBasalRate.java
index 8ea2c2ac02..2fb078794b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveBasalRate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBasalRate.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class ActiveBasalRate {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveBolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBolus.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveBolus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBolus.java
index 6af521ab1d..f36e1d7de4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveBolus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class ActiveBolus {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveTBR.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveTBR.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveTBR.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveTBR.java
index 7ebbeec49b..406dd8c8fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/ActiveTBR.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/ActiveTBR.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class ActiveTBR {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/Alert.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/Alert.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
index ad6f71f95c..8f6668c1ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/Alert.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class Alert {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertCategory.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertCategory.java
similarity index 54%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertCategory.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertCategory.java
index 9b69ab556b..c2355f2b6a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertCategory.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertCategory.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public enum AlertCategory {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertStatus.java
new file mode 100644
index 0000000000..b3842edfed
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertStatus.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
+
+public enum AlertStatus {
+
+    ACTIVE,
+    SNOOZED;
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertType.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertType.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertType.java
index 3a8402f27f..b2c8331a49 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AlertType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AlertType.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public enum AlertType {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AvailableBolusTypes.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AvailableBolusTypes.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AvailableBolusTypes.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AvailableBolusTypes.java
index d332c28ff0..cbe6646212 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/AvailableBolusTypes.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/AvailableBolusTypes.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class AvailableBolusTypes {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfile.java
similarity index 59%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BasalProfile.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfile.java
index 45a113ece4..89cc68cbd5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfile.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public enum BasalProfile {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BasalProfileBlock.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfileBlock.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BasalProfileBlock.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfileBlock.java
index ff42fa4282..bc70691d59 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BasalProfileBlock.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BasalProfileBlock.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class BasalProfileBlock {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BatteryStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryStatus.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BatteryStatus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryStatus.java
index 36c5fc82fb..f8b33d287d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/BatteryStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryStatus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class BatteryStatus {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryType.java
new file mode 100644
index 0000000000..0cd5373c93
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BatteryType.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
+
+public enum BatteryType {
+
+    ALKALI,
+    LITHIUM,
+    NI_MH;
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BolusType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BolusType.java
new file mode 100644
index 0000000000..7af48fbfb7
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/BolusType.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
+
+public enum BolusType {
+
+    STANDARD,
+    EXTENDED,
+    MULTIWAVE;
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/CartridgeStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeStatus.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/CartridgeStatus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeStatus.java
index 7d01968f51..5c1edb031d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/CartridgeStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeStatus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class CartridgeStatus {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeType.java
new file mode 100644
index 0000000000..8c2f878387
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/CartridgeType.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
+
+public enum CartridgeType {
+
+    PREFILLED,
+    SELF_FILLED;
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/FirmwareVersions.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/FirmwareVersions.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/FirmwareVersions.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/FirmwareVersions.java
index 4c3afe0512..8930e47a4c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/FirmwareVersions.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/FirmwareVersions.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class FirmwareVersions {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/InsightState.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/InsightState.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/InsightState.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/InsightState.java
index 5d9bc22e78..2fe256663b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/InsightState.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/InsightState.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public enum InsightState {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/MessagePriority.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/MessagePriority.java
new file mode 100644
index 0000000000..10a47283a3
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/MessagePriority.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
+
+public enum MessagePriority {
+
+    NORMAL,
+    HIGHER,
+    HIGHEST;
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/OperatingMode.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/OperatingMode.java
new file mode 100644
index 0000000000..d745394715
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/OperatingMode.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
+
+public enum OperatingMode {
+
+    STARTED,
+    STOPPED,
+    PAUSED;
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/PumpTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/PumpTime.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/PumpTime.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/PumpTime.java
index 4b72f3ec54..9188e0d3c8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/PumpTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/PumpTime.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class PumpTime {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SymbolStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SymbolStatus.java
new file mode 100644
index 0000000000..567e6afb13
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SymbolStatus.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
+
+public enum SymbolStatus {
+
+    FULL,
+    LOW,
+    EMPTY;
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/SystemIdentification.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SystemIdentification.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/SystemIdentification.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SystemIdentification.java
index 5024534a08..540052c0d5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/SystemIdentification.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/SystemIdentification.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class SystemIdentification {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/TotalDailyDose.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/TotalDailyDose.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/TotalDailyDose.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/TotalDailyDose.java
index 8b0f0f8054..7f197c8cb3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/descriptors/TotalDailyDose.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/TotalDailyDose.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors;
+package info.nightscout.androidaps.plugins.pump.insight.descriptors;
 
 public class TotalDailyDose {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/AppLayerException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/AppLayerException.java
new file mode 100644
index 0000000000..aaf9dc695a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/AppLayerException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public abstract class AppLayerException extends InsightException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/CommandNotSupportedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/CommandNotSupportedException.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/CommandNotSupportedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/CommandNotSupportedException.java
index f626a8e8aa..fe950c8bac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/CommandNotSupportedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/CommandNotSupportedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
 
 public class CommandNotSupportedException extends InsightException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ConnectionFailedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionFailedException.java
similarity index 83%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ConnectionFailedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionFailedException.java
index dd53005b65..524953f613 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ConnectionFailedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionFailedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
 
 public class ConnectionFailedException extends InsightException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionLostException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionLostException.java
new file mode 100644
index 0000000000..fc7b517d80
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ConnectionLostException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class ConnectionLostException extends InsightException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/DisconnectedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/DisconnectedException.java
new file mode 100644
index 0000000000..fe2fd75d81
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/DisconnectedException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class DisconnectedException extends InsightException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/IncompatibleAppVersionException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleAppVersionException.java
similarity index 51%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/IncompatibleAppVersionException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleAppVersionException.java
index 4c7a89dd9f..ce6b6edccb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/IncompatibleAppVersionException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleAppVersionException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
 
 public class IncompatibleAppVersionException extends AppLayerException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/IncompatibleSatlVersionException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleSatlVersionException.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/IncompatibleSatlVersionException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleSatlVersionException.java
index dc0f40d0f7..0a28aadb80 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/IncompatibleSatlVersionException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/IncompatibleSatlVersionException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
 
 public class IncompatibleSatlVersionException extends SatlException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InsightException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InsightException.java
new file mode 100644
index 0000000000..4dc4161546
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InsightException.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public abstract class InsightException extends Exception {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidAppCRCException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidAppCRCException.java
new file mode 100644
index 0000000000..643e9589f2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidAppCRCException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class InvalidAppCRCException extends AppLayerException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidMacTrailerException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidMacTrailerException.java
new file mode 100644
index 0000000000..a3eda3700f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidMacTrailerException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class InvalidMacTrailerException extends SatlException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidNonceException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidNonceException.java
new file mode 100644
index 0000000000..aedc99df1a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidNonceException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class InvalidNonceException extends SatlException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPacketLengthsException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPacketLengthsException.java
new file mode 100644
index 0000000000..5a4373efbb
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPacketLengthsException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class InvalidPacketLengthsException extends SatlException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPreambleException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPreambleException.java
new file mode 100644
index 0000000000..7a5b4a1dd4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidPreambleException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class InvalidPreambleException extends SatlException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCRCException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCRCException.java
new file mode 100644
index 0000000000..ed6aa30d07
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCRCException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class InvalidSatlCRCException extends SatlException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCommandException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCommandException.java
new file mode 100644
index 0000000000..ccaca09b29
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/InvalidSatlCommandException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class InvalidSatlCommandException extends SatlException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ReceivedPacketInInvalidStateException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ReceivedPacketInInvalidStateException.java
similarity index 53%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ReceivedPacketInInvalidStateException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ReceivedPacketInInvalidStateException.java
index 244ffe1637..63b8c9019e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/ReceivedPacketInInvalidStateException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/ReceivedPacketInInvalidStateException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
 
 public class ReceivedPacketInInvalidStateException extends InsightException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SatlException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SatlException.java
new file mode 100644
index 0000000000..736e4c1b22
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SatlException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public abstract class SatlException extends InsightException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SecondChannelFailedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SecondChannelFailedException.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SecondChannelFailedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SecondChannelFailedException.java
index ca98f47992..f4eaa259f8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SecondChannelFailedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SecondChannelFailedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
 
 public class SecondChannelFailedException extends AppLayerException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SocketCreationFailedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SocketCreationFailedException.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SocketCreationFailedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SocketCreationFailedException.java
index 9b04a25ce9..589a546a84 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/SocketCreationFailedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/SocketCreationFailedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
 
 public class SocketCreationFailedException extends InsightException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TimeoutException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TimeoutException.java
new file mode 100644
index 0000000000..f819bcdacb
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TimeoutException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class TimeoutException extends InsightException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TooChattyPumpException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TooChattyPumpException.java
new file mode 100644
index 0000000000..181d3112d1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/TooChattyPumpException.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class TooChattyPumpException extends InsightException {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/UnknownAppCommandException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownAppCommandException.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/UnknownAppCommandException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownAppCommandException.java
index 994af8f222..dbe39b56d2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/UnknownAppCommandException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownAppCommandException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
 
 public class UnknownAppCommandException extends AppLayerException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownServiceException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownServiceException.java
new file mode 100644
index 0000000000..b119e7b9ca
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/UnknownServiceException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions;
+
+public class UnknownServiceException extends AppLayerException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/AlreadyConnectedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AlreadyConnectedException.java
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/AlreadyConnectedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AlreadyConnectedException.java
index eed505b624..65631f3154 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/AlreadyConnectedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AlreadyConnectedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class AlreadyConnectedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/AppLayerErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AppLayerErrorException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/AppLayerErrorException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AppLayerErrorException.java
index 6148fd86b0..10d5bfea2c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/AppLayerErrorException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/AppLayerErrorException.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.AppLayerException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.AppLayerException;
 
 public abstract class AppLayerErrorException extends AppLayerException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusAmountNotInRangeException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusAmountNotInRangeException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusAmountNotInRangeException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusAmountNotInRangeException.java
index e01252fc02..b87989d5f2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusAmountNotInRangeException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusAmountNotInRangeException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class BolusAmountNotInRangeException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusDurationNotInRangeException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusDurationNotInRangeException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusDurationNotInRangeException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusDurationNotInRangeException.java
index 70414af4a5..4b9eb1ebb1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusDurationNotInRangeException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusDurationNotInRangeException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class BolusDurationNotInRangeException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java
index 2c4f75be14..a7050d7c83 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusLagTimeFeatureDisabledException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class BolusLagTimeFeatureDisabledException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java
index 5f183cacc3..8dbc6465b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/BolusTypeAndParameterMismatchException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class BolusTypeAndParameterMismatchException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/CommandExecutionFailedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CommandExecutionFailedException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/CommandExecutionFailedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CommandExecutionFailedException.java
index 4dbaf35017..b7efb4998e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/CommandExecutionFailedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CommandExecutionFailedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class CommandExecutionFailedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ConfigMemoryAccessException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ConfigMemoryAccessException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ConfigMemoryAccessException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ConfigMemoryAccessException.java
index f71b355ef9..b822fb0da4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ConfigMemoryAccessException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ConfigMemoryAccessException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class ConfigMemoryAccessException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java
index 5e2692991d..8aee22cb66 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/CustomBolusNotConfiguredException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class CustomBolusNotConfiguredException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java
index ff2bb5ea2e..1d87fada0f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ImplausiblePortionLengthValueException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class ImplausiblePortionLengthValueException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/IncompatibleVersionException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/IncompatibleVersionException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/IncompatibleVersionException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/IncompatibleVersionException.java
index 96ce856d2f..0d596fc825 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/IncompatibleVersionException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/IncompatibleVersionException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class IncompatibleVersionException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java
index 080e811297..f35566eb54 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidAlertInstanceIdException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidAlertInstanceIdException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java
index 3c99a53f35..07834a34bd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockCRCException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidConfigBlockCRCException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockIdException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockIdException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockIdException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockIdException.java
index 35d5ffc005..e6a3aff909 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockIdException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockIdException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidConfigBlockIdException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java
index 6905d02d95..90eb6556c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidConfigBlockLengthException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidConfigBlockLengthException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidDateParameterException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDateParameterException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidDateParameterException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDateParameterException.java
index bf54da11b9..a7770859e4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidDateParameterException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDateParameterException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidDateParameterException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidDurationPresetException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDurationPresetException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidDurationPresetException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDurationPresetException.java
index e839cedfb7..0bc787ec58 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidDurationPresetException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidDurationPresetException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidDurationPresetException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidLagTimeException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidLagTimeException.java
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidLagTimeException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidLagTimeException.java
index 658c9f4168..2f14b1156d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidLagTimeException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidLagTimeException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidLagTimeException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidParameterTypeException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidParameterTypeException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidParameterTypeException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidParameterTypeException.java
index 3ac94ae973..37bd17c41a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidParameterTypeException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidParameterTypeException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidParameterTypeException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadCRCException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadCRCException.java
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadCRCException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadCRCException.java
index b8711780e1..5e06eca9d5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadCRCException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadCRCException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidPayloadCRCException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadException.java
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadException.java
index 5313098c74..ebb942dc73 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidPayloadException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadLengthException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadLengthException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadLengthException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadLengthException.java
index 9f7dac63f0..89b519c472 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidPayloadLengthException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidPayloadLengthException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidPayloadLengthException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidServicePasswordException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidServicePasswordException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidServicePasswordException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidServicePasswordException.java
index de17537d35..be8b41a188 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidServicePasswordException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidServicePasswordException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidServicePasswordException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRDurationException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRDurationException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRDurationException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRDurationException.java
index 45fa556b0a..d5fa35e4fb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRDurationException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRDurationException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidTBRDurationException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRFactorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRFactorException.java
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRFactorException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRFactorException.java
index d90cd21aee..d27b0172b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRFactorException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRFactorException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidTBRFactorException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRTemplateException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRTemplateException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRTemplateException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRTemplateException.java
index a975f33883..d8f5c6f8d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTBRTemplateException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTBRTemplateException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidTBRTemplateException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTimeParameterException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTimeParameterException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTimeParameterException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTimeParameterException.java
index 58f22094f3..2170adc8af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidTimeParameterException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidTimeParameterException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidTimeParameterException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java
index 98a64f5cab..8b51c6bf6e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/InvalidValuesOfTwoChannelTransmission.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class InvalidValuesOfTwoChannelTransmission extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java
similarity index 69%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java
index 72cd3e9dc4..917b715a05 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/MaximumNumberOfBolusTypeAlreadyRunningException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class MaximumNumberOfBolusTypeAlreadyRunningException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java
index dae8b3ca8e..178a551896 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToCanceLException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class NoActiveTBRToCanceLException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoActiveTBRToChangeException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToChangeException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoActiveTBRToChangeException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToChangeException.java
index faf8752c56..63811f59e2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoActiveTBRToChangeException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoActiveTBRToChangeException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class NoActiveTBRToChangeException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoConfigBlockDataException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoConfigBlockDataException.java
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoConfigBlockDataException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoConfigBlockDataException.java
index 602faa3594..1a3b1dfc3b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoConfigBlockDataException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoConfigBlockDataException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class NoConfigBlockDataException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoServicePasswordNeededException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoServicePasswordNeededException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoServicePasswordNeededException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoServicePasswordNeededException.java
index d6df477abc..72f4d4bd89 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoServicePasswordNeededException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoServicePasswordNeededException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class NoServicePasswordNeededException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoSuchBolusToCancelException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoSuchBolusToCancelException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoSuchBolusToCancelException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoSuchBolusToCancelException.java
index 923c1365b6..d3532d0dde 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NoSuchBolusToCancelException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NoSuchBolusToCancelException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class NoSuchBolusToCancelException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java
similarity index 68%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java
index 8ce2c1258e..758d80d216 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotAllowedToAccessPositionZeroException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class NotAllowedToAccessPositionZeroException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotConnectedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotConnectedException.java
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotConnectedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotConnectedException.java
index f0ddab4b8f..a0b47aa4da 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotConnectedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotConnectedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class NotConnectedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotReferencedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotReferencedException.java
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotReferencedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotReferencedException.java
index c3eb98fd2a..f2469d1ffe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/NotReferencedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/NotReferencedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class NotReferencedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PauseModeNotAllowedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PauseModeNotAllowedException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PauseModeNotAllowedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PauseModeNotAllowedException.java
index 03939e9346..6da528ac27 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PauseModeNotAllowedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PauseModeNotAllowedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class PauseModeNotAllowedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PositionProtectedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PositionProtectedException.java
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PositionProtectedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PositionProtectedException.java
index e1171ecfa8..7670eb6fb8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PositionProtectedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PositionProtectedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class PositionProtectedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java
index cfac26d3a2..574efb065b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpAlreadyInThatStateException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class PumpAlreadyInThatStateException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpBusyException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpBusyException.java
similarity index 62%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpBusyException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpBusyException.java
index d7deee7eea..4d7fe90b43 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpBusyException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpBusyException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class PumpBusyException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpStoppedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpStoppedException.java
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpStoppedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpStoppedException.java
index a7f42a5713..31aae38bb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/PumpStoppedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/PumpStoppedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class PumpStoppedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java
index e6629515fa..9091c8b999 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryAlreadyStartedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class ReadingHistoryAlreadyStartedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java
index e2328f10e6..2a37f62b39 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ReadingHistoryNotStartedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class ReadingHistoryNotStartedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/RunModeNotAllowedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/RunModeNotAllowedException.java
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/RunModeNotAllowedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/RunModeNotAllowedException.java
index da704e415e..262e41ae21 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/RunModeNotAllowedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/RunModeNotAllowedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class RunModeNotAllowedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java
index dca8277218..4865697483 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceAlreadyActivatedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class ServiceAlreadyActivatedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java
similarity index 67%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java
index b847a1d8f3..7341cc67a9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceCommandNotAvailableException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class ServiceCommandNotAvailableException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceIncompatibleException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceIncompatibleException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceIncompatibleException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceIncompatibleException.java
index 13b2784213..4c3fc8b1dc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceIncompatibleException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceIncompatibleException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class ServiceIncompatibleException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceNotActivatedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceNotActivatedException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceNotActivatedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceNotActivatedException.java
index ec2b117550..55329a2a5b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/ServiceNotActivatedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/ServiceNotActivatedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class ServiceNotActivatedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/StepCountOutOfRangeException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/StepCountOutOfRangeException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/StepCountOutOfRangeException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/StepCountOutOfRangeException.java
index 5c1548403c..cb1a04fe74 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/StepCountOutOfRangeException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/StepCountOutOfRangeException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class StepCountOutOfRangeException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java
index 8487e84039..4c08240102 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownAppLayerErrorCodeException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class UnknownAppLayerErrorCodeException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownCommandException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownCommandException.java
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownCommandException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownCommandException.java
index 790a03802c..edf06628dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownCommandException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownCommandException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class UnknownCommandException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownServiceException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownServiceException.java
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownServiceException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownServiceException.java
index a6c0a771f7..2992372e18 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/UnknownServiceException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/UnknownServiceException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class UnknownServiceException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java
index c02e36f394..b4001d2f06 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionAlreadyOpenException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class WriteSessionAlreadyOpenException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WriteSessionClosedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionClosedException.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WriteSessionClosedException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionClosedException.java
index 84427621bf..966afecb68 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WriteSessionClosedException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WriteSessionClosedException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class WriteSessionClosedException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WrongStateException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WrongStateException.java
similarity index 62%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WrongStateException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WrongStateException.java
index 939be56495..b4cc3af99e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/app_layer_errors/WrongStateException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/app_layer_errors/WrongStateException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors;
 
 public class WrongStateException extends AppLayerErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlCompatibleStateErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlCompatibleStateErrorException.java
new file mode 100644
index 0000000000..fde27a8f5f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlCompatibleStateErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlCompatibleStateErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java
index d0ad555a20..74a68dc2ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlDecryptVerifyFailedErrorException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
 
 public class SatlDecryptVerifyFailedErrorException extends SatlErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlErrorException.java
new file mode 100644
index 0000000000..26dc0e2719
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlErrorException.java
@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightException;
+
+public abstract class SatlErrorException extends InsightException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java
index de69d3bb6f..df152adf83 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlIncompatibleVersionErrorException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
 
 public class SatlIncompatibleVersionErrorException extends SatlErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCRCErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCRCErrorException.java
new file mode 100644
index 0000000000..2156bc48a0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCRCErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlInvalidCRCErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCommIdErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCommIdErrorException.java
new file mode 100644
index 0000000000..12e9ca7bb4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidCommIdErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlInvalidCommIdErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMacErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMacErrorException.java
new file mode 100644
index 0000000000..75f547ef15
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMacErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlInvalidMacErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java
new file mode 100644
index 0000000000..6551a28c8f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidMessageTypeErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlInvalidMessageTypeErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidNonceErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidNonceErrorException.java
new file mode 100644
index 0000000000..8f9304c3c0
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidNonceErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlInvalidNonceErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPacketErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPacketErrorException.java
new file mode 100644
index 0000000000..ed3f50e98b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPacketErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlInvalidPacketErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java
index 4651328d8d..69646f265c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlInvalidPayloadLengthErrorException.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors;
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
 
 public class SatlInvalidPayloadLengthErrorException extends SatlErrorException {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlNoneErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlNoneErrorException.java
new file mode 100644
index 0000000000..febe6a8ced
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlNoneErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlNoneErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlPairingRejectedException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlPairingRejectedException.java
new file mode 100644
index 0000000000..479efd150d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlPairingRejectedException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlPairingRejectedException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlUndefinedErrorException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlUndefinedErrorException.java
new file mode 100644
index 0000000000..f655c8668d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlUndefinedErrorException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlUndefinedErrorException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlWrongStateException.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlWrongStateException.java
new file mode 100644
index 0000000000..aa50c46ec9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/exceptions/satl_errors/SatlWrongStateException.java
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors;
+
+public class SatlWrongStateException extends SatlErrorException {
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ActiveBasalProfileIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBasalProfileIDs.java
similarity index 62%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ActiveBasalProfileIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBasalProfileIDs.java
index 96b86a7a39..9d5a6e1f85 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ActiveBasalProfileIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBasalProfileIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BasalProfile;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BasalProfile;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class ActiveBasalProfileIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ActiveBolusTypeIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBolusTypeIDs.java
similarity index 54%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ActiveBolusTypeIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBolusTypeIDs.java
index 479371c3c5..f04e7ddbbc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ActiveBolusTypeIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ActiveBolusTypeIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BolusType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BolusType;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class ActiveBolusTypeIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertCategoryIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertCategoryIDs.java
similarity index 58%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertCategoryIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertCategoryIDs.java
index 67a8e4ebe7..59a02b36d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertCategoryIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertCategoryIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertCategory;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertCategory;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class AlertCategoryIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertStatusIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertStatusIDs.java
new file mode 100644
index 0000000000..b249dfded2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertStatusIDs.java
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.insight.ids;
+
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertStatus;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
+
+public class AlertStatusIDs {
+
+    public static final IDStorage<AlertStatus, Integer> IDS = new IDStorage<>();
+
+    static {
+        IDS.put(AlertStatus.ACTIVE, 31);
+        IDS.put(AlertStatus.SNOOZED, 227);
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertTypeIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIDs.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertTypeIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIDs.java
index 31627993a7..0688fb6cf2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertTypeIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class AlertTypeIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertTypeIncrementalIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIncrementalIDs.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertTypeIncrementalIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIncrementalIDs.java
index cccb2bcef9..340648b8c7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/AlertTypeIncrementalIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AlertTypeIncrementalIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.AlertType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class AlertTypeIncrementalIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppCommandIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppCommandIDs.java
new file mode 100644
index 0000000000..da52987a1f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppCommandIDs.java
@@ -0,0 +1,81 @@
+package info.nightscout.androidaps.plugins.pump.insight.ids;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SetDateTimeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.ReadParameterBlockMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.CloseConfigurationWriteSessionMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.OpenConfigurationWriteSessionMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.WriteConfigurationBlockMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.ActivateServiceMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.BindMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.ConnectMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.DisconnectMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.connection.ServiceChallengeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.ReadHistoryEventsMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.StartReadingHistoryMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.StopReadingHistoryMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.CancelBolusMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.CancelTBRMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ChangeTBRMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ConfirmAlertMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.DeliverBolusMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.GetAvailableBolusTypesMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SetOperatingModeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SetTBRMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SnoozeAlertMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveAlertMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveBasalRateMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveBolusesMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetActiveTBRMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetBatteryStatusMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetCartridgeStatusMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetDateTimeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetFirmwareVersionsMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetOperatingModeMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetPumpStatusRegisterMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetTotalDailyDoseMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.ResetPumpStatusRegisterMessage;
+
+public class AppCommandIDs {
+
+    public static final IDStorage<Class<? extends AppLayerMessage>, Integer> IDS = new IDStorage<>();
+
+    static {
+        IDS.put(ConnectMessage.class, 61451);
+        IDS.put(BindMessage.class, 62413);
+        IDS.put(DisconnectMessage.class, 61460);
+        IDS.put(ActivateServiceMessage.class, 61687);
+        IDS.put(ServiceChallengeMessage.class, 62418);
+        IDS.put(GetActiveAlertMessage.class, 985);
+        IDS.put(GetActiveBolusesMessage.class, 1647);
+        IDS.put(GetActiveTBRMessage.class, 1462);
+        IDS.put(GetAvailableBolusTypesMessage.class, 6362);
+        IDS.put(GetBatteryStatusMessage.class, 805);
+        IDS.put(GetCartridgeStatusMessage.class, 826);
+        IDS.put(GetDateTimeMessage.class, 227);
+        IDS.put(GetFirmwareVersionsMessage.class, 11992);
+        IDS.put(GetOperatingModeMessage.class, 252);
+        IDS.put(GetPumpStatusRegisterMessage.class, 31);
+        IDS.put(ResetPumpStatusRegisterMessage.class, 35476);
+        IDS.put(GetActiveBasalRateMessage.class, 1449);
+        IDS.put(GetTotalDailyDoseMessage.class, 966);
+        IDS.put(CancelTBRMessage.class, 6201);
+        IDS.put(CancelBolusMessage.class, 7136);
+        IDS.put(SetOperatingModeMessage.class, 6182);
+        IDS.put(ReadParameterBlockMessage.class, 7766);
+        IDS.put(WriteConfigurationBlockMessage.class, 7850);
+        IDS.put(CloseConfigurationWriteSessionMessage.class, 7861);
+        IDS.put(OpenConfigurationWriteSessionMessage.class, 7753);
+        IDS.put(DeliverBolusMessage.class, 6915);
+        IDS.put(SetTBRMessage.class, 6341);
+        IDS.put(ChangeTBRMessage.class, 42067);
+        IDS.put(ReadHistoryEventsMessage.class, 10408);
+        IDS.put(StartReadingHistoryMessage.class, 10324);
+        IDS.put(StopReadingHistoryMessage.class, 38887);
+        IDS.put(ConfirmAlertMessage.class, 1683);
+        IDS.put(SnoozeAlertMessage.class, 1676);
+        IDS.put(SetDateTimeMessage.class, 7167);
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppErrorIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppErrorIDs.java
new file mode 100644
index 0000000000..a06a18c56d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/AppErrorIDs.java
@@ -0,0 +1,121 @@
+package info.nightscout.androidaps.plugins.pump.insight.ids;
+
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AlreadyConnectedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.BolusAmountNotInRangeException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.BolusDurationNotInRangeException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.BolusLagTimeFeatureDisabledException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.BolusTypeAndParameterMismatchException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.CommandExecutionFailedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.ConfigMemoryAccessException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.CustomBolusNotConfiguredException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.ImplausiblePortionLengthValueException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.IncompatibleVersionException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidAlertInstanceIdException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidConfigBlockCRCException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidConfigBlockIdException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidConfigBlockLengthException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidDateParameterException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidDurationPresetException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidLagTimeException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidParameterTypeException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidPayloadCRCException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidPayloadException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidPayloadLengthException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidServicePasswordException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidTBRDurationException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidTBRFactorException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidTBRTemplateException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidTimeParameterException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.InvalidValuesOfTwoChannelTransmission;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.MaximumNumberOfBolusTypeAlreadyRunningException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToChangeException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoConfigBlockDataException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoServicePasswordNeededException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoSuchBolusToCancelException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NotAllowedToAccessPositionZeroException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NotConnectedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NotReferencedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.PauseModeNotAllowedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.PositionProtectedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.PumpAlreadyInThatStateException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.PumpBusyException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.PumpStoppedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.ReadingHistoryAlreadyStartedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.ReadingHistoryNotStartedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.RunModeNotAllowedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.ServiceAlreadyActivatedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.ServiceCommandNotAvailableException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.ServiceIncompatibleException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.ServiceNotActivatedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.StepCountOutOfRangeException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.UnknownCommandException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.UnknownServiceException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.WriteSessionAlreadyOpenException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.WriteSessionClosedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.WrongStateException;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
+
+public class AppErrorIDs {
+
+    public static final IDStorage<Class<? extends AppLayerErrorException>, Integer> IDS = new IDStorage<>();
+
+    static {
+        IDS.put(PumpStoppedException.class, 3178);
+        IDS.put(BolusAmountNotInRangeException.class, 6017);
+        IDS.put(PumpAlreadyInThatStateException.class, 3324);
+        IDS.put(InvalidServicePasswordException.class, 61593);
+        IDS.put(UnknownCommandException.class, 61455);
+        IDS.put(AlreadyConnectedException.class, 61530);
+        IDS.put(WrongStateException.class, 61680);
+        IDS.put(ServiceIncompatibleException.class, 61542);
+        IDS.put(UnknownServiceException.class, 61545);
+        IDS.put(NoServicePasswordNeededException.class, 61695);
+        IDS.put(ServiceAlreadyActivatedException.class, 61644);
+        IDS.put(IncompatibleVersionException.class, 61491);
+        IDS.put(InvalidPayloadLengthException.class, 61500);
+        IDS.put(NotConnectedException.class, 61525);
+        IDS.put(ServiceCommandNotAvailableException.class, 61605);
+        IDS.put(ServiceNotActivatedException.class, 61610);
+        IDS.put(PumpBusyException.class, 61635);
+        IDS.put(NotReferencedException.class, 5335);
+        IDS.put(StepCountOutOfRangeException.class, 5348);
+        IDS.put(InvalidPayloadCRCException.class, 2805);
+        IDS.put(InvalidParameterTypeException.class, 2810);
+        IDS.put(CommandExecutionFailedException.class, 22796);
+        IDS.put(InvalidAlertInstanceIdException.class, 3238);
+        IDS.put(InvalidTBRFactorException.class, 3241);
+        IDS.put(InvalidTBRDurationException.class, 3264);
+        IDS.put(InvalidTBRTemplateException.class, 6363);
+        IDS.put(PauseModeNotAllowedException.class, 3315);
+        IDS.put(RunModeNotAllowedException.class, 3279);
+        IDS.put(NoActiveTBRToCanceLException.class, 3840);
+        IDS.put(BolusTypeAndParameterMismatchException.class, 3925);
+        IDS.put(InvalidDurationPresetException.class, 5924);
+        IDS.put(BolusLagTimeFeatureDisabledException.class, 90);
+        IDS.put(BolusDurationNotInRangeException.class, 6014);
+        IDS.put(InvalidValuesOfTwoChannelTransmission.class, 0x0F96);
+        IDS.put(NoSuchBolusToCancelException.class, 4005);
+        IDS.put(MaximumNumberOfBolusTypeAlreadyRunningException.class, 4010);
+        IDS.put(CustomBolusNotConfiguredException.class, 6270);
+        IDS.put(InvalidDateParameterException.class, 4044);
+        IDS.put(InvalidTimeParameterException.class, 4080);
+        IDS.put(NoConfigBlockDataException.class, 4471);
+        IDS.put(InvalidConfigBlockIdException.class, 4472);
+        IDS.put(InvalidConfigBlockCRCException.class, 4487);
+        IDS.put(InvalidConfigBlockLengthException.class, 6286);
+        IDS.put(WriteSessionAlreadyOpenException.class, 4539);
+        IDS.put(WriteSessionClosedException.class, 4562);
+        IDS.put(ConfigMemoryAccessException.class, 4573);
+        IDS.put(ReadingHistoryAlreadyStartedException.class, 11794);
+        IDS.put(ReadingHistoryNotStartedException.class, 4680);
+        IDS.put(InvalidPayloadException.class, 6210);
+        IDS.put(ImplausiblePortionLengthValueException.class, 4824);
+        IDS.put(NotAllowedToAccessPositionZeroException.class, 4830);
+        IDS.put(PositionProtectedException.class, 4845);
+        IDS.put(InvalidLagTimeException.class, 3891);
+        IDS.put(NoActiveTBRToChangeException.class, 6322);
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/BatteryTypeIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BatteryTypeIDs.java
similarity index 53%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/BatteryTypeIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BatteryTypeIDs.java
index 45a4912213..9485da4a55 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/BatteryTypeIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BatteryTypeIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BatteryType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BatteryType;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class BatteryTypeIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/BolusTypeIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BolusTypeIDs.java
similarity index 53%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/BolusTypeIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BolusTypeIDs.java
index 0665455e0e..6917f82e9f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/BolusTypeIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/BolusTypeIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.BolusType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.BolusType;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class BolusTypeIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/CartridgeTypeIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/CartridgeTypeIDs.java
similarity index 50%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/CartridgeTypeIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/CartridgeTypeIDs.java
index 2ddd69b600..9d48d8cdb2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/CartridgeTypeIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/CartridgeTypeIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.CartridgeType;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.CartridgeType;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class CartridgeTypeIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryEventIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryEventIDs.java
new file mode 100644
index 0000000000..407f132aa1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryEventIDs.java
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugins.pump.insight.ids;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.BasalDeliveryChangedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.BolusDeliveredEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.BolusProgrammedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.CannulaFilledEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.CartridgeInsertedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.CartridgeRemovedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.DateTimeChangedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.DefaultDateTimeSetEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.EndOfTBREvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.HistoryEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.OccurrenceOfErrorEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.OccurrenceOfMaintenanceEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.OccurrenceOfWarningEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.OperatingModeChangedEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.PowerDownEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.PowerUpEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.SniffingDoneEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.StartOfTBREvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.TotalDailyDoseEvent;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events.TubeFilledEvent;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
+
+public class HistoryEventIDs {
+
+    public static final IDStorage<Class<? extends HistoryEvent>, Integer> IDS = new IDStorage<>();
+
+    static {
+        IDS.put(BolusDeliveredEvent.class, 917);
+        IDS.put(BolusProgrammedEvent.class, 874);
+        IDS.put(CannulaFilledEvent.class, 3264);
+        IDS.put(DateTimeChangedEvent.class, 165);
+        IDS.put(DefaultDateTimeSetEvent.class, 170);
+        IDS.put(EndOfTBREvent.class, 771);
+        IDS.put(OccurrenceOfErrorEvent.class, 1011);
+        IDS.put(OccurrenceOfMaintenanceEvent.class, 1290);
+        IDS.put(OccurrenceOfWarningEvent.class, 1360);
+        IDS.put(OperatingModeChangedEvent.class, 195);
+        IDS.put(PowerUpEvent.class, 15);
+        IDS.put(PowerDownEvent.class, 51);
+        IDS.put(SniffingDoneEvent.class, 102);
+        IDS.put(StartOfTBREvent.class, 240);
+        IDS.put(TotalDailyDoseEvent.class, 960);
+        IDS.put(TubeFilledEvent.class, 105);
+        IDS.put(CartridgeInsertedEvent.class, 60);
+        IDS.put(CartridgeRemovedEvent.class, 85);
+        IDS.put(BasalDeliveryChangedEvent.class, 204);
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/HistoryReadingDirectionIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryReadingDirectionIDs.java
similarity index 52%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/HistoryReadingDirectionIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryReadingDirectionIDs.java
index 5b2737d1f0..f8b068d9af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/HistoryReadingDirectionIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/HistoryReadingDirectionIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.history.HistoryReadingDirection;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.history.HistoryReadingDirection;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class HistoryReadingDirectionIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/OperatingModeIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/OperatingModeIDs.java
similarity index 54%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/OperatingModeIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/OperatingModeIDs.java
index 2e6597e494..faf86d80d9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/OperatingModeIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/OperatingModeIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.OperatingMode;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.OperatingMode;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class OperatingModeIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/PairingStatusIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/PairingStatusIDs.java
similarity index 56%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/PairingStatusIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/PairingStatusIDs.java
index 7b34e9375f..8325446e7d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/PairingStatusIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/PairingStatusIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.PairingStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.PairingStatus;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class PairingStatusIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ParameterBlockIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ParameterBlockIDs.java
new file mode 100644
index 0000000000..36813756f9
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ParameterBlockIDs.java
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugins.pump.insight.ids;
+
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.FactoryMaxBasalAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.FactoryMinBasalAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.MaxBasalAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.ParameterBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.ActiveBRProfileBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile1Block;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile1NameBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile2Block;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile2NameBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile3Block;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile3NameBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile4Block;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile4NameBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile5Block;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.BRProfile5NameBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.FactoryMaxBolusAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.FactoryMinBolusAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.MaxBolusAmountBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.SystemIdentificationBlock;
+
+public class ParameterBlockIDs {
+
+    public static final IDStorage<Class<? extends ParameterBlock>, Integer> IDS = new IDStorage<>();
+
+    static {
+        IDS.put(FactoryMaxBolusAmountBlock.class, 41222);
+        IDS.put(MaxBolusAmountBlock.class, 31);
+        IDS.put(FactoryMinBolusAmountBlock.class, 60183);
+        IDS.put(SystemIdentificationBlock.class, 35476);
+        IDS.put(BRProfile1Block.class, 7136);
+        IDS.put(BRProfile2Block.class, 7167);
+        IDS.put(BRProfile3Block.class, 7532);
+        IDS.put(BRProfile4Block.class, 7539);
+        IDS.put(BRProfile5Block.class, 7567);
+        IDS.put(BRProfile1NameBlock.class, 48265);
+        IDS.put(BRProfile2NameBlock.class, 48278);
+        IDS.put(BRProfile3NameBlock.class, 48975);
+        IDS.put(BRProfile4NameBlock.class, 48976);
+        IDS.put(BRProfile5NameBlock.class, 49068);
+        IDS.put(ActiveBRProfileBlock.class, 7568);
+        IDS.put(MaxBasalAmountBlock.class, 6940);
+        IDS.put(FactoryMinBasalAmountBlock.class, 60395);
+        IDS.put(FactoryMaxBasalAmountBlock.class, 41241);
+        IDS.put(TBROverNotificationBlock.class, 25814);
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlCommandIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlCommandIDs.java
new file mode 100644
index 0000000000..2423118507
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlCommandIDs.java
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.plugins.pump.insight.ids;
+
+import info.nightscout.androidaps.plugins.pump.insight.satl.SatlMessage;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.ConnectionRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.ConnectionResponse;
+import info.nightscout.androidaps.plugins.pump.insight.satl.DataMessage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.DisconnectMessage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.ErrorMessage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.KeyRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.KeyResponse;
+import info.nightscout.androidaps.plugins.pump.insight.satl.SynAckResponse;
+import info.nightscout.androidaps.plugins.pump.insight.satl.SynRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.VerifyConfirmRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.VerifyConfirmResponse;
+import info.nightscout.androidaps.plugins.pump.insight.satl.VerifyDisplayRequest;
+import info.nightscout.androidaps.plugins.pump.insight.satl.VerifyDisplayResponse;
+
+public class SatlCommandIDs {
+
+    public static final IDStorage<Class<? extends SatlMessage>, Byte> IDS = new IDStorage<>();
+
+    static {
+        IDS.put(DataMessage.class, (byte) 3);
+        IDS.put(ErrorMessage.class, (byte) 6);
+        IDS.put(ConnectionRequest.class, (byte) 9);
+        IDS.put(ConnectionResponse.class, (byte) 10);
+        IDS.put(KeyRequest.class, (byte) 12);
+        IDS.put(VerifyConfirmRequest.class, (byte) 14);
+        IDS.put(KeyResponse.class, (byte) 17);
+        IDS.put(VerifyDisplayRequest.class, (byte) 18);
+        IDS.put(VerifyDisplayResponse.class, (byte) 20);
+        IDS.put(SynRequest.class, (byte) 23);
+        IDS.put(SynAckResponse.class, (byte) 24);
+        IDS.put(DisconnectMessage.class, (byte) 27);
+        IDS.put(VerifyConfirmResponse.class, (byte) 30);
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SatlErrorIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlErrorIDs.java
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SatlErrorIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlErrorIDs.java
index 941305ee24..fe18afbff0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SatlErrorIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SatlErrorIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.satl.SatlError;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.satl.SatlError;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class SatlErrorIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ServiceIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ServiceIDs.java
similarity index 65%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ServiceIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ServiceIDs.java
index c4d62c1088..f9a59bdda5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/ServiceIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/ServiceIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class ServiceIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SymbolStatusIDs.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SymbolStatusIDs.java
similarity index 53%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SymbolStatusIDs.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SymbolStatusIDs.java
index d3cdebdcc3..84aee7f092 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/ids/SymbolStatusIDs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/ids/SymbolStatusIDs.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.ids;
+package info.nightscout.androidaps.plugins.pump.insight.ids;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.SymbolStatus;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.IDStorage;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.SymbolStatus;
+import info.nightscout.androidaps.plugins.pump.insight.utils.IDStorage;
 
 public class SymbolStatusIDs {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionRequest.java
new file mode 100644
index 0000000000..9a6bf6ee15
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionRequest.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.satl;
+
+public class ConnectionRequest extends SatlMessage {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionResponse.java
new file mode 100644
index 0000000000..46bd0fd787
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ConnectionResponse.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.satl;
+
+public class ConnectionResponse extends SatlMessage {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/DataMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DataMessage.java
similarity index 68%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/DataMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DataMessage.java
index 61f2281d01..d41059f208 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/DataMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DataMessage.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class DataMessage extends SatlMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DisconnectMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DisconnectMessage.java
new file mode 100644
index 0000000000..d1e9eb0c56
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/DisconnectMessage.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.satl;
+
+public class DisconnectMessage extends SatlMessage {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ErrorMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ErrorMessage.java
similarity index 56%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ErrorMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ErrorMessage.java
index f871fe34eb..3acab320b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/ErrorMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/ErrorMessage.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.SatlErrorIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.ids.SatlErrorIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class ErrorMessage extends SatlMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/KeyRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyRequest.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/KeyRequest.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyRequest.java
index 5b5435b188..a4a8a57438 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/KeyRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyRequest.java
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
 import java.util.Calendar;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class KeyRequest extends SatlMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/KeyResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyResponse.java
similarity index 76%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/KeyResponse.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyResponse.java
index 9f8abac101..1affbab763 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/KeyResponse.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/KeyResponse.java
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class KeyResponse extends SatlMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/PairingStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/PairingStatus.java
similarity index 52%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/PairingStatus.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/PairingStatus.java
index 9bea5b5b10..52131e2d1e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/PairingStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/PairingStatus.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
 public enum PairingStatus {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SatlError.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlError.java
similarity index 82%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SatlError.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlError.java
index 7e9396c34d..7e04018dc8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SatlError.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlError.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
 public enum SatlError {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SatlMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SatlMessage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java
index 77f846c434..09d5d1626a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/SatlMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java
@@ -1,22 +1,18 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
-
-import android.util.Log;
-
-import org.spongycastle.util.encoders.Hex;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
 import java.util.Arrays;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.IncompatibleSatlVersionException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidMacTrailerException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidNonceException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidPacketLengthsException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidPreambleException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidSatlCRCException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InvalidSatlCommandException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.SatlCommandIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.Nonce;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto.Cryptograph;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.IncompatibleSatlVersionException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidMacTrailerException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidNonceException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidPacketLengthsException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidPreambleException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidSatlCRCException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.InvalidSatlCommandException;
+import info.nightscout.androidaps.plugins.pump.insight.ids.SatlCommandIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.Nonce;
+import info.nightscout.androidaps.plugins.pump.insight.utils.crypto.Cryptograph;
 
 public abstract class SatlMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynAckResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynAckResponse.java
new file mode 100644
index 0000000000..261d2fa01c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynAckResponse.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.satl;
+
+public class SynAckResponse extends SatlMessage {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynRequest.java
new file mode 100644
index 0000000000..9b47376495
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SynRequest.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.satl;
+
+public class SynRequest extends SatlMessage {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyConfirmRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmRequest.java
similarity index 54%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyConfirmRequest.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmRequest.java
index 9df12e8b27..dcca03a8f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyConfirmRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmRequest.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.PairingStatusIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.ids.PairingStatusIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class VerifyConfirmRequest extends SatlMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyConfirmResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmResponse.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyConfirmResponse.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmResponse.java
index 7afae3bd91..ed839f81a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/satl/VerifyConfirmResponse.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyConfirmResponse.java
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.satl;
+package info.nightscout.androidaps.plugins.pump.insight.satl;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.ids.PairingStatusIDs;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.ids.PairingStatusIDs;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class VerifyConfirmResponse extends SatlMessage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayRequest.java
new file mode 100644
index 0000000000..4ed85b620c
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayRequest.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.satl;
+
+public class VerifyDisplayRequest extends SatlMessage {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayResponse.java
new file mode 100644
index 0000000000..0d3dc52f3e
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/VerifyDisplayResponse.java
@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.plugins.pump.insight.satl;
+
+public class VerifyDisplayResponse extends SatlMessage {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/BOCUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/BOCUtil.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/BOCUtil.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/BOCUtil.java
index 73daff3005..6d0d93920f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/BOCUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/BOCUtil.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 public final class BOCUtil {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ByteBuf.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ByteBuf.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ByteBuf.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ByteBuf.java
index c9f1fcf790..107634acf9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ByteBuf.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ByteBuf.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ConnectionEstablisher.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ConnectionEstablisher.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java
index 921e2d407c..ce6a299521 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ConnectionEstablisher.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ConnectionEstablisher.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/DelayedActionThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/DelayedActionThread.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/DelayedActionThread.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/DelayedActionThread.java
index 6f1c48732f..c801a1b2d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/DelayedActionThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/DelayedActionThread.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 public class DelayedActionThread extends Thread {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ExceptionTranslator.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
similarity index 56%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ExceptionTranslator.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
index 3b90bf5e13..7eda84d01b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ExceptionTranslator.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 import android.content.Context;
 import android.os.Handler;
@@ -10,19 +10,19 @@ import java.util.Map;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.ConnectionFailedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.ConnectionLostException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.DisconnectedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.SocketCreationFailedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.TimeoutException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.MaximumNumberOfBolusTypeAlreadyRunningException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoActiveTBRToChangeException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoSuchBolusToCancelException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.PumpAlreadyInThatStateException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.PumpStoppedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.RunModeNotAllowedException;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.satl_errors.SatlPairingRejectedException;
+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;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.SocketCreationFailedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.TimeoutException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.MaximumNumberOfBolusTypeAlreadyRunningException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToChangeException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoSuchBolusToCancelException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.PumpAlreadyInThatStateException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.PumpStoppedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.RunModeNotAllowedException;
+import info.nightscout.androidaps.plugins.pump.insight.exceptions.satl_errors.SatlPairingRejectedException;
 
 public class ExceptionTranslator {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/IDStorage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/IDStorage.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/IDStorage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/IDStorage.java
index da463845a8..05d3290eb2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/IDStorage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/IDStorage.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/InputStreamReader.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/InputStreamReader.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/InputStreamReader.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/InputStreamReader.java
index d357fdeccb..7641aba369 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/InputStreamReader.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/InputStreamReader.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/Nonce.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/Nonce.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/Nonce.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/Nonce.java
index 332de4ec05..60dddc60bf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/Nonce.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/Nonce.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 import java.math.BigInteger;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/OutputStreamWriter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/OutputStreamWriter.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/OutputStreamWriter.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/OutputStreamWriter.java
index 9f84ad067a..fa03cf7824 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/OutputStreamWriter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/OutputStreamWriter.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/PairingDataStorage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/PairingDataStorage.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/PairingDataStorage.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/PairingDataStorage.java
index 83cec09d09..57234698ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/PairingDataStorage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/PairingDataStorage.java
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
 import org.spongycastle.util.encoders.Hex;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.FirmwareVersions;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.SystemIdentification;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.FirmwareVersions;
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.SystemIdentification;
 
 public class PairingDataStorage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ParameterBlockUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ParameterBlockUtil.java
similarity index 56%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ParameterBlockUtil.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ParameterBlockUtil.java
index 44936f5c10..4cd75f26e7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/ParameterBlockUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ParameterBlockUtil.java
@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils;
+package info.nightscout.androidaps.plugins.pump.insight.utils;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.ReadParameterBlockMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.Service;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.configuration.WriteConfigurationBlockMessage;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.app_layer.parameter_blocks.ParameterBlock;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.connection_service.InsightConnectionService;
-import sugar.free.sightparser.applayer.descriptors.configuration_blocks.ConfigurationBlock;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.ReadParameterBlockMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.Service;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.WriteConfigurationBlockMessage;
+import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.ParameterBlock;
+import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
 
 public class ParameterBlockUtil {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/CRC.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/CRC.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/CRC.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/CRC.java
index e276cfbc04..16fe253c1d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/CRC.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/CRC.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto;
+package info.nightscout.androidaps.plugins.pump.insight.utils.crypto;
 
 /*
  * Based on: http://introcs.cs.princeton.edu/java/61data/CRC16.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/Cryptograph.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/Cryptograph.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/Cryptograph.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/Cryptograph.java
index 2a4405a2c3..bf34832b56 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/Cryptograph.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/Cryptograph.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto;
+package info.nightscout.androidaps.plugins.pump.insight.utils.crypto;
 
 import org.spongycastle.crypto.AsymmetricCipherKeyPair;
 import org.spongycastle.crypto.Digest;
@@ -21,7 +21,7 @@ import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
 import java.math.BigInteger;
 import java.security.SecureRandom;
 
-import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ByteBuf;
+import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
 
 public class Cryptograph {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/DerivedKeys.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/DerivedKeys.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/DerivedKeys.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/DerivedKeys.java
index 57be969d94..0e35ceeb31 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/DerivedKeys.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/DerivedKeys.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto;
+package info.nightscout.androidaps.plugins.pump.insight.utils.crypto;
 
 public class DerivedKeys {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/KeyPair.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/KeyPair.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/KeyPair.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/KeyPair.java
index ad993fac88..44025fcccc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/KeyPair.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/KeyPair.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto;
+package info.nightscout.androidaps.plugins.pump.insight.utils.crypto;
 
 import org.spongycastle.crypto.params.RSAKeyParameters;
 import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/VerificationString.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/VerificationString.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/VerificationString.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/VerificationString.java
index 7ba8024930..c40e96910f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/utils/crypto/VerificationString.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/crypto/VerificationString.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpInsightLocal.utils.crypto;
+package info.nightscout.androidaps.plugins.pump.insight.utils.crypto;
 
 class VerificationString {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpMDI/MDIPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpMDI/MDIPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
index d07c7fc019..ad870db9eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpMDI/MDIPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpMDI;
+package info.nightscout.androidaps.plugins.pump.mdi;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 /**
  * Created by mike on 05.08.2016.
@@ -137,10 +137,14 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
     }
 
     @Override
-    public double getReservoirLevel() { return -1; }
+    public double getReservoirLevel() {
+        return -1;
+    }
 
     @Override
-    public int getBatteryLevel() { return -1; }
+    public int getBatteryLevel() {
+        return -1;
+    }
 
     @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.java
index ef4c85e0a7..6703c08581 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpVirtual;
+package info.nightscout.androidaps.plugins.pump.virtual;
 
 
 import android.app.Activity;
@@ -20,10 +20,10 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.androidaps.plugins.PumpVirtual.events.EventVirtualPumpUpdateGui;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.virtual.events.EventVirtualPumpUpdateGui;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 public class VirtualPumpFragment extends SubscriberFragment {
     private static Logger log = LoggerFactory.getLogger(VirtualPumpFragment.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java
index 4fb7bb6f9d..7c9e8a978e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpVirtual;
+package info.nightscout.androidaps.plugins.pump.virtual;
 
 import android.os.SystemClock;
 
@@ -31,11 +31,11 @@ import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.androidaps.plugins.PumpVirtual.events.EventVirtualPumpUpdateGui;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.virtual.events.EventVirtualPumpUpdateGui;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/events/EventVirtualPumpUpdateGui.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/events/EventVirtualPumpUpdateGui.java
similarity index 72%
rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/events/EventVirtualPumpUpdateGui.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/events/EventVirtualPumpUpdateGui.java
index e035ea3aba..795134997a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/events/EventVirtualPumpUpdateGui.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/events/EventVirtualPumpUpdateGui.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpVirtual.events;
+package info.nightscout.androidaps.plugins.pump.virtual.events;
 
 import info.nightscout.androidaps.events.EventUpdateGui;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
index 7c95498db4..61de803268 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.queue;
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
-import android.content.ContextWrapper;
 import android.os.PowerManager;
 import android.os.SystemClock;
 
@@ -18,7 +17,7 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 09.11.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java
index c239502187..6452596406 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.DecimalFormatter;
 
 /**
  * Created by mike on 09.11.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.java
index 0e67758b07..8f29459292 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandInsightSetTBROverNotification.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.queue.commands;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
 import info.nightscout.androidaps.queue.Callback;
 
 public class CommandInsightSetTBROverNotification extends Command {
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java
index 7e5bded5ee..8370ab9860 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java
@@ -8,8 +8,8 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.LocalAlertUtils;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.LocalAlertUtils;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 09.11.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java
index 1bd958866e..4009a6bc7f 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java
@@ -9,9 +9,9 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 09.11.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.java
index b6f29014d4..65ced1f171 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.java
@@ -1,14 +1,9 @@
 package info.nightscout.androidaps.queue.commands;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
 import info.nightscout.androidaps.queue.Callback;
 
 public class CommandStartPump extends Command {
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.java
index 35bf48f3a4..a09e9333b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStopPump.java
@@ -1,13 +1,9 @@
 package info.nightscout.androidaps.queue.commands;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
 import info.nightscout.androidaps.queue.Callback;
 
 public class CommandStopPump extends Command {
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
index cc36f21a59..8eabeae9e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
@@ -21,10 +21,10 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.LocalAlertUtils;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.LocalAlertUtils;
+import info.nightscout.androidaps.utils.T;
 
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/services/DataService.java b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
index d33652dd60..b18d2b931c 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@@ -23,7 +23,7 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRNSHistorySync;
+import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRNSHistorySync;
 import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorPlugin;
 import info.nightscout.androidaps.plugins.Source.SourceDexcomG5Plugin;
 import info.nightscout.androidaps.plugins.Source.SourceDexcomG6Plugin;
@@ -36,8 +36,8 @@ import info.nightscout.androidaps.plugins.Source.SourceTomatoPlugin;
 import info.nightscout.androidaps.plugins.Source.SourceXdripPlugin;
 import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.logging.BundleLogger;
-import info.nightscout.utils.JsonHelper;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.JsonHelper;
+import info.nightscout.androidaps.utils.SP;
 
 
 public class DataService extends IntentService {
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
index c1421d7f0c..c67688b1d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
@@ -50,10 +50,10 @@ import info.nightscout.androidaps.setupwizard.elements.SWPlugin;
 import info.nightscout.androidaps.setupwizard.elements.SWRadioButton;
 import info.nightscout.androidaps.setupwizard.events.EventSWLabel;
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
-import info.nightscout.utils.AndroidPermission;
-import info.nightscout.utils.LocaleHelper;
-import info.nightscout.utils.PasswordProtection;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.AndroidPermission;
+import info.nightscout.androidaps.utils.LocaleHelper;
+import info.nightscout.androidaps.utils.PasswordProtection;
+import info.nightscout.androidaps.utils.SP;
 
 public class SWDefinition {
     private static Logger log = LoggerFactory.getLogger(SWDefinition.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
index 5102e36ac6..84264c6ff4 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
@@ -28,10 +28,10 @@ import info.nightscout.androidaps.plugins.ConstraintsObjectives.events.EventObje
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientStatus;
 import info.nightscout.androidaps.setupwizard.elements.SWItem;
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
-import info.nightscout.utils.AndroidPermission;
-import info.nightscout.utils.LocaleHelper;
-import info.nightscout.utils.OKDialog;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.AndroidPermission;
+import info.nightscout.androidaps.utils.LocaleHelper;
+import info.nightscout.androidaps.utils.OKDialog;
+import info.nightscout.androidaps.utils.SP;
 
 public class SetupWizardActivity extends AppCompatActivity {
     //logging
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
index ed96b37944..d8194cbfc0 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 5/9/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
index 1f32e6622d..50e851ed6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
@@ -5,7 +5,6 @@ import android.graphics.Typeface;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -14,7 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.setupwizard.SWTextValidator;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 
 public class SWEditString extends SWItem {
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
index 254723e4e1..7e6ead7d72 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
@@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.setupwizard.events.EventSWLabel;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class SWEditUrl extends SWItem {
     private static Logger log = LoggerFactory.getLogger(SWEditUrl.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
index 0cad26c553..4e8113c73c 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class SWItem {
     private static Logger log = LoggerFactory.getLogger(SWItem.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
index cf7dbd55fe..67ef9c19ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
@@ -12,7 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class SWRadioButton extends SWItem {
     private static Logger log = LoggerFactory.getLogger(SWRadioButton.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
index 88f7d48d32..53b3700c72 100644
--- a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
+++ b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 30.05.2016.
diff --git a/app/src/main/java/info/nightscout/utils/AndroidPermission.java b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
similarity index 99%
rename from app/src/main/java/info/nightscout/utils/AndroidPermission.java
rename to app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
index c2a572ff4f..b6536ace69 100644
--- a/app/src/main/java/info/nightscout/utils/AndroidPermission.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.Manifest;
 import android.app.Activity;
diff --git a/app/src/main/java/info/nightscout/utils/BatteryLevel.java b/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
similarity index 96%
rename from app/src/main/java/info/nightscout/utils/BatteryLevel.java
rename to app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
index ea55dd9e69..bc000a95b9 100644
--- a/app/src/main/java/info/nightscout/utils/BatteryLevel.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.content.Intent;
 import android.content.IntentFilter;
diff --git a/app/src/main/java/info/nightscout/utils/BolusWizard.java b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.java
similarity index 99%
rename from app/src/main/java/info/nightscout/utils/BolusWizard.java
rename to app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.java
index d20827ce9e..a895926dee 100644
--- a/app/src/main/java/info/nightscout/utils/BolusWizard.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/utils/CRC.java b/app/src/main/java/info/nightscout/androidaps/utils/CRC.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/CRC.java
rename to app/src/main/java/info/nightscout/androidaps/utils/CRC.java
index bc59d7e2ae..4c7086de85 100644
--- a/app/src/main/java/info/nightscout/utils/CRC.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/CRC.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 public final class CRC {
 
diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/DateUtil.java
rename to app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index c5d5eed51c..943de83cef 100644
--- a/app/src/main/java/info/nightscout/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -1,7 +1,6 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.support.v4.util.LongSparseArray;
-import android.text.format.DateUtils;
 
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
diff --git a/app/src/main/java/info/nightscout/utils/DecimalFormatter.java b/app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
similarity index 97%
rename from app/src/main/java/info/nightscout/utils/DecimalFormatter.java
rename to app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
index 620e636843..8c8462b4d7 100644
--- a/app/src/main/java/info/nightscout/utils/DecimalFormatter.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import java.text.DecimalFormat;
 
diff --git a/app/src/main/java/info/nightscout/utils/DefaultValueHelper.java b/app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/DefaultValueHelper.java
rename to app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.java
index ba1aba90b8..40448d2680 100644
--- a/app/src/main/java/info/nightscout/utils/DefaultValueHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
diff --git a/app/src/main/java/info/nightscout/utils/FabricPrivacy.java b/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.java
similarity index 99%
rename from app/src/main/java/info/nightscout/utils/FabricPrivacy.java
rename to app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.java
index 572cd4dab4..0a0d559c55 100644
--- a/app/src/main/java/info/nightscout/utils/FabricPrivacy.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.answers.Answers;
diff --git a/app/src/main/java/info/nightscout/utils/HardLimits.java b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/HardLimits.java
rename to app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java
index 1a36561b62..b140785276 100644
--- a/app/src/main/java/info/nightscout/utils/HardLimits.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/utils/JSONFormatter.java b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/JSONFormatter.java
rename to app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
index 499ba01652..159e90fda7 100644
--- a/app/src/main/java/info/nightscout/utils/JSONFormatter.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.text.Html;
 import android.text.Spanned;
diff --git a/app/src/main/java/info/nightscout/utils/JsonHelper.java b/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/JsonHelper.java
rename to app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.java
index e082ed99f7..8f7d9611b1 100644
--- a/app/src/main/java/info/nightscout/utils/JsonHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.support.annotation.Nullable;
 
diff --git a/app/src/main/java/info/nightscout/utils/LocalAlertUtils.java b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.java
similarity index 99%
rename from app/src/main/java/info/nightscout/utils/LocalAlertUtils.java
rename to app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.java
index 89c422ec53..d536082fac 100644
--- a/app/src/main/java/info/nightscout/utils/LocalAlertUtils.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/utils/LocaleHelper.java b/app/src/main/java/info/nightscout/androidaps/utils/LocaleHelper.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/LocaleHelper.java
rename to app/src/main/java/info/nightscout/androidaps/utils/LocaleHelper.java
index c8faa83b9d..bf0b2796ee 100644
--- a/app/src/main/java/info/nightscout/utils/LocaleHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocaleHelper.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/info/nightscout/utils/MidnightTime.java b/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
similarity index 96%
rename from app/src/main/java/info/nightscout/utils/MidnightTime.java
rename to app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
index 523fe13826..d3d75feda3 100644
--- a/app/src/main/java/info/nightscout/utils/MidnightTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/MidnightTime.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.util.LongSparseArray;
 
diff --git a/app/src/main/java/info/nightscout/utils/NumberPicker.java b/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
similarity index 99%
rename from app/src/main/java/info/nightscout/utils/NumberPicker.java
rename to app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
index 102abedc7d..71c16442dc 100644
--- a/app/src/main/java/info/nightscout/utils/NumberPicker.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/app/src/main/java/info/nightscout/utils/OKDialog.java b/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/OKDialog.java
rename to app/src/main/java/info/nightscout/androidaps/utils/OKDialog.java
index 0e9d95a22c..00b3c29692 100644
--- a/app/src/main/java/info/nightscout/utils/OKDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/info/nightscout/utils/PasswordProtection.java b/app/src/main/java/info/nightscout/androidaps/utils/PasswordProtection.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/PasswordProtection.java
rename to app/src/main/java/info/nightscout/androidaps/utils/PasswordProtection.java
index 2a15dc7311..230be97e22 100644
--- a/app/src/main/java/info/nightscout/utils/PasswordProtection.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/PasswordProtection.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/app/src/main/java/info/nightscout/utils/PercentageSplitter.java b/app/src/main/java/info/nightscout/androidaps/utils/PercentageSplitter.java
similarity index 95%
rename from app/src/main/java/info/nightscout/utils/PercentageSplitter.java
rename to app/src/main/java/info/nightscout/androidaps/utils/PercentageSplitter.java
index d590426b28..b3f8156cfe 100644
--- a/app/src/main/java/info/nightscout/utils/PercentageSplitter.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/PercentageSplitter.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/app/src/main/java/info/nightscout/utils/Profiler.java b/app/src/main/java/info/nightscout/androidaps/utils/Profiler.java
similarity index 88%
rename from app/src/main/java/info/nightscout/utils/Profiler.java
rename to app/src/main/java/info/nightscout/androidaps/utils/Profiler.java
index 140adc6366..05eed9e97d 100644
--- a/app/src/main/java/info/nightscout/utils/Profiler.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/Profiler.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.slf4j.Logger;
 
diff --git a/app/src/main/java/info/nightscout/utils/Round.java b/app/src/main/java/info/nightscout/androidaps/utils/Round.java
similarity index 92%
rename from app/src/main/java/info/nightscout/utils/Round.java
rename to app/src/main/java/info/nightscout/androidaps/utils/Round.java
index 26a4d5abce..ba7f7e3f86 100644
--- a/app/src/main/java/info/nightscout/utils/Round.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/Round.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 /**
  * Created by mike on 20.06.2016.
diff --git a/app/src/main/java/info/nightscout/utils/SP.java b/app/src/main/java/info/nightscout/androidaps/utils/SP.java
similarity index 99%
rename from app/src/main/java/info/nightscout/utils/SP.java
rename to app/src/main/java/info/nightscout/androidaps/utils/SP.java
index f3e91e0458..3b3a8e6907 100644
--- a/app/src/main/java/info/nightscout/utils/SP.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SP.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
diff --git a/app/src/main/java/info/nightscout/utils/SafeParse.java b/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
similarity index 97%
rename from app/src/main/java/info/nightscout/utils/SafeParse.java
rename to app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
index 7d6d890b0e..5ee2a66177 100644
--- a/app/src/main/java/info/nightscout/utils/SafeParse.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/info/nightscout/utils/SetWarnColor.java b/app/src/main/java/info/nightscout/androidaps/utils/SetWarnColor.java
similarity index 95%
rename from app/src/main/java/info/nightscout/utils/SetWarnColor.java
rename to app/src/main/java/info/nightscout/androidaps/utils/SetWarnColor.java
index a3a23695c7..e22197d83f 100644
--- a/app/src/main/java/info/nightscout/utils/SetWarnColor.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SetWarnColor.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.graphics.Color;
 import android.widget.TextView;
diff --git a/app/src/main/java/info/nightscout/utils/SingleClickButton.java b/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
similarity index 97%
rename from app/src/main/java/info/nightscout/utils/SingleClickButton.java
rename to app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
index ef0d4d3aec..eef4ca57fe 100644
--- a/app/src/main/java/info/nightscout/utils/SingleClickButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/info/nightscout/utils/SpinnerHelper.java b/app/src/main/java/info/nightscout/androidaps/utils/SpinnerHelper.java
similarity index 99%
rename from app/src/main/java/info/nightscout/utils/SpinnerHelper.java
rename to app/src/main/java/info/nightscout/androidaps/utils/SpinnerHelper.java
index 84315825f5..a45fcd5a57 100644
--- a/app/src/main/java/info/nightscout/utils/SpinnerHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SpinnerHelper.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/app/src/main/java/info/nightscout/utils/StringUtils.java b/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
similarity index 92%
rename from app/src/main/java/info/nightscout/utils/StringUtils.java
rename to app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
index de16f7964e..cad2b76291 100644
--- a/app/src/main/java/info/nightscout/utils/StringUtils.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 /**
  * class contains useful String functions
diff --git a/app/src/main/java/info/nightscout/utils/T.java b/app/src/main/java/info/nightscout/androidaps/utils/T.java
similarity index 96%
rename from app/src/main/java/info/nightscout/utils/T.java
rename to app/src/main/java/info/nightscout/androidaps/utils/T.java
index 99f4e573c3..2a9bcfc42c 100644
--- a/app/src/main/java/info/nightscout/utils/T.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/T.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 /**
  * Created by mike on 26.03.2018.
diff --git a/app/src/main/java/info/nightscout/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
similarity index 99%
rename from app/src/main/java/info/nightscout/utils/TimeListEdit.java
rename to app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
index ec03734b18..d120e102d1 100644
--- a/app/src/main/java/info/nightscout/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/app/src/main/java/info/nightscout/utils/ToastUtils.java b/app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
similarity index 97%
rename from app/src/main/java/info/nightscout/utils/ToastUtils.java
rename to app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
index 4ad07a4885..383c7722e3 100644
--- a/app/src/main/java/info/nightscout/utils/ToastUtils.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ToastUtils.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.content.Context;
 import android.media.MediaPlayer;
diff --git a/app/src/main/java/info/nightscout/utils/Translator.java b/app/src/main/java/info/nightscout/androidaps/utils/Translator.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/Translator.java
rename to app/src/main/java/info/nightscout/androidaps/utils/Translator.java
index 98fdd32779..ee83f856e4 100644
--- a/app/src/main/java/info/nightscout/utils/Translator.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/Translator.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
diff --git a/app/src/main/java/info/nightscout/utils/VersionChecker.java b/app/src/main/java/info/nightscout/androidaps/utils/VersionChecker.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/VersionChecker.java
rename to app/src/main/java/info/nightscout/androidaps/utils/VersionChecker.java
index 00bfc50395..f86939a08a 100644
--- a/app/src/main/java/info/nightscout/utils/VersionChecker.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/VersionChecker.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
diff --git a/app/src/main/java/info/nightscout/utils/XdripCalibrations.java b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
similarity index 98%
rename from app/src/main/java/info/nightscout/utils/XdripCalibrations.java
rename to app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
index 18c066b1da..c25ff26d99 100644
--- a/app/src/main/java/info/nightscout/utils/XdripCalibrations.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import android.content.Context;
 import android.content.DialogInterface;
diff --git a/app/src/main/res/layout/actions_fill_dialog.xml b/app/src/main/res/layout/actions_fill_dialog.xml
index 21fb5d3c66..27fdb02ee7 100644
--- a/app/src/main/res/layout/actions_fill_dialog.xml
+++ b/app/src/main/res/layout/actions_fill_dialog.xml
@@ -75,7 +75,7 @@
                 android:textStyle="bold"
                 android:text="@string/overview_insulin_label" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/fill_insulinamount"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 3b322b26dd..baebdca064 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -13,7 +13,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_profileswitch"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -26,7 +26,7 @@
                 android:drawableTop="@drawable/icon_actions_profileswitch"
                 android:text="@string/careportal_profileswitch" />
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_temptarget"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -39,7 +39,7 @@
                 android:drawableTop="@drawable/icon_actions_temptarget"
                 android:text="@string/careportal_temporarytarget" />
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_settempbasal"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -52,7 +52,7 @@
                 android:drawableTop="@drawable/icon_actions_starttempbasal"
                 android:text="@string/overview_tempbasal_button" />
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_canceltempbasal"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -65,7 +65,7 @@
                 android:drawableTop="@drawable/icon_cancelbasal"
                 android:text="Cancel temp basal" />
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_extendedbolus"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -78,7 +78,7 @@
                 android:drawableTop="@drawable/icon_actions_startextbolus"
                 android:text="@string/overview_extendedbolus_button" />
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_extendedbolus_cancel"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -91,7 +91,7 @@
                 android:drawableTop="@drawable/icon_actions_cancelextbolus"
                 android:text="@string/overview_extendedbolus_cancel_button" />
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_fill"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -104,7 +104,7 @@
                 android:drawableTop="@drawable/icon_cp_pump_canula"
                 android:text="@string/primefill" />
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_historybrowser"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -117,7 +117,7 @@
                 android:drawableTop="@drawable/icon_danarhistory"
                 android:text="@string/nav_historybrowser" />
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_tddstats"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index d2db9ef6a7..95c8d357d5 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -52,7 +52,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_bgcheck"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0px"
@@ -67,7 +67,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_exercise"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -81,7 +81,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_temporarytarget"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -112,7 +112,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_snackbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -126,7 +126,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_mealbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -140,7 +140,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_correctionbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -154,7 +154,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_carbscorrection"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -168,7 +168,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_combobolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -182,7 +182,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_tempbasalstart"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -196,7 +196,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_tempbasalend"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -226,7 +226,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_cgmsensorstart"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -241,7 +241,7 @@
                         app:layout_row="1" />
 
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_cgmsensorinsert"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -256,7 +256,7 @@
                         app:layout_row="1" />
 
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_openapsoffline"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -271,7 +271,7 @@
                         app:layout_row="1" />
 
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_announcement"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -285,7 +285,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="4" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_question"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -299,7 +299,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="4" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_note"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -329,7 +329,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_pumpsitechange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -343,7 +343,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_insulincartridgechange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -357,7 +357,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_profileswitch"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -372,7 +372,7 @@
                         app:layout_row="0" />
 
 
-                    <info.nightscout.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.SingleClickButton
                         android:id="@+id/careportal_pumpbatterychange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index 0a2263f3b6..9131bbe704 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -42,7 +42,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_bginput"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -114,7 +114,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_carbsinput"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -147,7 +147,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_insulininput"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -180,7 +180,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_splitinput"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -241,7 +241,7 @@
                         android:layout_gravity="center_vertical"
                         android:textStyle="bold" />
 
-                    <info.nightscout.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.NumberPicker
                         android:id="@+id/careportal_newnstreatment_temptarget"
                         android:layout_width="130dp"
                         android:layout_height="40dp"
@@ -267,7 +267,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_durationinput"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -300,7 +300,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_percentinput"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -333,7 +333,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_absoluteinput"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -366,7 +366,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_carbtimeinput"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -459,7 +459,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_percentage"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -492,7 +492,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/careportal_newnstreatment_timeshift"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/combopump_fragment.xml b/app/src/main/res/layout/combopump_fragment.xml
index 45e6993b99..87650081a5 100644
--- a/app/src/main/res/layout/combopump_fragment.xml
+++ b/app/src/main/res/layout/combopump_fragment.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="5dp"
-    tools:context=".plugins.PumpCombo.ComboFragment">
+    tools:context=".plugins.pump.combo.ComboFragment">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -489,7 +489,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <info.nightscout.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/combo_refresh_button"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/danar_fragment.xml b/app/src/main/res/layout/danar_fragment.xml
index 8951344820..f1ea8f7cd4 100644
--- a/app/src/main/res/layout/danar_fragment.xml
+++ b/app/src/main/res/layout/danar_fragment.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="5dp"
-    tools:context="info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment">
+    tools:context=".plugins.pump.danaR.DanaRFragment">
 
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/danar_historyactivity.xml b/app/src/main/res/layout/danar_historyactivity.xml
index 805cba6e1c..8c7f8a8e6e 100644
--- a/app/src/main/res/layout/danar_historyactivity.xml
+++ b/app/src/main/res/layout/danar_historyactivity.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".plugins.PumpDanaR.activities.DanaRHistoryActivity">
+    tools:context=".plugins.pump.danaR.activities.DanaRHistoryActivity">
 
 
     <LinearLayout
diff --git a/app/src/main/res/layout/danar_statsactivity.xml b/app/src/main/res/layout/danar_statsactivity.xml
index 11fc622be3..be28106f4f 100644
--- a/app/src/main/res/layout/danar_statsactivity.xml
+++ b/app/src/main/res/layout/danar_statsactivity.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".plugins.PumpDanaR.activities.DanaRHistoryActivity">
+    tools:context=".plugins.pump.danaR.activities.DanaRHistoryActivity">
 
     <LinearLayout
         android:id="@+id/danar_statstop"
diff --git a/app/src/main/res/layout/danar_user_options.xml b/app/src/main/res/layout/danar_user_options.xml
index 6fa8b93b26..7ea4116327 100644
--- a/app/src/main/res/layout/danar_user_options.xml
+++ b/app/src/main/res/layout/danar_user_options.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    tools:context="info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRUserOptionsActivity">
+    tools:context=".plugins.pump.danaR.activities.DanaRUserOptionsActivity">
 
 
     <RelativeLayout
@@ -226,7 +226,7 @@
                         android:text="@string/danar_screentimeout"
                         android:textSize="14sp" />
 
-                    <info.nightscout.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.NumberPicker
                         android:id="@+id/danar_screentimeout"
                         android:layout_width="wrap_content"
                         android:layout_height="40dp"
@@ -266,7 +266,7 @@
                         android:text="@string/danar_backlight"
                         android:textSize="14sp" />
 
-                    <info.nightscout.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.NumberPicker
                         android:id="@+id/danar_backlight"
                         android:layout_width="wrap_content"
                         android:layout_height="40dp"
@@ -340,7 +340,7 @@
                         android:textSize="14sp" />
 
 
-                    <info.nightscout.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.NumberPicker
                         android:id="@+id/danar_shutdown"
                         android:layout_width="wrap_content"
                         android:layout_height="40dp"
@@ -380,7 +380,7 @@
                         android:text="@string/danar_lowreservoir"
                         android:textSize="14sp" />
 
-                    <info.nightscout.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.NumberPicker
                         android:id="@+id/danar_lowreservoir"
                         android:layout_width="wrap_content"
                         android:layout_height="40dp"
diff --git a/app/src/main/res/layout/danars_blescanner_activity.xml b/app/src/main/res/layout/danars_blescanner_activity.xml
index 3a3eb78f5c..e6173a26c3 100644
--- a/app/src/main/res/layout/danars_blescanner_activity.xml
+++ b/app/src/main/res/layout/danars_blescanner_activity.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.PumpDanaRS.activities.BLEScanActivity">
+    tools:context=".plugins.pump.danaRS.activities.BLEScanActivity">
 
     <ListView
         android:id="@+id/danars_blescanner_listview"
diff --git a/app/src/main/res/layout/danars_pairingprogressdialog.xml b/app/src/main/res/layout/danars_pairingprogressdialog.xml
index d887977875..a94aba0b67 100644
--- a/app/src/main/res/layout/danars_pairingprogressdialog.xml
+++ b/app/src/main/res/layout/danars_pairingprogressdialog.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.PumpDanaRS.activities.PairingProgressDialog" >
+    tools:context=".plugins.pump.danaRS.activities.PairingProgressDialog" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index 02aec264f8..42c1d19a46 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -78,7 +78,7 @@
                     android:minWidth="80dp"
                     android:visibility="invisible"/>
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/localprofile_dia"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
diff --git a/app/src/main/res/layout/overview_calibration_dialog.xml b/app/src/main/res/layout/overview_calibration_dialog.xml
index 85f8e82317..379ab0e767 100644
--- a/app/src/main/res/layout/overview_calibration_dialog.xml
+++ b/app/src/main/res/layout/overview_calibration_dialog.xml
@@ -38,7 +38,7 @@
                 android:layout_marginBottom="10dp"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/overview_calibration_bg"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 18967ec6e0..69871bf9d4 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -398,7 +398,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_accepttempbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="match_parent"
@@ -416,7 +416,7 @@
                 android:orientation="horizontal"
                 android:paddingRight="5dp">
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -431,7 +431,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_insulinbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -446,7 +446,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_carbsbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -461,7 +461,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -476,7 +476,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_calibrationbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -491,7 +491,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_cgmbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -506,7 +506,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
diff --git a/app/src/main/res/layout/overview_fragment_nsclient.xml b/app/src/main/res/layout/overview_fragment_nsclient.xml
index 66a872ca9a..28d2fbf327 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient.xml
@@ -469,7 +469,7 @@
                 android:orientation="horizontal"
                 android:paddingRight="5dp">
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -483,7 +483,7 @@
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_insulinbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -498,7 +498,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_carbsbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -512,7 +512,7 @@
                     android:textColor="@color/colorCarbsButton"
                     android:textSize="10sp" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -527,7 +527,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index 56808ccd28..c7959fca5d 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -543,7 +543,7 @@
                 android:orientation="horizontal"
                 android:paddingRight="5dp">
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -557,7 +557,7 @@
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_insulinbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -572,7 +572,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_carbsbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -587,7 +587,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -602,7 +602,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
diff --git a/app/src/main/res/layout/overview_fragment_smallheight.xml b/app/src/main/res/layout/overview_fragment_smallheight.xml
index 9e7d1dcf42..1d67405d76 100644
--- a/app/src/main/res/layout/overview_fragment_smallheight.xml
+++ b/app/src/main/res/layout/overview_fragment_smallheight.xml
@@ -390,7 +390,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_accepttempbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="fill_parent"
@@ -408,7 +408,7 @@
                 android:paddingRight="5dp"
                 android:orientation="horizontal">
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -422,7 +422,7 @@
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_insulinbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -437,7 +437,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_carbsbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -451,7 +451,7 @@
                     android:textColor="@color/colorCarbsButton"
                     android:textSize="10sp" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -466,7 +466,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_calibrationbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -481,7 +481,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_cgmbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -495,7 +495,7 @@
                     android:textColor="@color/colorCalibrationButton"
                     android:textSize="10sp"/>
 
-                <info.nightscout.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
diff --git a/app/src/main/res/layout/overview_newcarbs_dialog.xml b/app/src/main/res/layout/overview_newcarbs_dialog.xml
index 6f55370b5e..c6fa680ed6 100644
--- a/app/src/main/res/layout/overview_newcarbs_dialog.xml
+++ b/app/src/main/res/layout/overview_newcarbs_dialog.xml
@@ -90,7 +90,7 @@
                     android:textStyle="bold"
                     android:text="@string/time_offset" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/newcarbs_time"
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
@@ -119,7 +119,7 @@
                     android:textStyle="bold"
                     android:text="@string/duration"/>
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/new_carbs_duration"
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
@@ -147,7 +147,7 @@
                     android:textStyle="bold"
                     android:text="@string/overview_carbs_label" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/newcarb_carbsamount"
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
diff --git a/app/src/main/res/layout/overview_newextendedbolus_dialog.xml b/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
index 686914ad69..6ae72d9a4e 100644
--- a/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
+++ b/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
@@ -32,7 +32,7 @@
             android:textAppearance="@android:style/TextAppearance.Material.Small"
             android:textStyle="bold" />
 
-        <info.nightscout.utils.NumberPicker
+        <info.nightscout.androidaps.utils.NumberPicker
             android:id="@+id/overview_newextendedbolus_insulin"
             android:layout_width="130dp"
             android:layout_height="40dp" />
@@ -65,7 +65,7 @@
             android:textAppearance="@android:style/TextAppearance.Material.Small"
             android:textStyle="bold" />
 
-        <info.nightscout.utils.NumberPicker
+        <info.nightscout.androidaps.utils.NumberPicker
             android:id="@+id/overview_newextendedbolus_duration"
             android:layout_width="130dp"
             android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/overview_newinsulin_dialog.xml b/app/src/main/res/layout/overview_newinsulin_dialog.xml
index e4647fac38..c4d94e2e35 100644
--- a/app/src/main/res/layout/overview_newinsulin_dialog.xml
+++ b/app/src/main/res/layout/overview_newinsulin_dialog.xml
@@ -81,7 +81,7 @@
                     android:textStyle="bold"
                     android:text="@string/time" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/newinsulin_time"
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
@@ -109,7 +109,7 @@
                     android:textStyle="bold"
                     android:text="@string/overview_insulin_label" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/newinsulin_amount"
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
diff --git a/app/src/main/res/layout/overview_newtempbasal_dialog.xml b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
index e4cf51b987..51cf3147fc 100644
--- a/app/src/main/res/layout/overview_newtempbasal_dialog.xml
+++ b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
@@ -83,7 +83,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/overview_newtempbasal_basalpercentinput"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
@@ -111,7 +111,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.utils.NumberPicker
+                <info.nightscout.androidaps.utils.NumberPicker
                     android:id="@+id/overview_newtempbasal_basalabsoluteinput"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
@@ -131,7 +131,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/overview_newtempbasal_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
diff --git a/app/src/main/res/layout/overview_newtreatment_dialog.xml b/app/src/main/res/layout/overview_newtreatment_dialog.xml
index 348c182a7a..f84e0423b8 100644
--- a/app/src/main/res/layout/overview_newtreatment_dialog.xml
+++ b/app/src/main/res/layout/overview_newtreatment_dialog.xml
@@ -41,7 +41,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/treatments_newtreatment_insulinamount"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
@@ -59,7 +59,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/treatments_newtreatment_carbsamount"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
diff --git a/app/src/main/res/layout/overview_wizard_dialog.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
index 20fdef2ba4..7fc3c32f3a 100644
--- a/app/src/main/res/layout/overview_wizard_dialog.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -28,7 +28,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/treatments_wizard_bginput"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -61,7 +61,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/treatments_wizard_carbsinput"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
@@ -95,7 +95,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/treatments_wizard_correctioninput"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
@@ -129,7 +129,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.utils.NumberPicker
+            <info.nightscout.androidaps.utils.NumberPicker
                 android:id="@+id/treatments_wizard_carbtimeinput"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
diff --git a/app/src/main/res/layout/timelistedit_element.xml b/app/src/main/res/layout/timelistedit_element.xml
index 97fad65d38..c65fc0855b 100644
--- a/app/src/main/res/layout/timelistedit_element.xml
+++ b/app/src/main/res/layout/timelistedit_element.xml
@@ -20,13 +20,13 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <info.nightscout.utils.NumberPicker
+        <info.nightscout.androidaps.utils.NumberPicker
             android:id="@+id/timelistedit_edit1"
             android:layout_width="130dp"
             android:layout_height="40dp"
             android:layout_marginRight="5dp" />
 
-        <info.nightscout.utils.NumberPicker
+        <info.nightscout.androidaps.utils.NumberPicker
             android:id="@+id/timelistedit_edit2"
             android:layout_width="130dp"
             android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/virtualpump_fragment.xml b/app/src/main/res/layout/virtualpump_fragment.xml
index 0cc6e739ff..a01eb128fd 100644
--- a/app/src/main/res/layout/virtualpump_fragment.xml
+++ b/app/src/main/res/layout/virtualpump_fragment.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".plugins.PumpVirtual.VirtualPumpFragment">
+    tools:context=".plugins.pump.virtual.VirtualPumpFragment">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/xml/pref_danar.xml b/app/src/main/res/xml/pref_danar.xml
index d7b321bbaa..fcb099e7e3 100644
--- a/app/src/main/res/xml/pref_danar.xml
+++ b/app/src/main/res/xml/pref_danar.xml
@@ -4,7 +4,7 @@
     <PreferenceCategory
         android:title="@string/danar_pump_settings">
 
-        <info.nightscout.androidaps.plugins.PumpDanaR.BluetoothDevicePreference
+        <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/app/src/main/res/xml/pref_danarkorean.xml b/app/src/main/res/xml/pref_danarkorean.xml
index d902f23bfd..8f64fe1cbc 100644
--- a/app/src/main/res/xml/pref_danarkorean.xml
+++ b/app/src/main/res/xml/pref_danarkorean.xml
@@ -4,7 +4,7 @@
     <PreferenceCategory
         android:title="@string/danar_pump_settings">
 
-        <info.nightscout.androidaps.plugins.PumpDanaR.BluetoothDevicePreference
+        <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/app/src/main/res/xml/pref_danarv2.xml b/app/src/main/res/xml/pref_danarv2.xml
index a5c1254275..70a799b260 100644
--- a/app/src/main/res/xml/pref_danarv2.xml
+++ b/app/src/main/res/xml/pref_danarv2.xml
@@ -4,7 +4,7 @@
     <PreferenceCategory
         android:title="@string/danar_pump_settings">
 
-        <info.nightscout.androidaps.plugins.PumpDanaR.BluetoothDevicePreference
+        <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/app/src/test/java/info/AAPSMocker.java b/app/src/test/java/info/AAPSMocker.java
index 25484a80e5..c05501bc9a 100644
--- a/app/src/test/java/info/AAPSMocker.java
+++ b/app/src/test/java/info/AAPSMocker.java
@@ -24,13 +24,13 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentService;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
diff --git a/app/src/test/java/info/SPMocker.java b/app/src/test/java/info/SPMocker.java
index af6f0ba295..cfed7f6b11 100644
--- a/app/src/test/java/info/SPMocker.java
+++ b/app/src/test/java/info/SPMocker.java
@@ -6,7 +6,7 @@ import org.powermock.api.mockito.PowerMockito;
 
 import java.util.HashMap;
 
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 public class SPMocker {
 
diff --git a/app/src/test/java/info/nightscout/androidaps/data/GlucoseStatusTest.java b/app/src/test/java/info/nightscout/androidaps/data/GlucoseStatusTest.java
index 346475dc01..23c239edaf 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/GlucoseStatusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/GlucoseStatusTest.java
@@ -18,8 +18,8 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.T;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyLong;
diff --git a/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.java b/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.java
index 8ba16da693..b54b112516 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/IobTotalTest.java
@@ -1,13 +1,12 @@
 package info.nightscout.androidaps.data;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import info.nightscout.utils.DateUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 
 /**
  * Created by mike on 27.03.2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/data/NonOverapingIntervalsTest.java b/app/src/test/java/info/nightscout/androidaps/data/NonOverapingIntervalsTest.java
index 2b97615048..a1f2a95943 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/NonOverapingIntervalsTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/NonOverapingIntervalsTest.java
@@ -6,8 +6,8 @@ import org.junit.runner.RunWith;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 26.03.2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/data/OverapingIntervalsTest.java b/app/src/test/java/info/nightscout/androidaps/data/OverapingIntervalsTest.java
index 1dd5056547..80ad43999e 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/OverapingIntervalsTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/OverapingIntervalsTest.java
@@ -9,8 +9,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.db.TempTarget;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 26.03.2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.java b/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.java
index 9483cb95ef..5eb5aaef3c 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.java
@@ -16,8 +16,8 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.T;
 
 /**
  * Created by mike on 26.03.2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.java b/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.java
index 7e7ab7e530..275ab2752f 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.java
@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.data;
 
-import com.squareup.otto.Bus;
-
 import junit.framework.Assert;
 
 import org.json.JSONObject;
@@ -14,17 +12,15 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 import java.util.Calendar;
-import java.util.Locale;
 import java.util.TimeZone;
 
 import info.AAPSMocker;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
-import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.utils.FabricPrivacy;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
diff --git a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java
index 9a12a2a255..7bf5bbfe70 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.java
@@ -13,7 +13,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.SPMocker;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({SP.class, MainApp.class})
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java
index 2a742efc65..4b2d209661 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintTest.java
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 19.03.2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
index 231243a443..3545f28b98 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java
@@ -26,15 +26,15 @@ import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
-import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpInsightLocal.LocalInsightPlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
+import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Source.SourceGlimpPlugin;
-import info.nightscout.utils.FabricPrivacy;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.mockito.Mockito.when;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.java
index 054c44bb49..77a4741198 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/PumpDescritpionTest.java
@@ -3,12 +3,9 @@ package info.nightscout.androidaps.interfaces;
 import org.junit.Assert;
 import org.junit.Test;
 
-import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpCapability;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpTempBasalType;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpCapability;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpTempBasalType;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 
 /**
  * Created by andy on 5/13/18.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialogTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialogTest.java
index ba6eef5fbf..0e1e5b0bef 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialogTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialogTest.java
@@ -23,7 +23,7 @@ import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentService;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static info.nightscout.androidaps.plugins.Careportal.CareportalFragment.PROFILESWITCH;
 import static org.powermock.api.mockito.PowerMockito.doAnswer;
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPluginTest.java
index 268faa5ab7..1146293921 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPluginTest.java
@@ -5,14 +5,13 @@ import junit.framework.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.powermock.api.mockito.PowerMockito.mock;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPluginTest.java
index d3dbcb3402..acf09023cd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPluginTest.java
@@ -14,7 +14,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 23.03.2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPluginTest.java
index a60e3e149c..7249761f5d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPluginTest.java
@@ -19,9 +19,9 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Source.SourceGlimpPlugin;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.mockito.Mockito.when;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/IobCobCalculatorPlugin/IobCobCalculatorPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/IobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
index 576e8d3018..cf6bc9b2cc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/IobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/IobCobCalculatorPlugin/IobCobCalculatorPluginTest.java
@@ -18,9 +18,9 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.T;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.T;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, Context.class, L.class})
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/Loop/APSResultTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/Loop/APSResultTest.java
index c9e082ed43..febf3d4f33 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/Loop/APSResultTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/Loop/APSResultTest.java
@@ -18,11 +18,11 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.JsonHelper;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.JsonHelper;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.mockito.ArgumentMatchers.anyDouble;
 import static org.mockito.ArgumentMatchers.anyInt;
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/Loop/LoopPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/Loop/LoopPluginTest.java
index 0aa92342cf..9b3e848da2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/Loop/LoopPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/Loop/LoopPluginTest.java
@@ -16,8 +16,8 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.powermock.api.mockito.PowerMockito.when;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegateTest.java
index 5bb1ca9a44..a25bcded89 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegateTest.java
@@ -6,7 +6,6 @@ import com.squareup.otto.Bus;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -16,7 +15,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventChargingState;
 import info.nightscout.androidaps.events.EventNetworkChange;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.anyBoolean;
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/Sensitivity/AbstractSensitivityPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/Sensitivity/AbstractSensitivityPluginTest.java
index e6d6caaf56..6571616d5c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/Sensitivity/AbstractSensitivityPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/Sensitivity/AbstractSensitivityPluginTest.java
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.java
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPluginTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.java
index 8c8653074a..e55aad0fb7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpCombo;
+package info.nightscout.androidaps.plugins.pump.combo;
 
 import android.content.Context;
 
@@ -14,9 +14,9 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
+import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
 import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPluginTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.java
index 3963812c78..a208d29e6a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR;
+package info.nightscout.androidaps.plugins.pump.danaR;
 
 import android.content.Context;
 
@@ -17,8 +17,8 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 import static org.mockito.Mockito.when;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageHashTableTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableTest.java
similarity index 84%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageHashTableTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableTest.java
index b345a2b324..81d0e13688 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageHashTableTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,8 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageOriginalNamesTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.java
similarity index 79%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageOriginalNamesTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.java
index e7130e3984..c2d283952d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MessageOriginalNamesTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.java
@@ -1,15 +1,13 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusProgressTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusProgressTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.java
index 062c176c9b..5d088fc489 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusProgressTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_Bolus_Set_Extended_Bolus;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.java
similarity index 89%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.java
index 0cf157031d..c057804279 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,8 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartWithSpeedTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.java
similarity index 90%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartWithSpeedTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.java
index d720c46dc1..e3e2f75d69 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStartWithSpeedTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,8 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.java
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStopTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.java
index 611468ec80..1387ef3b79 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgBolusStopTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,7 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgCheckValueTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.java
similarity index 83%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgCheckValueTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.java
index 90af473591..1aa882794c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgCheckValueTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.java
@@ -1,18 +1,17 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgErrorTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.java
similarity index 90%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgErrorTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.java
index 4e0e9a34e6..a3de966708 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgErrorTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,8 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAlarmTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAlarmTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.java
index 5d03de4071..e1ee6bf38b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAlarmTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllDoneTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.java
similarity index 89%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllDoneTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.java
index b17a957b92..b50076f9cb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllDoneTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,8 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.java
similarity index 90%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.java
index fc35c6cc1a..15e93a5d86 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryAllTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,8 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBasalHourTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBasalHourTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.java
index 2cbc30c87c..84a174208b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBasalHourTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.java
index ef8707d2fb..75e519ec7c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryBolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryCarboTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryCarboTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.java
index 9cb8163a45..a72c678a0a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryCarboTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDailyInsulinTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDailyInsulinTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.java
index 6c8a92d419..4daa12c0cf 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDailyInsulinTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDoneTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.java
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDoneTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.java
index 803b893da3..2de2d924be 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryDoneTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryErrorTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryErrorTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.java
index dfa9700eb5..5afc4def16 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryErrorTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryGlucoseTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryGlucoseTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.java
index 3b64609913..bd618a03c3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryGlucoseTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewDoneTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewDoneTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.java
index 45c97b3f6a..80cd2dbc7d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewDoneTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.java
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.java
index c810145e37..104f29733f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryNewTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryRefillTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryRefillTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.java
index 3e78418476..a1b5fad4a6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistoryRefillTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistorySuspendTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistorySuspendTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.java
index d53020000c..856503579a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgHistorySuspendTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBasicTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java
similarity index 86%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBasicTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java
index 15fb73e3e8..959d114098 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBasicTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java
similarity index 87%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java
index 637891eb66..11aa667f1e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusBolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusOptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusOptionTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java
index 39f4898afb..04e8b93b30 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusOptionTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,9 +9,8 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTimeTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java
index 109853191d..fbc4fd6072 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTimeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,9 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java
similarity index 79%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStartTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java
index 14d860772e..ada4d9a1fb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStartTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,11 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java
similarity index 79%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStopTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java
index c072a312ae..81b9c32aa1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgPCCommStopTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,11 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetActivateBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java
similarity index 83%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetActivateBasalProfileTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java
index 0a7231c349..ca87435a7a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetActivateBasalProfileTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java
similarity index 85%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetBasalProfileTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java
index 29978a7888..f49cb5eace 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetBasalProfileTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetCarbsEntryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java
similarity index 82%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetCarbsEntryTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java
index 6e1ed6ed2e..72cbb54516 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetCarbsEntryTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java
similarity index 83%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStartTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java
index 1da102ba55..87ace6198a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStartTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java
similarity index 82%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStopTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java
index 95c296170e..21391e47b4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetExtendedBolusStopTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetSingleBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java
similarity index 85%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetSingleBasalProfileTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java
index 8a593b63a8..5a272c8cf6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetSingleBasalProfileTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java
similarity index 82%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStartTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java
index 89b5956250..e6b6123805 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStartTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java
similarity index 82%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStopTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java
index a9c74b85b1..1bd0ea8299 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTempBasalStopTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java
similarity index 83%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTimeTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java
index 21cb82f4dc..0214cf58f9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetTimeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,9 +10,7 @@ import java.util.Date;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetUserOptionsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java
similarity index 78%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetUserOptionsTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java
index ccb8a857af..71447a258b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetUserOptionsTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingActiveProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingActiveProfileTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java
index 189be6ba63..3d523ebf6c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingActiveProfileTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalProfileAllTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java
similarity index 79%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalProfileAllTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java
index aa6294f974..b1877a5611 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalProfileAllTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,11 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java
similarity index 77%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java
index b223c4c31b..7d1583a73b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasalTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,11 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingGlucoseTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java
similarity index 79%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingGlucoseTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java
index 6f7ab8e977..c0428a886e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingGlucoseTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMaxValuesTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMaxValuesTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java
index 64840f3692..8da983b213 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMaxValuesTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMealTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMealTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java
index bba46e1c8e..7680e6c5a9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMealTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosAllTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosAllTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java
index 7512443931..d65da6805f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosAllTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java
index 5325675b50..bcb9734c04 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingProfileRatiosTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingPumpTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java
similarity index 85%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingPumpTimeTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java
index 9a3f1cd397..fa21a2a197 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingPumpTimeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,10 +10,8 @@ import java.util.Date;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingShippingInfoTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingShippingInfoTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java
index 093674cf3b..aa8999ced4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingShippingInfoTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingUserOptionsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingUserOptionsTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java
index 5ddad9273a..bb60b0da1e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingUserOptionsTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBasicTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBasicTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java
index 307e9b1985..06ac6d5e7c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBasicTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBolusExtendedTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBolusExtendedTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java
index 76a30c3ecf..dd5751d1b3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusBolusExtendedTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import android.content.Context;
 
@@ -11,12 +11,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
-
-import static org.junit.Assert.*;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by Rumen Georgiev on 8/30/2018.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusProfileTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java
index 29e92abc94..c91409b237 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusProfileTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTempBasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java
similarity index 70%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTempBasalTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java
index 5c7e31bd5a..4bb51a1a00 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTempBasalTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java
@@ -1,21 +1,16 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 
 /**
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java
index 26c88c3f3d..7d30e8da09 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgStatusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/RecordTypesTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.java
similarity index 83%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/RecordTypesTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.java
index df0ae80ff2..f325cf8477 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/RecordTypesTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaR.comm;
+package info.nightscout.androidaps.plugins.pump.danaR.comm;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.java
similarity index 92%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPluginTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.java
index 1345915391..8777104861 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS;
+package info.nightscout.androidaps.plugins.pump.danaRS;
 
 import android.content.Context;
 
@@ -15,9 +15,9 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRSMessageHashTableTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRSMessageHashTableTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.java
index 448ac44d91..b498fb8bbc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRSMessageHashTableTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import com.cozmo.danar.util.BleCommandUtil;
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java
similarity index 97%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java
index 61266462cc..c249f9c618 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_History_EventsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.java
similarity index 97%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_History_EventsTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.java
index 0abf2166a9..4481379841 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_History_EventsTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import android.content.Context;
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentService;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java
index fd988d182f..c7cc83407b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java
similarity index 92%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java
index 4bebf3b35e..a530749e27 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java
index 0aa00e2403..da023edd1a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java
index 6ccf1419d7..2aeb278110 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java
similarity index 92%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java
index 385aa70e53..1233762ab1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java
index 4ac4e2e76e..443c467b53 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java
similarity index 92%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java
index bd6f870ef3..9595376aae 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java
index 06024f93b6..019661cc3c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java
index b9763321ad..6df9e00187 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java
index f333c7b1df..3fe67fadc4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java
index 06cf4bcb35..55b6697ce1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java
index 062da8814f..333f35e5d2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java
index 0e94da09df..9931e02bd6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java
index 3f6b2515e3..1d9ce053be 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java
index 21319cdddd..b724209408 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java
index 376ce114ba..d7ad9c6d59 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java
index fcd22aab17..1d3b1bb146 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
index 3842b8b018..920ba7cc86 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
index 0e617d75a6..23bdc76cb4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
index a7f0ca2194..91a2fb4c51 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
index b5ce54771a..e329dee330 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
index 0c55d42344..8240ae6aff 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
index 3a23c5a52e..bc2010bd7b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
index 92c1989ecd..14e522ab67 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
index bda75c2382..5e16f6ef2e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
index f1ac1c9dd5..630e94e046 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
index 0ef5ae93c0..23da9c8863 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
index 6fef2d54ce..ca75e03954 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java
similarity index 92%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java
index ab4e29e9ca..1889ff9611 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,7 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java
similarity index 92%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java
index f2c04eb80d..71d090f316 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,7 +9,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
similarity index 92%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
index 44ad4889d6..019cd89459 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,7 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
index d2f96e3d66..69a314fbb8 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,7 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
index 99728b5996..907e93020e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,7 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java
index 1f9212f61e..ae1c669ab8 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,7 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java
index f280b29e4a..a3ea700b0f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java
index fe0d034a86..858abdbfd7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java
index 39f2b462d9..c85a044326 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java
similarity index 92%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java
index 480f0f637b..c0984484fe 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java
index c1dffffe47..38cf72ecef 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java
index 0ce2089899..7bf08f3afb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java
index 24d0fc6287..82ef16cf88 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java
index 44e2b9b690..ab0fd095bc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_AlarmTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_AlarmTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.java
index a058a8dd85..a2539de7af 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_AlarmTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_All_HistoryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_All_HistoryTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.java
index d93a58b281..2551cf2281 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_All_HistoryTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_BasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_BasalTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.java
index 86673cc507..32fe887b64 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_BasalTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java
index 04ed0e173f..3534cc4828 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_BolusTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.java
index 1a4951f6dc..856b43a589 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_BolusTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java
index ff1b041953..876315389d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_DailyTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_DailyTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.java
index 8ba3df73b1..847563e2dd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_DailyTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_PrimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_PrimeTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.java
index 3f923d67cb..db5e201b74 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_PrimeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_RefillTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_RefillTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.java
index d2b0c0e453..7faa893bcf 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_RefillTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_SuspendTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_SuspendTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.java
index 665b20a27d..d8f51ffb88 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_SuspendTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_TemporaryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_TemporaryTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.java
index cd0fe15e7a..87fedbdb96 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_History_TemporaryTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -6,12 +6,10 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Date;
-
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_AlarmTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_AlarmTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.java
index 87b07831b1..f1d588d866 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_AlarmTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -10,7 +10,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java
index 2d0eaa42b5..ea7188f66c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -10,7 +10,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java
index 47b19b5d70..3a6f9125c1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -10,7 +10,7 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java
index 966ccc3b08..a49c0d4f25 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java
index b6b945d00e..0a55071800 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java
index 700715040b..371263018b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java
index 9ecd5a7adf..e2a18bcf3c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -11,7 +11,7 @@ import java.util.Date;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java
index 74a2999728..5d9b550b9f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,8 +9,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java
index 338b27fe47..d266754c4e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpDanaRS.comm;
+package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 
 
 import org.junit.Test;
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/DanaRv2PluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java
similarity index 89%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/DanaRv2PluginTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java
index 140b0165bd..d792e83bf8 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/DanaRv2PluginTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2;
+package info.nightscout.androidaps.plugins.pump.danaRv2;
 
 import android.content.Context;
 
@@ -13,17 +13,14 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
 
 /**
  * Created by Rumen on 01.08.2018
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MessageHashTable_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java
similarity index 83%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MessageHashTable_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java
index 63e3af0fa4..9fa40854a4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MessageHashTable_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MessageHashTable_v2;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusAPS_v2;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 /**
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgCheckValue_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgCheckValue_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java
index 924672f3e0..14d61b5e22 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgCheckValue_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,14 +9,12 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgCheckValue;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgCheckValue_v2;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.queue.CommandQueue;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 import static org.powermock.api.mockito.PowerMockito.when;
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgHistoryEvents_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java
similarity index 85%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgHistoryEvents_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java
index f462894924..a137c076ca 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgHistoryEvents_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 
 import org.junit.Test;
@@ -9,12 +9,9 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgHistoryEvents_v2;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentService;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
similarity index 90%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
index d587363d60..8835ee341e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 
 import org.junit.Test;
@@ -8,9 +8,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgSetAPSTempBasalStart_v2;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgSetHistoryEntry_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java
similarity index 84%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgSetHistoryEntry_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java
index a9e4aee39e..50f80550b5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgSetHistoryEntry_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,10 +8,9 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgSetHistoryEntry_v2;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 /**
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusAPS_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java
similarity index 82%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusAPS_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java
index c8ae1030ee..63e7011603 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusAPS_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import android.content.Context;
 
@@ -11,10 +11,9 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusAPS_v2;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.utils.SP;
 import static org.junit.Assert.*;
 /**
  * Created by Rumen Georgiev on 30.10.2018
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusBolusExtended_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java
similarity index 74%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusBolusExtended_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java
index bde05289c2..2f12a15240 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusBolusExtended_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import android.content.Context;
 
@@ -11,13 +11,9 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusBolusExtended_v2;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.Treatments.Treatment;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusTempBasal_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusTempBasal_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java
index cecb246e5f..70a7a36f0e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpdanaRv2/comm/MsgStatusTempBasal_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpdanaRv2.comm;
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,11 +8,10 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusTempBasal_v2;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.*;
 /**
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPluginUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.java
similarity index 89%
rename from app/src/test/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPluginUTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.java
index 76cc54de94..f58f02b5af 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPluginUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.PumpVirtual;
+package info.nightscout.androidaps.plugins.pump.virtual;
 
 import android.content.Context;
 
@@ -13,9 +13,9 @@ import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
-import info.nightscout.utils.SP;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 import static org.powermock.api.mockito.PowerMockito.when;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
index e149d39008..7d0a960af2 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java
@@ -26,12 +26,12 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpMDI.MDIPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.utils.ToastUtils;
+import info.nightscout.androidaps.utils.ToastUtils;
 
-import static info.nightscout.utils.DateUtil.now;
+import static info.nightscout.androidaps.utils.DateUtil.now;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -120,7 +120,7 @@ public class CommandQueueTest extends CommandQueue {
 
         AAPSMocker.mockMainApp();
         AAPSMocker.mockConfigBuilder();
-        PumpInterface pump = MDIPlugin.getPlugin();
+        PumpInterface pump = VirtualPumpPlugin.getPlugin();
         when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump);
 
         when(MainApp.getConstraintChecker()).thenReturn(constraintChecker);
diff --git a/app/src/test/java/info/nightscout/utils/BolusWizardTest.java b/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java
similarity index 83%
rename from app/src/test/java/info/nightscout/utils/BolusWizardTest.java
rename to app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java
index d8c1a0e497..eaa7f3d07c 100644
--- a/app/src/test/java/info/nightscout/utils/BolusWizardTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/BolusWizardTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -14,8 +14,8 @@ import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.PumpMDI.MDIPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.when;
  * Created by kuchjir on 12/12/2017.
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest( { MainApp.class, GlucoseStatus.class, ConfigBuilderPlugin.class, TreatmentsPlugin.class })
+@PrepareForTest({MainApp.class, GlucoseStatus.class, ConfigBuilderPlugin.class, TreatmentsPlugin.class})
 public class BolusWizardTest {
     private static final double PUMP_BOLUS_STEP = 0.1;
 
@@ -34,8 +34,8 @@ public class BolusWizardTest {
         BolusWizard bw = new BolusWizard();
         Profile profile = setupProfile(4d, 8d, 20d, 12d);
 
-        Double bolusForBg42 = bw.doCalc(profile, null, 20, 0.0,4.2, 0d, 100d, true, true, false, false);
-        Double bolusForBg54 = bw.doCalc(profile, null, 20, 0.0,5.4, 0d, 100d, true, true, false, false);
+        Double bolusForBg42 = bw.doCalc(profile, null, 20, 0.0, 4.2, 0d, 100d, true, true, false, false);
+        Double bolusForBg54 = bw.doCalc(profile, null, 20, 0.0, 5.4, 0d, 100d, true, true, false, false);
         Assert.assertEquals(bolusForBg42, bolusForBg54);
     }
 
@@ -44,8 +44,8 @@ public class BolusWizardTest {
         BolusWizard bw = new BolusWizard();
         Profile profile = setupProfile(4d, 8d, 20d, 12d);
 
-        Double bolusForHighBg = bw.doCalc(profile, null, 20, 0d,9.8, 0d, 100d, true, true, false, false);
-        Double bolusForBgInRange = bw.doCalc(profile, null, 20, 0.0,5.4, 0d, 100d, true, true, false, false);
+        Double bolusForHighBg = bw.doCalc(profile, null, 20, 0d, 9.8, 0d, 100d, true, true, false, false);
+        Double bolusForBgInRange = bw.doCalc(profile, null, 20, 0.0, 5.4, 0d, 100d, true, true, false, false);
         Assert.assertTrue(bolusForHighBg > bolusForBgInRange);
     }
 
@@ -54,8 +54,8 @@ public class BolusWizardTest {
         BolusWizard bw = new BolusWizard();
         Profile profile = setupProfile(4d, 8d, 20d, 12d);
 
-        Double bolusForLowBg = bw.doCalc(profile, null, 20, 0d,3.6, 0d, 100d, true, true, false, false);
-        Double bolusForBgInRange = bw.doCalc(profile, null, 20, 0.0,5.4, 0d, 100d, true, true, false, false);
+        Double bolusForLowBg = bw.doCalc(profile, null, 20, 0d, 3.6, 0d, 100d, true, true, false, false);
+        Double bolusForBgInRange = bw.doCalc(profile, null, 20, 0.0, 5.4, 0d, 100d, true, true, false, false);
         Assert.assertTrue(bolusForLowBg < bolusForBgInRange);
     }
 
diff --git a/app/src/test/java/info/nightscout/utils/DateUtilTest.java b/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.java
similarity index 98%
rename from app/src/test/java/info/nightscout/utils/DateUtilTest.java
rename to app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.java
index 5e1de56709..d6998ab963 100644
--- a/app/src/test/java/info/nightscout/utils/DateUtilTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 
 import org.junit.Assert;
diff --git a/app/src/test/java/info/nightscout/utils/DecimalFormatterTest.java b/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
similarity index 95%
rename from app/src/test/java/info/nightscout/utils/DecimalFormatterTest.java
rename to app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
index a17a76909b..ca1bc84e78 100644
--- a/app/src/test/java/info/nightscout/utils/DecimalFormatterTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -10,8 +10,6 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import info.AAPSMocker;
 import info.nightscout.androidaps.MainApp;
 
-import static org.junit.Assert.*;
-
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({MainApp.class})
 public class DecimalFormatterTest {
diff --git a/app/src/test/java/info/nightscout/utils/JsonHelperTest.java b/app/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.java
similarity index 95%
rename from app/src/test/java/info/nightscout/utils/JsonHelperTest.java
rename to app/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.java
index fd911672eb..7cc5355bb7 100644
--- a/app/src/test/java/info/nightscout/utils/JsonHelperTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/app/src/test/java/info/nightscout/utils/PercentageSplitterTest.java b/app/src/test/java/info/nightscout/androidaps/utils/PercentageSplitterTest.java
similarity index 94%
rename from app/src/test/java/info/nightscout/utils/PercentageSplitterTest.java
rename to app/src/test/java/info/nightscout/androidaps/utils/PercentageSplitterTest.java
index d57b0ea230..37f94c1f2d 100644
--- a/app/src/test/java/info/nightscout/utils/PercentageSplitterTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/PercentageSplitterTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/info/nightscout/utils/RoundTest.java b/app/src/test/java/info/nightscout/androidaps/utils/RoundTest.java
similarity index 95%
rename from app/src/test/java/info/nightscout/utils/RoundTest.java
rename to app/src/test/java/info/nightscout/androidaps/utils/RoundTest.java
index 1a801d2a7d..fb444804bc 100644
--- a/app/src/test/java/info/nightscout/utils/RoundTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/RoundTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/info/nightscout/utils/StringUtilsTest.java b/app/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.java
similarity index 95%
rename from app/src/test/java/info/nightscout/utils/StringUtilsTest.java
rename to app/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.java
index 048ef8ac97..dd95962964 100644
--- a/app/src/test/java/info/nightscout/utils/StringUtilsTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/StringUtilsTest.java
@@ -1,4 +1,4 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/info/nightscout/utils/TTest.java b/app/src/test/java/info/nightscout/androidaps/utils/TTest.java
similarity index 93%
rename from app/src/test/java/info/nightscout/utils/TTest.java
rename to app/src/test/java/info/nightscout/androidaps/utils/TTest.java
index 764754623e..fa5bcbd8ad 100644
--- a/app/src/test/java/info/nightscout/utils/TTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/TTest.java
@@ -1,9 +1,7 @@
-package info.nightscout.utils;
+package info.nightscout.androidaps.utils;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
  * Created by mike on 26.03.2018.