diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 0059586c65..7263cfb6e9 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -56,8 +56,8 @@
 -keep class org.slf4j.** { *; }
 -keep class rx.internal.util.** { *; }
 -keep class sun.misc.Unsafe { *; }
--keep class com.eveningoutpost.dexdrip.Models.** { *; }
--keep class com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.** { *; }
+-keep class com.eveningoutpost.dexdrip.models.** { *; }
+-keep class com.eveningoutpost.dexdrip.importedlibraries.usbserial.** { *; }
 -keep class ar.com.hjg.pngj.** { *; }
 -keep class android.support.v7.widget.SearchView { *; }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce8632e8db..3e7c9e250d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -105,15 +105,15 @@
             android:label="@string/title_activity_bluetooth_scan" />
 
         <service
-            android:name=".Services.DexCollectionService"
+            android:name=".services.DexCollectionService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".Services.WifiCollectionService"
+            android:name=".services.WifiCollectionService"
             android:enabled="true"
             android:exported="true" />
-        <service android:name=".Services.ActivityRecognizedService" />
-        <service android:name=".Services.BluetoothGlucoseMeter" />
+        <service android:name=".services.ActivityRecognizedService" />
+        <service android:name=".services.BluetoothGlucoseMeter" />
         <service
             android:name=".wearintegration.WatchUpdaterService"
             android:exported="true">
@@ -138,11 +138,11 @@
             android:exported="false" />
 
         <activity
-            android:name=".Tables.BgReadingTable"
+            android:name=".tables.BgReadingTable"
             android:configChanges="orientation|screenSize"
             android:label="@string/bg_readings_table" />
         <activity
-            android:name=".Tables.SensorDataTable"
+            android:name=".tables.SensorDataTable"
             android:configChanges="orientation|screenSize"
             android:label="@string/sensor_table" />
         <activity
@@ -228,7 +228,7 @@
             </intent-filter>
         </receiver>
         <activity
-            android:name=".Tables.CalibrationDataTable"
+            android:name=".tables.CalibrationDataTable"
             android:label="@string/calibration_data_table" />
 
         <service android:name=".GcmListenerSvc">
@@ -254,12 +254,12 @@
         </service>
         -->
         <service
-            android:name=".Services.SyncService"
+            android:name=".services.SyncService"
             android:enabled="true"
             android:exported="true" />
 
         <service
-            android:name=".ImportedLibraries.dexcom.SyncingService"
+            android:name=".importedlibraries.dexcom.SyncingService"
             android:enabled="true"
             android:exported="true" />
 
@@ -300,19 +300,19 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_calibration_check_in" />
         <activity
-            android:name=".UtilityModels.pebble.watchface.InstallPebbleWatchFace"
+            android:name=".utilitymodels.pebble.watchface.InstallPebbleWatchFace"
             android:label="@string/install_pebble_watchface" />
         <activity
-            android:name=".UtilityModels.pebble.watchface.InstallPebbleTrendWatchFace"
+            android:name=".utilitymodels.pebble.watchface.InstallPebbleTrendWatchFace"
             android:label="@string/install_pebble_trend_watchface" />
         <activity
-            android:name=".UtilityModels.pebble.watchface.InstallPebbleClassicTrendWatchface"
+            android:name=".utilitymodels.pebble.watchface.InstallPebbleClassicTrendWatchface"
             android:label="@string/install_pebble_classic_trend_watchface" />
         <activity
-            android:name=".UtilityModels.pebble.watchface.InstallPebbleTrendClayWatchFace"
+            android:name=".utilitymodels.pebble.watchface.InstallPebbleTrendClayWatchFace"
             android:label="Install Pebble Clay Watchface" />
         <activity
-            android:name=".UtilityModels.pebble.watchface.InstallPebbleSnoozeControlApp"
+            android:name=".utilitymodels.pebble.watchface.InstallPebbleSnoozeControlApp"
             android:label="@string/install_pebble_snooze_control_app" />
         <activity
             android:name=".UsbConnectedActivity"
@@ -345,15 +345,15 @@
             android:launchMode="singleTask" />
 
         <service
-            android:name=".Services.DexShareCollectionService"
+            android:name=".services.DexShareCollectionService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".Services.G5CollectionService"
+            android:name=".services.G5CollectionService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".Services.Ob1G5CollectionService"
+            android:name=".services.Ob1G5CollectionService"
             android:foregroundServiceType="connectedDevice|location"
             android:enabled="true" />
         <service
@@ -415,25 +415,25 @@
             android:label="@string/manage_followers" />
 
         <service
-            android:name=".Services.SnoozeOnNotificationDismissService"
+            android:name=".services.SnoozeOnNotificationDismissService"
             android:exported="false" />
         <service
-            android:name=".Services.MissedReadingService"
+            android:name=".services.MissedReadingService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".UtilityModels.Notifications"
+            android:name=".utilitymodels.Notifications"
             android:exported="false" />
         <service
-            android:name=".UtilityModels.pebble.PebbleWatchSync"
+            android:name=".utilitymodels.pebble.PebbleWatchSync"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".Services.DailyIntentService"
+            android:name=".services.DailyIntentService"
             android:exported="false" />
 
         <activity
-            android:name=".localeTasker.ui.EditActivity"
+            android:name=".localetasker.ui.EditActivity"
             android:exported="true"
             android:label="@string/plugin_name"
             android:theme="@style/Theme.Locale.Dark"
@@ -485,19 +485,19 @@
                 <action android:name="com.librelink.app.ThirdPartyIntegration.SENSOR_ACTIVATE" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".UtilityModels.BroadcastSnoozeReceiver">
+        <receiver android:name=".utilitymodels.BroadcastSnoozeReceiver">
             <intent-filter>
                 <action android:name="com.eveningoutpost.dexdrip.Snooze" />
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".localeTasker.receiver.FireReceiver"
+            android:name=".localetasker.receiver.FireReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".UtilityModels.CompatibleApps">
+        <receiver android:name=".utilitymodels.CompatibleApps">
             <intent-filter android:priority="100">
                 <action android:name="android.intent.action.PACKAGE_ADDED" />
 
@@ -516,7 +516,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".UtilityModels.XDripDreamService"
+            android:name=".utilitymodels.XDripDreamService"
             android:exported="true"
             android:icon="@drawable/ic_launcher"
             android:label="xDrip+"
@@ -532,12 +532,12 @@
                 android:resource="@xml/xdrip_dream" />
         </service>
         <service
-            android:name=".Services.PlusSyncService"
+            android:name=".services.PlusSyncService"
             android:enabled="true"
             android:exported="true" />
 
         <activity
-            android:name=".UtilityModels.UpdateActivity"
+            android:name=".utilitymodels.UpdateActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_update" />
         <activity
@@ -552,7 +552,7 @@
             android:label="@string/libre_15_minutes_graph"
             android:noHistory="true" />
         <activity
-            android:name=".UtilityModels.SendFeedBack"
+            android:name=".utilitymodels.SendFeedBack"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_send_feed_back"
             android:noHistory="true">
@@ -591,7 +591,7 @@
                     android:label="@string/basal_editor"
                     android:screenOrientation="landscape" />
         <service
-            android:name=".Services.DoNothingService"
+            android:name=".services.DoNothingService"
             android:enabled="true"
             android:exported="true" />
 
@@ -634,7 +634,7 @@
             android:label="@string/language_editor"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".GlucoseMeter.BTGlucoseMeterActivity"
+            android:name=".glucosemeter.BTGlucoseMeterActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_btglucose_meter"
             android:parentActivityName=".Home">
@@ -678,7 +678,7 @@
             android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H"
             android:value="598.0dip" />
 
-        <activity android:name=".UtilityModels.XDripDreamSettingsActivity" />
+        <activity android:name=".utilitymodels.XDripDreamSettingsActivity" />
 
         <service
             android:name=".wearintegration.Amazfitservice"
@@ -702,7 +702,7 @@
             android:label="@string/select_device" />
 
         <activity
-            android:name=".UtilityModels.MtpConfigureActivity"
+            android:name=".utilitymodels.MtpConfigureActivity"
             android:label="USB programmer" />
         <activity
             android:name=".ui.activities.NumberWallPreview"
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/AddCalibration.java b/app/src/main/java/com/eveningoutpost/dexdrip/AddCalibration.java
index 3d7a0e3d01..cb2805ac6d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/AddCalibration.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/AddCalibration.java
@@ -10,15 +10,15 @@
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.UndoRedo;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.UndoRedo;
 import com.eveningoutpost.dexdrip.calibrations.NativeCalibrationPipe;
 
 import java.util.UUID;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Agreement.java b/app/src/main/java/com/eveningoutpost/dexdrip/Agreement.java
index c43e932f07..3c0bccab2c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Agreement.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Agreement.java
@@ -4,12 +4,11 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 public class Agreement extends BaseAppCompatActivity {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/AlertList.java b/app/src/main/java/com/eveningoutpost/dexdrip/AlertList.java
index 57c6a2d1ca..454cb39b35 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/AlertList.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/AlertList.java
@@ -25,10 +25,10 @@
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 import java.text.ParseException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/AutoStart.java b/app/src/main/java/com/eveningoutpost/dexdrip/AutoStart.java
index 22c8f92db1..d915a63c29 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/AutoStart.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/AutoStart.java
@@ -4,11 +4,11 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.PlusSyncService;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.PlusSyncService;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/BGHistory.java b/app/src/main/java/com/eveningoutpost/dexdrip/BGHistory.java
index 3b20da0ad5..0534efdf58 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/BGHistory.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/BGHistory.java
@@ -16,8 +16,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.stats.StatsResult;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/BestGlucose.java b/app/src/main/java/com/eveningoutpost/dexdrip/BestGlucose.java
index 2e1414dfca..781a5a27bf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/BestGlucose.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/BestGlucose.java
@@ -8,12 +8,12 @@
 import android.text.style.StrikethroughSpan;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/BindingAdapterUtils.java b/app/src/main/java/com/eveningoutpost/dexdrip/BindingAdapterUtils.java
index cb8a378103..7660ab21a3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/BindingAdapterUtils.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/BindingAdapterUtils.java
@@ -13,9 +13,9 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.FINAL_VISIBILITY_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.FINAL_VISIBILITY_ID;
 
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/BluetoothScan.java b/app/src/main/java/com/eveningoutpost/dexdrip/BluetoothScan.java
index 0cf16881fd..1fb60afbf5 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/BluetoothScan.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/BluetoothScan.java
@@ -31,14 +31,14 @@
 import android.widget.Toast;
 
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Blukon;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Blukon;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.cgm.medtrum.Medtrum;
 import com.eveningoutpost.dexdrip.utils.AndroidBarcode;
 import com.eveningoutpost.dexdrip.utils.ListActivityWithMenu;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationCheckInActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationCheckInActivity.java
index 1f667ef6b9..aed7569460 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationCheckInActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationCheckInActivity.java
@@ -3,14 +3,14 @@
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.SyncingService;
-import com.eveningoutpost.dexdrip.Models.Sensor;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.SyncingService;
+import com.eveningoutpost.dexdrip.models.Sensor;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 public class CalibrationCheckInActivity extends ActivityWithMenu {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationGraph.java b/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationGraph.java
index e11599a789..9e597ab595 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationGraph.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationGraph.java
@@ -12,11 +12,11 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.CalibrationSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.CalibrationSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationOverride.java b/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationOverride.java
index b18481343d..f4a41808e8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationOverride.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/CalibrationOverride.java
@@ -4,22 +4,21 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.UndoRedo;
-import com.eveningoutpost.dexdrip.UtilityModels.CalibrationSendQueue;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.UndoRedo;
+import com.eveningoutpost.dexdrip.utilitymodels.CalibrationSendQueue;
 import com.eveningoutpost.dexdrip.calibrations.NativeCalibrationPipe;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
-import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
+
 import static com.eveningoutpost.dexdrip.Home.startWatchUpdaterService;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/DoubleCalibrationActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/DoubleCalibrationActivity.java
index 61b8ec73f5..aed990e54a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/DoubleCalibrationActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/DoubleCalibrationActivity.java
@@ -6,20 +6,20 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PrefsViewImpl;
 import com.eveningoutpost.dexdrip.databinding.ActivityDoubleCalibrationBinding;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java
index a66a6fb63d..cce258a6e2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java
@@ -38,13 +38,13 @@
 import android.widget.TimePicker;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 import com.eveningoutpost.dexdrip.watch.thinjam.BlueJayEntry;
 import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ErrorListAdapter.java b/app/src/main/java/com/eveningoutpost/dexdrip/ErrorListAdapter.java
index 481ca19def..165fd622e8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ErrorListAdapter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ErrorListAdapter.java
@@ -9,7 +9,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.text.DateFormat;
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ErrorsActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/ErrorsActivity.java
index 158d4782b8..532372bfcf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ErrorsActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ErrorsActivity.java
@@ -13,10 +13,10 @@
 import android.widget.Switch;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.SendFeedBack;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.SendFeedBack;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/EventLogActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/EventLogActivity.java
index 8d4f5303d7..c48827d76b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/EventLogActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/EventLogActivity.java
@@ -26,12 +26,12 @@
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.SendFeedBack;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.SendFeedBack;
 import com.eveningoutpost.dexdrip.databinding.ActivityEventLogBinding;
 import com.eveningoutpost.dexdrip.ui.helpers.BitmapUtil;
 import com.eveningoutpost.dexdrip.utils.ExtensionMethods;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/FakeNumbers.java b/app/src/main/java/com/eveningoutpost/dexdrip/FakeNumbers.java
index d56eb1ca2a..74be094b58 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/FakeNumbers.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/FakeNumbers.java
@@ -2,24 +2,19 @@
 
 import java.util.Date;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.TimePicker;
 
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.BgReading;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
-import java.util.Date;
-
 public class FakeNumbers extends ActivityWithMenu {
     public static String menu_name = "Fake Numbers";
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/FauxActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/FauxActivity.java
index 808001b76a..4dd4bafa9a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/FauxActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/FauxActivity.java
@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 /**
  * Created by jamorham on 09/01/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/FollowerListAdapter.java b/app/src/main/java/com/eveningoutpost/dexdrip/FollowerListAdapter.java
index 95eb85a877..e217ba81c5 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/FollowerListAdapter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/FollowerListAdapter.java
@@ -9,8 +9,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.ShareModels.Models.ExistingFollower;
-import com.eveningoutpost.dexdrip.ShareModels.ShareRest;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ExistingFollower;
+import com.eveningoutpost.dexdrip.sharemodels.ShareRest;
 import com.squareup.okhttp.ResponseBody;
 
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/FollowerManagementActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/FollowerManagementActivity.java
index f22b609137..707d2bbac2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/FollowerManagementActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/FollowerManagementActivity.java
@@ -12,9 +12,9 @@
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.ShareModels.Models.ExistingFollower;
-import com.eveningoutpost.dexdrip.ShareModels.Models.InvitationPayload;
-import com.eveningoutpost.dexdrip.ShareModels.ShareRest;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ExistingFollower;
+import com.eveningoutpost.dexdrip.sharemodels.Models.InvitationPayload;
+import com.eveningoutpost.dexdrip.sharemodels.ShareRest;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GcmActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/GcmActivity.java
index 0e4f5132ac..5fd11bbb38 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GcmActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/GcmActivity.java
@@ -16,21 +16,21 @@
 import android.support.v4.content.LocalBroadcastManager;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.RollCall;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.PlusSyncService;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.InstalledApps;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.RollCall;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.PlusSyncService;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.InstalledApps;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.utils.DisplayQRCode;
 import com.eveningoutpost.dexdrip.utils.SdcardImportExport;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GcmListenerSvc.java b/app/src/main/java/com/eveningoutpost/dexdrip/GcmListenerSvc.java
index c93dc1906c..d22eeb085e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GcmListenerSvc.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/GcmListenerSvc.java
@@ -1,7 +1,5 @@
 package com.eveningoutpost.dexdrip;
 
-import android.R.integer;
-
 /**
  * Created by jamorham on 11/01/16.
  */
@@ -18,28 +16,28 @@
 import android.os.PowerManager;
 import android.util.Base64;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.RollCall;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.NanoStatus;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.PumpStatus;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.RollCall;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.NanoStatus;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PumpStatus;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.utils.Preferences;
@@ -57,8 +55,8 @@
 import java.util.Map;
 
 import static android.support.v4.content.WakefulBroadcastReceiver.completeWakefulIntent;
-import static com.eveningoutpost.dexdrip.Models.JoH.isAnyNetworkConnected;
-import static com.eveningoutpost.dexdrip.Models.JoH.showNotification;
+import static com.eveningoutpost.dexdrip.models.JoH.isAnyNetworkConnected;
+import static com.eveningoutpost.dexdrip.models.JoH.showNotification;
 
 public class GcmListenerSvc extends JamListenerSvc {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GoogleDriveInterface.java b/app/src/main/java/com/eveningoutpost/dexdrip/GoogleDriveInterface.java
index 8b077fbe4d..1b1f034690 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GoogleDriveInterface.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/GoogleDriveInterface.java
@@ -9,7 +9,7 @@
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.google.android.gms.common.api.GoogleApiClient;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/HelpActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/HelpActivity.java
index df0ec8c0db..b10fd1519f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/HelpActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/HelpActivity.java
@@ -1,10 +1,9 @@
 package com.eveningoutpost.dexdrip;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.webkit.WebView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 public class HelpActivity extends BaseAppCompatActivity {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
index fc1108e077..a0feca7f2c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -54,49 +54,49 @@
 import android.widget.Toast;
 
 import com.crashlytics.android.Crashlytics;
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.InsulinInjection;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.ProcessInitialDataQuality;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.StepCounter;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.PlusSyncService;
-import com.eveningoutpost.dexdrip.Services.WixelReader;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.CompatibleApps;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Experience;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.JamorhamShowcaseDrawer;
-import com.eveningoutpost.dexdrip.UtilityModels.NanoStatus;
-import com.eveningoutpost.dexdrip.UtilityModels.NightscoutUploader;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl;
-import com.eveningoutpost.dexdrip.UtilityModels.SendFeedBack;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
-import com.eveningoutpost.dexdrip.UtilityModels.SourceWizard;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusLine;
-import com.eveningoutpost.dexdrip.UtilityModels.UndoRedo;
-import com.eveningoutpost.dexdrip.UtilityModels.UpdateActivity;
-import com.eveningoutpost.dexdrip.UtilityModels.VoiceCommands;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.InsulinInjection;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.ProcessInitialDataQuality;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.StepCounter;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.services.PlusSyncService;
+import com.eveningoutpost.dexdrip.services.WixelReader;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.CompatibleApps;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Experience;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.JamorhamShowcaseDrawer;
+import com.eveningoutpost.dexdrip.utilitymodels.NanoStatus;
+import com.eveningoutpost.dexdrip.utilitymodels.NightscoutUploader;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PrefsViewImpl;
+import com.eveningoutpost.dexdrip.utilitymodels.SendFeedBack;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.SourceWizard;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusLine;
+import com.eveningoutpost.dexdrip.utilitymodels.UndoRedo;
+import com.eveningoutpost.dexdrip.utilitymodels.UpdateActivity;
+import com.eveningoutpost.dexdrip.utilitymodels.VoiceCommands;
 import com.eveningoutpost.dexdrip.calibrations.NativeCalibrationPipe;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 import com.eveningoutpost.dexdrip.dagger.Injectors;
@@ -168,11 +168,11 @@
 import lombok.Getter;
 
 import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.X;
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.getCol;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.DAY_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.X;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.getCol;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.DAY_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
 
 public class Home extends ActivityWithMenu implements ActivityCompat.OnRequestPermissionsResultCallback {
@@ -3496,7 +3496,7 @@ public void initializeGraphicTrendArrow() {
 
     public static double convertToMgDlIfMmol(double value) {
         if (!Pref.getString("units", "mgdl").equals("mgdl")) {
-            return value * com.eveningoutpost.dexdrip.UtilityModels.Constants.MMOLL_TO_MGDL;
+            return value * com.eveningoutpost.dexdrip.utilitymodels.Constants.MMOLL_TO_MGDL;
         } else {
             return value; // no conversion needed
         }
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java
index 77acebf7bc..d93ebf265c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java
@@ -21,8 +21,8 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
 import com.eveningoutpost.dexdrip.utils.DatabaseUtil;
 import com.eveningoutpost.dexdrip.utils.FileUtils;
 import com.eveningoutpost.dexdrip.utils.ListActivityWithMenu;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java
index bf093a4eba..8df334169e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java
@@ -9,19 +9,19 @@
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Forecast;
-import com.eveningoutpost.dexdrip.Models.GlucoseData;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.LibreOOPAlgorithm;
-import com.eveningoutpost.dexdrip.Models.ReadingData;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Forecast;
+import com.eveningoutpost.dexdrip.models.GlucoseData;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.LibreOOPAlgorithm;
+import com.eveningoutpost.dexdrip.models.ReadingData;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.google.gson.Gson;
@@ -33,7 +33,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.LIBRE_MULTIPLIER;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.LIBRE_MULTIPLIER;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/LibreReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/LibreReceiver.java
index 88534f62ae..e1d2087412 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/LibreReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/LibreReceiver.java
@@ -9,14 +9,14 @@
 import android.preference.PreferenceManager;
 import android.text.format.DateFormat;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Libre2RawValue;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Libre2RawValue;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import java.text.DecimalFormat;
@@ -25,7 +25,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static com.eveningoutpost.dexdrip.Home.get_engineering_mode;
-import static com.eveningoutpost.dexdrip.Models.Libre2Sensor.Libre2Sensors;
+import static com.eveningoutpost.dexdrip.models.Libre2Sensor.Libre2Sensors;
 
 /**
  * Created by jamorham on 14/11/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/LicenseAgreementActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/LicenseAgreementActivity.java
index a2ac1301d6..4ed5c69d94 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/LicenseAgreementActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/LicenseAgreementActivity.java
@@ -5,14 +5,13 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.CheckBox;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.android.gms.common.GoogleApiAvailability;
 
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/MapsActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/MapsActivity.java
index efa5edf7ce..78103447cf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/MapsActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/MapsActivity.java
@@ -10,7 +10,7 @@
 import android.util.Log;
 import android.view.WindowManager;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/MegaStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/MegaStatus.java
index dfd23751da..97d3981410 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/MegaStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/MegaStatus.java
@@ -31,21 +31,21 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.RollCall;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.DoNothingService;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.WifiCollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.JamorhamShowcaseDrawer;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.RollCall;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.DoNothingService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.services.WifiCollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.JamorhamShowcaseDrawer;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
 import com.eveningoutpost.dexdrip.cgm.medtrum.MedtrumCollectionService;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.NightscoutFollowService;
 import com.eveningoutpost.dexdrip.cgm.sharefollow.ShareFollowService;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/MissedReadingActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/MissedReadingActivity.java
index aec2b76055..0765597353 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/MissedReadingActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/MissedReadingActivity.java
@@ -3,7 +3,6 @@
 import android.app.AlertDialog;
 import android.app.TimePickerDialog;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -16,8 +15,8 @@
 import android.widget.TextView;
 import android.widget.TimePicker;
 
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Services.MissedReadingService;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.services.MissedReadingService;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NFCReaderX.java b/app/src/main/java/com/eveningoutpost/dexdrip/NFCReaderX.java
index 08c1a52302..d25ea8b869 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NFCReaderX.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NFCReaderX.java
@@ -20,18 +20,17 @@
 import android.os.Vibrator;
 import android.view.View;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.GlucoseData;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.LibreOOPAlgorithm;
-import com.eveningoutpost.dexdrip.Models.ReadingData;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.LibreUtils;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.GlucoseData;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.LibreOOPAlgorithm;
+import com.eveningoutpost.dexdrip.models.ReadingData;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.LibreUtils;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import java.io.IOException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NSClientReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/NSClientReceiver.java
index 2f73060a1e..d88646d30c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NSClientReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NSClientReceiver.java
@@ -8,13 +8,13 @@
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NSEmulatorReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/NSEmulatorReceiver.java
index b8db452948..8d89b8f3dd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NSEmulatorReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NSEmulatorReceiver.java
@@ -9,15 +9,15 @@
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreOOPAlgorithm;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.PumpStatus;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreOOPAlgorithm;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PumpStatus;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import org.json.JSONArray;
@@ -26,7 +26,7 @@
 
 import java.util.UUID;
 
-import static com.eveningoutpost.dexdrip.Models.BgReading.bgReadingInsertFromJson;
+import static com.eveningoutpost.dexdrip.models.BgReading.bgReadingInsertFromJson;
 
 /**
  * Created by jamorham on 14/11/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NavDrawerBuilder.java b/app/src/main/java/com/eveningoutpost/dexdrip/NavDrawerBuilder.java
index 8a683561be..459dc38748 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NavDrawerBuilder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NavDrawerBuilder.java
@@ -6,16 +6,16 @@
 import android.os.Build;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.Tables.BgReadingTable;
-import com.eveningoutpost.dexdrip.Tables.CalibrationDataTable;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Experience;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.tables.BgReadingTable;
+import com.eveningoutpost.dexdrip.tables.CalibrationDataTable;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Experience;
 import com.eveningoutpost.dexdrip.stats.StatsActivity;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.Preferences;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NewDataObserver.java b/app/src/main/java/com/eveningoutpost/dexdrip/NewDataObserver.java
index 9d4d661afb..5527c6e7d5 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NewDataObserver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NewDataObserver.java
@@ -1,17 +1,17 @@
 package com.eveningoutpost.dexdrip;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.ShareModels.BgUploader;
-import com.eveningoutpost.dexdrip.ShareModels.Models.ShareUploadPayload;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.VehicleMode;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleUtil;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleWatchSync;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.sharemodels.BgUploader;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ShareUploadPayload;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.VehicleMode;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleUtil;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleWatchSync;
 import com.eveningoutpost.dexdrip.tidepool.TidepoolEntry;
 import com.eveningoutpost.dexdrip.ui.LockScreenWallPaper;
 import com.eveningoutpost.dexdrip.utils.BgToSpeech;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java b/app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java
index 46b92bbedf..aeca18aa4e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java
@@ -15,7 +15,7 @@
 import android.widget.RadioGroup.OnCheckedChangeListener;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.Sensor;
+import com.eveningoutpost.dexdrip.models.Sensor;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 import java.util.LinkedList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NightscoutBackfillActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/NightscoutBackfillActivity.java
index 964405ac3d..a9bf22e5df 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NightscoutBackfillActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NightscoutBackfillActivity.java
@@ -7,14 +7,14 @@
 import android.view.View;
 import android.widget.Button;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Services.SyncService;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderTask;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.services.SyncService;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderTask;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
 import com.eveningoutpost.dexdrip.profileeditor.DatePickerFragment;
 import com.eveningoutpost.dexdrip.profileeditor.ProfileAdapter;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NoteSearch.java b/app/src/main/java/com/eveningoutpost/dexdrip/NoteSearch.java
index b5f72307b7..0e22dfe783 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NoteSearch.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NoteSearch.java
@@ -30,8 +30,7 @@
 
 import com.activeandroid.Cache;
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.utils.ListActivityWithMenu;
 
 import java.text.DateFormat;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ParakeetHelper.java b/app/src/main/java/com/eveningoutpost/dexdrip/ParakeetHelper.java
index ff32f366ba..37c95db255 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ParakeetHelper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ParakeetHelper.java
@@ -12,11 +12,11 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.NotificationChannels;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.XdripNotificationCompat;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.NotificationChannels;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.XdripNotificationCompat;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
 import com.eveningoutpost.dexdrip.utils.Preferences;
 import com.eveningoutpost.dexdrip.utils.WebAppHelper;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/PhoneKeypadInputActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/PhoneKeypadInputActivity.java
index 1eeb7a3c38..074e04cc89 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/PhoneKeypadInputActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/PhoneKeypadInputActivity.java
@@ -11,8 +11,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.insulin.Insulin;
 import com.eveningoutpost.dexdrip.insulin.InsulinManager;
 import com.eveningoutpost.dexdrip.insulin.MultipleInsulins;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/RegistrationIntentService.java b/app/src/main/java/com/eveningoutpost/dexdrip/RegistrationIntentService.java
index c1f88fc940..acc1eea578 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/RegistrationIntentService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/RegistrationIntentService.java
@@ -12,8 +12,8 @@
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Services.PlusSyncService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.services.PlusSyncService;
 import com.google.android.gms.gcm.GcmNetworkManager;
 import com.google.android.gms.gcm.PeriodicTask;
 import com.google.android.gms.gcm.Task;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Reminders.java b/app/src/main/java/com/eveningoutpost/dexdrip/Reminders.java
index 01d4015acb..e6fdba4318 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Reminders.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Reminders.java
@@ -56,16 +56,16 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Reminder;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.JamorhamShowcaseDrawer;
-import com.eveningoutpost.dexdrip.UtilityModels.NotificationChannels;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
-import com.eveningoutpost.dexdrip.UtilityModels.SpeechUtil;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Reminder;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.JamorhamShowcaseDrawer;
+import com.eveningoutpost.dexdrip.utilitymodels.NotificationChannels;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.SpeechUtil;
 import com.eveningoutpost.dexdrip.profileeditor.DatePickerFragment;
 import com.eveningoutpost.dexdrip.profileeditor.ProfileAdapter;
 import com.eveningoutpost.dexdrip.profileeditor.TimePickerFragment;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareTest.java b/app/src/main/java/com/eveningoutpost/dexdrip/ShareTest.java
index aa818b16df..7b198db8a0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareTest.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ShareTest.java
@@ -1,6 +1,5 @@
 package com.eveningoutpost.dexdrip;
 
-import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
@@ -23,17 +22,17 @@
 import android.widget.Toast;
 
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.ReadDataShare;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.DexShareAttributes;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.HM10Attributes;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.ReadDataShare;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.DexShareAttributes;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.HM10Attributes;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java
index ed31d0d2e6..2864120385 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java
@@ -1,18 +1,16 @@
 package com.eveningoutpost.dexdrip;
 
-import java.text.DateFormat;
 import java.text.MessageFormat;
 import java.util.Date;
 
 import android.app.Dialog;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import android.util.TypedValue;
 import android.view.View;
@@ -20,13 +18,13 @@
 import android.widget.NumberPicker;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Services.MissedReadingService;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.services.MissedReadingService;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 import static com.eveningoutpost.dexdrip.xdrip.gs;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java b/app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java
index b7295f3dff..4cdd5771bd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java
@@ -12,17 +12,17 @@
 import android.widget.Button;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.G5Model.DexSyncKeeper;
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Experience;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.g5model.DexSyncKeeper;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Experience;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.profileeditor.DatePickerFragment;
 import com.eveningoutpost.dexdrip.profileeditor.ProfileAdapter;
 import com.eveningoutpost.dexdrip.profileeditor.TimePickerFragment;
@@ -36,7 +36,7 @@
 import java.util.Date;
 
 import static com.eveningoutpost.dexdrip.Home.startWatchUpdaterService;
-import static com.eveningoutpost.dexdrip.Models.BgReading.AGE_ADJUSTMENT_TIME;
+import static com.eveningoutpost.dexdrip.models.BgReading.AGE_ADJUSTMENT_TIME;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
 
 public class StartNewSensor extends ActivityWithMenu {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/StopSensor.java b/app/src/main/java/com/eveningoutpost/dexdrip/StopSensor.java
index 61072119ed..9f36fa82ef 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/StopSensor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/StopSensor.java
@@ -7,14 +7,14 @@
 import android.view.View;
 import android.widget.Button;
 
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.NanoStatus;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.NanoStatus;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatus.java
index 3f28b4d4f0..6e134eddab 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatus.java
@@ -18,18 +18,18 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.G5Model.Extensions;
-import com.eveningoutpost.dexdrip.G5Model.Transmitter;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Dex_Constants;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.g5model.Extensions;
+import com.eveningoutpost.dexdrip.g5model.Transmitter;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Dex_Constants;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 import java.lang.reflect.Method;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatusFragment.java b/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatusFragment.java
index 8c200440f7..4225a5c77c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatusFragment.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatusFragment.java
@@ -28,21 +28,20 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.G5Model.Extensions;
-import com.eveningoutpost.dexdrip.G5Model.Transmitter;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Dex_Constants;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.SensorStatus;
+import com.eveningoutpost.dexdrip.g5model.Extensions;
+import com.eveningoutpost.dexdrip.g5model.Transmitter;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Dex_Constants;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.SensorStatus;
 import com.eveningoutpost.dexdrip.databinding.ActivitySystemStatusBinding;
 import com.eveningoutpost.dexdrip.ui.MicroStatus;
 import com.eveningoutpost.dexdrip.ui.MicroStatusImpl;
@@ -51,9 +50,6 @@
 import com.google.android.gms.wearable.DataMap;
 
 import java.lang.reflect.Method;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/TaskService.java b/app/src/main/java/com/eveningoutpost/dexdrip/TaskService.java
index a2c05cec69..10bae9dca4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/TaskService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/TaskService.java
@@ -7,8 +7,8 @@
 import android.content.Intent;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.UpdateActivity;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.UpdateActivity;
 import com.google.android.gms.gcm.GcmNetworkManager;
 import com.google.android.gms.gcm.GcmTaskService;
 import com.google.android.gms.gcm.TaskParams;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UsbConnectedActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/UsbConnectedActivity.java
index 92cfa705ec..a23f426c36 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UsbConnectedActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/UsbConnectedActivity.java
@@ -1,10 +1,9 @@
 package com.eveningoutpost.dexdrip;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.SyncingService;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.SyncingService;
 
 public class UsbConnectedActivity extends BaseActivity {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/WidgetUpdateService.java b/app/src/main/java/com/eveningoutpost/dexdrip/WidgetUpdateService.java
index 595d1abb45..a0b830a0b8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/WidgetUpdateService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/WidgetUpdateService.java
@@ -11,8 +11,8 @@
 import android.os.IBinder;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 public class WidgetUpdateService extends Service {
     private static final String TAG = "WidgetUpdateService";
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/CalibrationAbstract.java b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/CalibrationAbstract.java
index 0c2ba6a41d..514de804de 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/CalibrationAbstract.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/CalibrationAbstract.java
@@ -1,10 +1,10 @@
 package com.eveningoutpost.dexdrip.calibrations;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/Datricsae.java b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/Datricsae.java
index e73f6e6254..494b8df163 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/Datricsae.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/Datricsae.java
@@ -2,12 +2,11 @@
 
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.Forecast;
-import com.eveningoutpost.dexdrip.Models.Forecast.PolyTrendLine;
-import com.eveningoutpost.dexdrip.Models.Forecast.TrendLine;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.Forecast;
+import com.eveningoutpost.dexdrip.models.Forecast.PolyTrendLine;
+import com.eveningoutpost.dexdrip.models.Forecast.TrendLine;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/LastSevenUnweightedA.java b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/LastSevenUnweightedA.java
index f2d07a8626..4b3ba387d3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/LastSevenUnweightedA.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/LastSevenUnweightedA.java
@@ -2,9 +2,9 @@
 
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.Forecast.PolyTrendLine;
-import com.eveningoutpost.dexdrip.Models.Forecast.TrendLine;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.Forecast.PolyTrendLine;
+import com.eveningoutpost.dexdrip.models.Forecast.TrendLine;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/NativeCalibrationPipe.java b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/NativeCalibrationPipe.java
index 3ea5ba3a8d..349872a161 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/NativeCalibrationPipe.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/NativeCalibrationPipe.java
@@ -1,15 +1,15 @@
 package com.eveningoutpost.dexdrip.calibrations;
 
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 import com.eveningoutpost.dexdrip.cgm.medtrum.Medtrum;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
 
 /**
  *
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/PluggableCalibration.java b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/PluggableCalibration.java
index 785c08e798..bdd8f95e4f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/PluggableCalibration.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/PluggableCalibration.java
@@ -3,9 +3,9 @@
 import android.preference.ListPreference;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/XDripOriginal.java b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/XDripOriginal.java
index 21f683eb8c..a65a1aa0e7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/XDripOriginal.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/calibrations/XDripOriginal.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.calibrations;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/BackfillAssessor.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/BackfillAssessor.java
index f36d88ab98..a38170b097 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/BackfillAssessor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/BackfillAssessor.java
@@ -2,18 +2,18 @@
 
 import android.util.Pair;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import java.util.List;
 
 import lombok.Setter;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/Medtrum.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/Medtrum.java
index b63a93f32b..389194880c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/Medtrum.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/Medtrum.java
@@ -8,12 +8,12 @@
 
 import android.util.Pair;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.cgm.medtrum.messages.AdvertRx;
 import com.eveningoutpost.dexdrip.cgm.medtrum.messages.AnnexARx;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
@@ -22,7 +22,7 @@
 
 import lombok.Getter;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
 import static com.eveningoutpost.dexdrip.cgm.medtrum.Const.MANUFACTURER_ID;
 import static com.eveningoutpost.dexdrip.cgm.medtrum.Const.SUPPORTED_DEVICES;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/MedtrumCollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/MedtrumCollectionService.java
index fa01b94249..86f91d355a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/MedtrumCollectionService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/MedtrumCollectionService.java
@@ -9,22 +9,22 @@
 import android.util.Pair;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Prediction;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Prediction;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.JamBaseBluetoothService;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.RxBleProvider;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.services.JamBaseBluetoothService;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.RxBleProvider;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.cgm.medtrum.messages.AnnexARx;
 import com.eveningoutpost.dexdrip.cgm.medtrum.messages.AuthRx;
 import com.eveningoutpost.dexdrip.cgm.medtrum.messages.AuthTx;
@@ -59,24 +59,21 @@
 //import rx.Subscription;
 //import rx.schedulers.Schedulers;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
 
-import static com.eveningoutpost.dexdrip.Models.BgReading.bgReadingInsertMedtrum;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.msTill;
-import static com.eveningoutpost.dexdrip.Models.JoH.quietratelimit;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MEDTRUM_SERVICE_FAILOVER_ID;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MEDTRUM_SERVICE_RETRY_ID;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.CRITICAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.GOOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NORMAL;
+import static com.eveningoutpost.dexdrip.models.BgReading.bgReadingInsertMedtrum;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.msTill;
+import static com.eveningoutpost.dexdrip.models.JoH.quietratelimit;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MEDTRUM_SERVICE_FAILOVER_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MEDTRUM_SERVICE_RETRY_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.BAD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.CRITICAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.GOOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NORMAL;
 import static com.eveningoutpost.dexdrip.cgm.medtrum.Const.CGM_CHARACTERISTIC_INDICATE;
 import static com.eveningoutpost.dexdrip.cgm.medtrum.Const.OPCODE_AUTH_REPLY;
 import static com.eveningoutpost.dexdrip.cgm.medtrum.Const.OPCODE_BACK_REPLY;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/Scanner.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/Scanner.java
index 328eece401..c99c5a4664 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/Scanner.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/Scanner.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.cgm.medtrum;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utils.bt.ScanMeister;
 import com.polidea.rxandroidble2.scan.ScanResult;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/TimeKeeper.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/TimeKeeper.java
index 7d8ca3edd9..08776d8fe8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/TimeKeeper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/TimeKeeper.java
@@ -1,10 +1,10 @@
 package com.eveningoutpost.dexdrip.cgm.medtrum;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
 
 /**
  * JamOrHam
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AdvertRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AdvertRx.java
index 1265c311e1..8b1aed41d8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AdvertRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AdvertRx.java
@@ -2,8 +2,8 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.cgm.medtrum.Crypt;
 import com.eveningoutpost.dexdrip.cgm.medtrum.DeviceType;
 import com.eveningoutpost.dexdrip.cgm.medtrum.Medtrum;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AnnexARx.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AnnexARx.java
index 35dec1e10f..d71340c32d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AnnexARx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AnnexARx.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.cgm.medtrum.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.cgm.medtrum.SensorState;
 import com.eveningoutpost.dexdrip.cgm.medtrum.TimeKeeper;
 import com.google.gson.annotations.Expose;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AuthTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AuthTx.java
index 99f65666c9..c91fe1d911 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AuthTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/AuthTx.java
@@ -1,10 +1,10 @@
 package com.eveningoutpost.dexdrip.cgm.medtrum.messages;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.cgm.medtrum.Crypt;
 import com.eveningoutpost.dexdrip.cgm.medtrum.Medtrum;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.tolerantHexStringToByteArray;
+import static com.eveningoutpost.dexdrip.models.JoH.tolerantHexStringToByteArray;
 import static com.eveningoutpost.dexdrip.cgm.medtrum.Const.OPCODE_AUTH_REQST;
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/BackFillRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/BackFillRx.java
index 4afc5e86e2..b162a1dd9a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/BackFillRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/BackFillRx.java
@@ -2,7 +2,7 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.gson.annotations.Expose;
 
 import java.nio.BufferUnderflowException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/BaseMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/BaseMessage.java
index 9abde55fbd..7458550a10 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/BaseMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/BaseMessage.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.cgm.medtrum.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.cgm.medtrum.Const;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/InboundStream.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/InboundStream.java
index dc186cb75e..c5ccda7479 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/InboundStream.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/InboundStream.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.cgm.medtrum.messages;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/TimeTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/TimeTx.java
index e6fe1ce56f..02fb2a833b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/TimeTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/medtrum/messages/TimeTx.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.cgm.medtrum.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.util.Calendar;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/BaseCallback.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/BaseCallback.java
index 8cc4204be4..52fc24f9d9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/BaseCallback.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/BaseCallback.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.cgm.nsfollow;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.store.FastStore;
 
 import lombok.RequiredArgsConstructor;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/EntryProcessor.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/EntryProcessor.java
index 403b9b0d1f..3175010ba7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/EntryProcessor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/EntryProcessor.java
@@ -1,15 +1,15 @@
 package com.eveningoutpost.dexdrip.cgm.nsfollow;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.messages.Entry;
 
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Models.BgReading.SPECIAL_FOLLOWER_PLACEHOLDER;
+import static com.eveningoutpost.dexdrip.models.BgReading.SPECIAL_FOLLOWER_PLACEHOLDER;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
index 0dba1ab025..eb3944db37 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
@@ -1,12 +1,12 @@
 package com.eveningoutpost.dexdrip.cgm.nsfollow;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.NightscoutTreatments;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.NightscoutTreatments;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.messages.Entry;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.utils.NightscoutUrl;
 import com.eveningoutpost.dexdrip.evaluators.MissedReadingsEstimator;
@@ -35,9 +35,9 @@
 import retrofit2.http.Headers;
 import retrofit2.http.Query;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.OkHttpWrapper.enableTls12OnPreLollipop;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.OkHttpWrapper.enableTls12OnPreLollipop;
 import static com.eveningoutpost.dexdrip.cgm.nsfollow.NightscoutFollowService.msg;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
index 71e64b3673..c16f754330 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
@@ -6,15 +6,14 @@
 import android.support.annotation.Nullable;
 import android.text.SpannableString;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.utils.Anticipate;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.framework.BuggySamsung;
@@ -25,10 +24,9 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.NSFollow;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/BaseMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/BaseMessage.java
index 8970092d82..213ab6c2ae 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/BaseMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/BaseMessage.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.cgm.nsfollow.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Entry.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Entry.java
index ff44e6c43b..c509bc0b59 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Entry.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Entry.java
@@ -4,7 +4,7 @@
 
 // Nightscout Entry data item
 
-import com.eveningoutpost.dexdrip.Models.DateUtil;
+import com.eveningoutpost.dexdrip.models.DateUtil;
 import com.google.gson.annotations.Expose;
 
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/utils/NightscoutUrl.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/utils/NightscoutUrl.java
index 31e28883f4..15b4fac717 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/utils/NightscoutUrl.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/utils/NightscoutUrl.java
@@ -8,7 +8,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/EntryProcessor.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/EntryProcessor.java
index 9d6eb461db..1aaa31d5fb 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/EntryProcessor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/EntryProcessor.java
@@ -1,14 +1,14 @@
 package com.eveningoutpost.dexdrip.cgm.sharefollow;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 
 import java.util.Collections;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Models.BgReading.SPECIAL_FOLLOWER_PLACEHOLDER;
+import static com.eveningoutpost.dexdrip.models.BgReading.SPECIAL_FOLLOWER_PLACEHOLDER;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/RetrofitBase.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/RetrofitBase.java
index 332ffc2d94..cbc86e2dba 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/RetrofitBase.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/RetrofitBase.java
@@ -2,7 +2,7 @@
 
 import android.support.annotation.NonNull;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.GzipRequestInterceptor;
 import com.eveningoutpost.dexdrip.tidepool.InfoInterceptor;
 
@@ -15,8 +15,8 @@
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.UtilityModels.OkHttpWrapper.enableTls12OnPreLollipop;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.utilitymodels.OkHttpWrapper.enableTls12OnPreLollipop;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/Session.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/Session.java
index fb66dbc754..ece7bc3b30 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/Session.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/Session.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.cgm.sharefollow;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import java.io.IOException;
 import java.util.List;
@@ -12,7 +12,7 @@
 import lombok.Setter;
 import okhttp3.ResponseBody;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 import static com.eveningoutpost.dexdrip.cgm.sharefollow.ShareConstants.SESSION_ID_VALIDITY_TIME;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareErrorResponse.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareErrorResponse.java
index 441b2e4d76..883c583010 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareErrorResponse.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareErrorResponse.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.cgm.sharefollow;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.gson.annotations.Expose;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowDownload.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowDownload.java
index 2cdab3bf14..5a370afa5c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowDownload.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowDownload.java
@@ -2,11 +2,11 @@
 
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 import com.eveningoutpost.dexdrip.evaluators.MissedReadingsEstimator;
 import com.eveningoutpost.dexdrip.xdrip;
 
@@ -16,7 +16,7 @@
 
 import lombok.Getter;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 import static com.eveningoutpost.dexdrip.cgm.sharefollow.ShareConstants.MAX_RECORDS_TO_ASK_FOR;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowService.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowService.java
index acd59d4604..4abdbb0d00 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowService.java
@@ -6,13 +6,13 @@
 import android.support.annotation.Nullable;
 import android.text.SpannableString;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.utils.Anticipate;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.framework.BuggySamsung;
@@ -23,9 +23,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 import static com.eveningoutpost.dexdrip.cgm.sharefollow.ShareConstants.MAX_RECORDS_TO_ASK_FOR;
 import static com.eveningoutpost.dexdrip.cgm.sharefollow.ShareConstants.NON_US_SHARE_BASE_URL;
 import static com.eveningoutpost.dexdrip.cgm.sharefollow.ShareConstants.US_SHARE_BASE_URL;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareGlucoseRecord.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareGlucoseRecord.java
index 2132712725..77bc73f4db 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareGlucoseRecord.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareGlucoseRecord.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.cgm.sharefollow;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 import com.google.gson.annotations.Expose;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/AlertTracker.java b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/AlertTracker.java
index 89e7eef11b..2c1653958a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/AlertTracker.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/AlertTracker.java
@@ -1,9 +1,9 @@
 package com.eveningoutpost.dexdrip.eassist;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyAssist.java b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyAssist.java
index c92ae88eed..604163faaa 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyAssist.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyAssist.java
@@ -3,12 +3,12 @@
 import android.databinding.ObservableField;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.SMS;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyAssistActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyAssistActivity.java
index cdc0af8179..60dfb72c80 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyAssistActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyAssistActivity.java
@@ -19,13 +19,13 @@
 
 import com.eveningoutpost.dexdrip.BR;
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl;
-import com.eveningoutpost.dexdrip.UtilityModels.PrefsViewString;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PrefsViewImpl;
+import com.eveningoutpost.dexdrip.utilitymodels.PrefsViewString;
 import com.eveningoutpost.dexdrip.databinding.ActivityEmergencyAssistBinding;
 import com.eveningoutpost.dexdrip.ui.dialog.GenericConfirmDialog;
 import com.eveningoutpost.dexdrip.utils.LocationHelper;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyContact.java b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyContact.java
index b900493206..fcabeb8edd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyContact.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/EmergencyContact.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.eassist;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.google.gson.annotations.Expose;
 import com.google.gson.reflect.TypeToken;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/GetLocation.java b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/GetLocation.java
index ccac535cb0..d45f084b3a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/eassist/GetLocation.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/eassist/GetLocation.java
@@ -10,9 +10,9 @@
 import android.os.Looper;
 import android.support.v4.app.ActivityCompat;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.location.LocationCallback;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/evaluators/MissedReadingsEstimator.java b/app/src/main/java/com/eveningoutpost/dexdrip/evaluators/MissedReadingsEstimator.java
index ee8a8aa0aa..c6a04ea41b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/evaluators/MissedReadingsEstimator.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/evaluators/MissedReadingsEstimator.java
@@ -2,11 +2,11 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 
 public class MissedReadingsEstimator {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/evaluators/PersistentHigh.java b/app/src/main/java/com/eveningoutpost/dexdrip/evaluators/PersistentHigh.java
index 624eae47d2..0bc4ab48e5 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/evaluators/PersistentHigh.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/evaluators/PersistentHigh.java
@@ -9,22 +9,22 @@
  */
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.Date;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.niceTimeScalar;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.niceTimeScalar;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
 
 public class PersistentHigh {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeRxMessage.java
similarity index 73%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeRxMessage.java
index 952979352e..a23907c6a6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeRxMessage.java
@@ -1,10 +1,9 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
-import java.nio.ByteOrder;
 import java.util.Arrays;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeTxMessage.java
similarity index 63%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeTxMessage.java
index 846d06d738..a65da32dc3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeTxMessage.java
@@ -1,11 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
-import com.eveningoutpost.dexdrip.G5Model.TransmitterMessage;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+package com.eveningoutpost.dexdrip.g5model;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 /**
  * Created by joeginley on 3/16/16.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthRequestTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthRequestTxMessage.java
similarity index 90%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthRequestTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthRequestTxMessage.java
index 338ef21819..cb0810debe 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthRequestTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthRequestTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthStatusRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthStatusRxMessage.java
similarity index 83%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthStatusRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthStatusRxMessage.java
index f8116de8b4..9c24870228 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthStatusRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthStatusRxMessage.java
@@ -1,8 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillRxMessage.java
similarity index 93%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillRxMessage.java
index d85b46d868..914d49f986 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillStream.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillStream.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillStream.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillStream.java
index 1b9f9d9f4b..ba1fcfbf26 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillStream.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillStream.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // created by jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -14,7 +14,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import static com.eveningoutpost.dexdrip.G5Model.DexTimeKeeper.fromDexTimeCached;
+import static com.eveningoutpost.dexdrip.g5model.DexTimeKeeper.fromDexTimeCached;
 
 public class BackFillStream extends BaseMessage {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillTxMessage.java
similarity index 82%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillTxMessage.java
index ceee90794e..69eee55a40 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillTxMessage.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
-import static com.eveningoutpost.dexdrip.G5Model.DexTimeKeeper.getDexTime;
+import static com.eveningoutpost.dexdrip.g5model.DexTimeKeeper.getDexTime;
 
 // created by jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseAuthChallengeTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseAuthChallengeTxMessage.java
similarity index 71%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseAuthChallengeTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseAuthChallengeTxMessage.java
index 7b7112e3d4..010745aa54 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseAuthChallengeTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseAuthChallengeTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseGlucoseRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseGlucoseRxMessage.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseGlucoseRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseGlucoseRxMessage.java
index d118096b0b..bdddecd2fb 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseGlucoseRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseGlucoseRxMessage.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import lombok.NoArgsConstructor;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseMessage.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseMessage.java
index 2a5ba97ed0..ab52e15fbd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoRxMessage.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoRxMessage.java
index d3f063bb1c..e0b2d8758d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoRxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoTxMessage.java
similarity index 64%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoTxMessage.java
index ad325c374c..1bf4be19c7 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 /**
  * Created by jamorham on 25/11/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BluetoothServices.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BluetoothServices.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BluetoothServices.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BluetoothServices.java
index 1e77980c28..9a41a2d902 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BluetoothServices.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BluetoothServices.java
@@ -1,6 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
-
-import android.util.SparseArray;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.util.HashMap;
 import java.util.UUID;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BondRequestTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BondRequestTxMessage.java
similarity index 80%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BondRequestTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/BondRequestTxMessage.java
index 34c735f7bd..40d004d48b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BondRequestTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/BondRequestTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CRC.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/CRC.java
similarity index 85%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CRC.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/CRC.java
index b4eadfedb0..c928ae3d30 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CRC.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/CRC.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.CRC16;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.CRC16;
 
 /**
  * Created by jcostik1 on 3/24/16.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateRxMessage.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateRxMessage.java
index 96981546fa..fef1aa5e08 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import com.eveningoutpost.dexdrip.R;
 import java.nio.ByteBuffer;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateTxMessage.java
similarity index 77%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateTxMessage.java
index f2abded7b9..be9a885715 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateTxMessage.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 
 // created by jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 public class CalibrateTxMessage extends BaseMessage {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrationState.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrationState.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrationState.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrationState.java
index 19f5160dee..12e87120a1 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrationState.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrationState.java
@@ -1,15 +1,15 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // created by jamorham
 
 import android.util.SparseArray;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.common.collect.ImmutableSet;
 
 import lombok.Getter;
 
-import static com.eveningoutpost.dexdrip.Services.G5CollectionService.TAG;
+import static com.eveningoutpost.dexdrip.services.G5CollectionService.TAG;
 
 public enum CalibrationState {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexResetHelper.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexResetHelper.java
similarity index 69%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexResetHelper.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexResetHelper.java
index 690a0d5348..31c1189daa 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexResetHelper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexResetHelper.java
@@ -1,13 +1,13 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.CompatibleApps;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.CompatibleApps;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.CompatibleApps.createActionIntent;
-import static com.eveningoutpost.dexdrip.UtilityModels.CompatibleApps.createChoiceIntent;
-import static com.eveningoutpost.dexdrip.UtilityModels.CompatibleApps.showNotification;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.DEX_BASE_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.CompatibleApps.createActionIntent;
+import static com.eveningoutpost.dexdrip.utilitymodels.CompatibleApps.createChoiceIntent;
+import static com.eveningoutpost.dexdrip.utilitymodels.CompatibleApps.showNotification;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.DEX_BASE_ID;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSessionKeeper.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSessionKeeper.java
similarity index 85%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSessionKeeper.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSessionKeeper.java
index ce30ec9dc0..a1c0554cc2 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSessionKeeper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSessionKeeper.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSyncKeeper.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSyncKeeper.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSyncKeeper.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSyncKeeper.java
index 4f0f19780b..2f73b15da0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSyncKeeper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSyncKeeper.java
@@ -1,13 +1,13 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 
 public class DexSyncKeeper {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexTimeKeeper.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexTimeKeeper.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
index 64c48bed64..5ba6cd4373 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexTimeKeeper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 /**
  * Created by jamorham on 25/11/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DisconnectTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DisconnectTxMessage.java
similarity index 68%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DisconnectTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/DisconnectTxMessage.java
index 8916813304..87296e21b1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DisconnectTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DisconnectTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseRxMessage.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseRxMessage.java
index cf480f5fa1..e3f4465662 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseRxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseTxMessage.java
similarity index 88%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseTxMessage.java
index 21ea09fdd3..ebb1320da4 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Extensions.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Extensions.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Extensions.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/Extensions.java
index a5cfddca45..3fc84461f8 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Extensions.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Extensions.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 /**
  * Created by joeginley on 3/19/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/F2DUnknownRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/F2DUnknownRxMessage.java
similarity index 81%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/F2DUnknownRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/F2DUnknownRxMessage.java
index 3d6b6e20d9..9336d3a64d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/F2DUnknownRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/F2DUnknownRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FastCRC16.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/FastCRC16.java
index ff5193f46d..fbd5514863 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FastCRC16.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/FirmwareCapability.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
similarity index 80%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/FirmwareCapability.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
index 81e44ac8e8..91d4bf6d8e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/FirmwareCapability.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
@@ -1,12 +1,10 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.google.common.collect.ImmutableSet;
 
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.getRawFirmwareVersionString;
-
 public class FirmwareCapability {
 
     private static final ImmutableSet<String> KNOWN_G5_FIRMWARES = ImmutableSet.of("1.0.0.13", "1.0.0.17", "1.0.4.10", "1.0.4.12");
@@ -63,31 +61,31 @@ static boolean isFirmwarePreemptiveRestartCapable(final String version) {
     }
 
     public static boolean isTransmitterPredictiveCapable(final String tx_id) {
-        return isG6Firmware(getRawFirmwareVersionString(tx_id));
+        return isG6Firmware(Ob1G5StateMachine.getRawFirmwareVersionString(tx_id));
     }
 
     public static boolean isTransmitterG5(final String tx_id) {
-        return isG5Firmware(getRawFirmwareVersionString(tx_id));
+        return isG5Firmware(Ob1G5StateMachine.getRawFirmwareVersionString(tx_id));
     }
 
     public static boolean isTransmitterG6(final String tx_id) {
-        return isG6Firmware(getRawFirmwareVersionString(tx_id));
+        return isG6Firmware(Ob1G5StateMachine.getRawFirmwareVersionString(tx_id));
     }
 
     public static boolean isTransmitterG6Rev2(final String tx_id) {
-        return isG6Rev2(getRawFirmwareVersionString(tx_id));
+        return isG6Rev2(Ob1G5StateMachine.getRawFirmwareVersionString(tx_id));
     }
 
     public static boolean isTransmitterTimeTravelCapable(final String tx_id) {
-        return isFirmwareTimeTravelCapable(getRawFirmwareVersionString(tx_id));
+        return isFirmwareTimeTravelCapable(Ob1G5StateMachine.getRawFirmwareVersionString(tx_id));
     }
 
     public static boolean isTransmitterRawCapable(final String tx_id) {
-        return isFirmwareRawCapable(getRawFirmwareVersionString(tx_id));
+        return isFirmwareRawCapable(Ob1G5StateMachine.getRawFirmwareVersionString(tx_id));
     }
 
     public static boolean isTransmitterPreemptiveRestartCapable(final String tx_id) {
-        return isFirmwarePreemptiveRestartCapable(getRawFirmwareVersionString(tx_id));
+        return isFirmwarePreemptiveRestartCapable(Ob1G5StateMachine.getRawFirmwareVersionString(tx_id));
     }
 
     static long getWarmupPeriodForVersion(final String version) {
@@ -95,6 +93,6 @@ static long getWarmupPeriodForVersion(final String version) {
     }
 
     public static long getWarmupPeriod(final String tx_id) {
-        return getWarmupPeriod(getRawFirmwareVersionString(tx_id));
+        return getWarmupPeriod(Ob1G5StateMachine.getRawFirmwareVersionString(tx_id));
     }
 }
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/G6CalibrationParameters.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/G6CalibrationParameters.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/G6CalibrationParameters.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/G6CalibrationParameters.java
index 5bf565e25d..458bc13a25 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/G6CalibrationParameters.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/G6CalibrationParameters.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import lombok.Getter;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseRxMessage.java
similarity index 90%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseRxMessage.java
index 23ee8fb4d8..d0f2800b8d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseRxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseTxMessage.java
similarity index 63%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseTxMessage.java
index 57e6eb988f..f2fc51ffae 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 /**
  * Created by jamorham on 25/11/2016.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/InvalidRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/InvalidRxMessage.java
similarity index 90%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/InvalidRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/InvalidRxMessage.java
index 70de647e1f..15c4deba8a 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/InvalidRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/InvalidRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/KeepAliveTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/KeepAliveTxMessage.java
similarity index 75%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/KeepAliveTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/KeepAliveTxMessage.java
index f56f30d383..0c293268c2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/KeepAliveTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/KeepAliveTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1G5StateMachine.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1G5StateMachine.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
index 2882b49915..24a6390179 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1G5StateMachine.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothGatt;
@@ -6,27 +6,27 @@
 import android.os.PowerManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Prediction;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Prediction;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BroadcastGlucose;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.NotificationChannels;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BroadcastGlucose;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.NotificationChannels;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
 import com.eveningoutpost.dexdrip.utils.bt.Mimeograph;
@@ -58,26 +58,26 @@
 
 import io.reactivex.schedulers.Schedulers;
 
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.Authentication;
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.Control;
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.ProbablyBackfill;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.pratelimit;
-import static com.eveningoutpost.dexdrip.Models.JoH.tsl;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_BATTERY_FROM_MARKER;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_BATTERY_LEVEL_MARKER;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_BATTERY_MARKER;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_BATTERY_WEARABLE_SEND;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_FIRMWARE_MARKER;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.android_wear;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.getTransmitterID;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.onlyUsingNativeMode;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.wear_broadcast;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.DAY_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.SECOND_IN_MS;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.Authentication;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.Control;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.ProbablyBackfill;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.pratelimit;
+import static com.eveningoutpost.dexdrip.models.JoH.tsl;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_BATTERY_FROM_MARKER;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_BATTERY_LEVEL_MARKER;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_BATTERY_MARKER;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_BATTERY_WEARABLE_SEND;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_FIRMWARE_MARKER;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.android_wear;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.getTransmitterID;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.onlyUsingNativeMode;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.wear_broadcast;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.DAY_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.SECOND_IN_MS;
 import static com.eveningoutpost.dexdrip.utils.bt.Helper.getStatusName;
 
 /*import com.polidea.rxandroidble.RxBleConnection;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1Work.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1Work.java
similarity index 89%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1Work.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1Work.java
index d202f9fe9c..53e1a1473a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1Work.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1Work.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.annotations.Expose;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/RawScaling.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/RawScaling.java
similarity index 83%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/RawScaling.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/RawScaling.java
index 42cae52043..bdc240abe7 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/RawScaling.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/RawScaling.java
@@ -1,9 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.usingG6;
-
 public class RawScaling {
 
     public enum DType {
@@ -22,7 +20,7 @@ public static double scale(final long raw, final DType version, final boolean fi
     }
 
     public static double scale(final long raw, final String transmitter_id, final boolean filtered) {
-        final boolean g6 = usingG6();
+        final boolean g6 = Ob1G5StateMachine.usingG6();
 
         if (!g6) {
             return scale(raw, DType.G5, filtered);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/ResetTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/ResetTxMessage.java
similarity index 61%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/ResetTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/ResetTxMessage.java
index 063a432fb2..718c759752 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/ResetTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/ResetTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorDays.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorDays.java
similarity index 87%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorDays.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorDays.java
index e8283e57b0..5e8154fa8d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorDays.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorDays.java
@@ -1,13 +1,13 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 
 import android.text.SpannableString;
 
-import com.eveningoutpost.dexdrip.Models.Sensor;
+import com.eveningoutpost.dexdrip.models.Sensor;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight;
 import com.eveningoutpost.dexdrip.ui.helpers.Span;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.xdrip;
@@ -20,14 +20,13 @@
 import lombok.Getter;
 import lombok.val;
 
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.getFirmwareXDetails;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.roundDouble;
-import static com.eveningoutpost.dexdrip.Models.JoH.tsl;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.usingG6;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.getTransmitterID;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.usingNativeMode;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.DAY_IN_MS;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.roundDouble;
+import static com.eveningoutpost.dexdrip.models.JoH.tsl;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.usingG6;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.getTransmitterID;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.usingNativeMode;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.DAY_IN_MS;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getDexCollectionType;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.hasDexcomRaw;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.hasLibre;
@@ -77,7 +76,7 @@ public static SensorDays get(final DexCollectionType type, final String tx_id) {
         } else if (hasDexcomRaw(type)) {
             ths.strategy = USE_DEXCOM_STRATEGY;
             val vr2 = (VersionRequest2RxMessage)
-                    getFirmwareXDetails(tx_id, 2);
+                    Ob1G5StateMachine.getFirmwareXDetails(tx_id, 2);
             if (vr2 != null) {
                 ths.period = Constants.DAY_IN_MS * vr2.typicalSensorDays;
             } else {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorRxMessage.java
similarity index 81%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorRxMessage.java
index 6c6c4ec8d0..c5a674a192 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorRxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorTxMessage.java
similarity index 65%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorTxMessage.java
index 570370415d..3a83363e6d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorTxMessage.java
@@ -1,11 +1,9 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 /**
  * Created by jcostik1 on 3/26/16.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartRxMessage.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartRxMessage.java
index 8c8eeb41f1..714f474846 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartTxMessage.java
similarity index 92%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartTxMessage.java
index 90d557b722..098721587f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopRxMessage.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopRxMessage.java
index f8ae444e12..2867be169d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopTxMessage.java
similarity index 85%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopTxMessage.java
index 9fd46c0c5c..492e0447a7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopTxMessage.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 // created by jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TimeTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TimeTxMessage.java
similarity index 78%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TimeTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/TimeTxMessage.java
index ff6f374240..e30054546d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TimeTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TimeTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Transmitter.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Transmitter.java
similarity index 83%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Transmitter.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/Transmitter.java
index f7b47c16b6..ab05035a55 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Transmitter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Transmitter.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 /**
  * Created by joeginley on 3/19/16.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterMessage.java
similarity index 90%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterMessage.java
index 211cbf2f9b..8e5f5e78d6 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterStatus.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterStatus.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterStatus.java
index 0272d86a86..e2ff9b931d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterStatus.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 /**
  * Created by joeginley on 3/28/16.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeRxMessage.java
similarity index 94%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeRxMessage.java
index ac824b2049..19ba115a58 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeRxMessage.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeTxMessage.java
similarity index 90%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeTxMessage.java
index 9f11c37ddf..72c009bbd7 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/UnbondRequestTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/UnbondRequestTxMessage.java
similarity index 87%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/UnbondRequestTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/UnbondRequestTxMessage.java
index e7470a8c4d..15f7562352 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/UnbondRequestTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/UnbondRequestTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest1RxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest1RxMessage.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest1RxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest1RxMessage.java
index 48c2bbf322..d70d515f7d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest1RxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest1RxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest2RxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest2RxMessage.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest2RxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest2RxMessage.java
index 20633106d5..6361e12989 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest2RxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest2RxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestRxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestRxMessage.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestRxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestRxMessage.java
index 30f7ecd3ca..dcbc5672db 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestRxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestTxMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestTxMessage.java
similarity index 84%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestTxMessage.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestTxMessage.java
index a8c791ef97..14d2360721 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestTxMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 /**
  * Created by jamorham on 25/11/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/BTGlucoseMeterActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/BTGlucoseMeterActivity.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/BTGlucoseMeterActivity.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/BTGlucoseMeterActivity.java
index 659f48a7aa..047bd34b2c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/BTGlucoseMeterActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/BTGlucoseMeterActivity.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter;
+package com.eveningoutpost.dexdrip.glucosemeter;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -25,17 +25,17 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.BluetoothGlucoseMeter;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.services.BluetoothGlucoseMeter;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.ListActivityWithMenu;
 import com.eveningoutpost.dexdrip.utils.LocationHelper;
 
 import java.util.ArrayList;
 
-import static com.eveningoutpost.dexdrip.Services.BluetoothGlucoseMeter.start_forget;
+import static com.eveningoutpost.dexdrip.services.BluetoothGlucoseMeter.start_forget;
 
 /**
  * Created by jamorham on 09/12/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/BluetoothCHelper.java b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/BluetoothCHelper.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/BluetoothCHelper.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/BluetoothCHelper.java
index c6bf9ce9dd..2359d6d298 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/BluetoothCHelper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/BluetoothCHelper.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter;
+package com.eveningoutpost.dexdrip.glucosemeter;
 
 /**
  * Created by jamorham on 07/12/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/CurrentTimeRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/CurrentTimeRx.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/CurrentTimeRx.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/CurrentTimeRx.java
index f78bcd4714..cedf201d52 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/CurrentTimeRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/CurrentTimeRx.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter;
+package com.eveningoutpost.dexdrip.glucosemeter;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/GlucoseReadingRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/GlucoseReadingRx.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/GlucoseReadingRx.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/GlucoseReadingRx.java
index 9439c93002..c5cdeeb963 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/GlucoseReadingRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/GlucoseReadingRx.java
@@ -1,7 +1,6 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter;
+package com.eveningoutpost.dexdrip.glucosemeter;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/RecordsCmdTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/RecordsCmdTx.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/RecordsCmdTx.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/RecordsCmdTx.java
index dbd65e53ee..8707915e39 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/RecordsCmdTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/RecordsCmdTx.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter;
+package com.eveningoutpost.dexdrip.glucosemeter;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/VerioHelper.java b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/VerioHelper.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/VerioHelper.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/VerioHelper.java
index abcc8b4ecb..455c3954fc 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/VerioHelper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/VerioHelper.java
@@ -1,17 +1,17 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter;
+package com.eveningoutpost.dexdrip.glucosemeter;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.BluetoothGlucoseMeter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.BluetoothGlucoseMeter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.UUID;
 
-import static com.eveningoutpost.dexdrip.Services.BluetoothGlucoseMeter.mBluetoothDeviceAddress;
-import static com.eveningoutpost.dexdrip.Services.BluetoothGlucoseMeter.statusUpdate;
+import static com.eveningoutpost.dexdrip.services.BluetoothGlucoseMeter.mBluetoothDeviceAddress;
+import static com.eveningoutpost.dexdrip.services.BluetoothGlucoseMeter.statusUpdate;
 import static com.eveningoutpost.dexdrip.utils.CRC16ccitt.crc16ccitt;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/ContextRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/ContextRx.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/ContextRx.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/ContextRx.java
index 492f524e49..e7960f89b3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/ContextRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/ContextRx.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter.caresens;
+package com.eveningoutpost.dexdrip.glucosemeter.caresens;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/TimeTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/TimeTx.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/TimeTx.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/TimeTx.java
index 44da222102..9341f0c6ed 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/TimeTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/TimeTx.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter.caresens;
+package com.eveningoutpost.dexdrip.glucosemeter.caresens;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRC16.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRC16.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRC16.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRC16.java
index ec5092c6ac..c184aab4a6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRC16.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRC16.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 // This code and this particular library are from the NightScout android uploader
 // Check them out here: https://github.com/nightscout/android-uploader
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRCFailRuntimeException.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRCFailRuntimeException.java
similarity index 85%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRCFailRuntimeException.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRCFailRuntimeException.java
index 9f7fdb1a7b..7ceed1baaa 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRCFailRuntimeException.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRCFailRuntimeException.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 // This code and this particular library are from the NightScout android uploader
 // Check them out here: https://github.com/nightscout/android-uploader
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Dex_Constants.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Dex_Constants.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Dex_Constants.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Dex_Constants.java
index b659635459..997f60ab9d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Dex_Constants.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Dex_Constants.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 // This code and this particular library are from the NightScout android uploader
 // Check them out here: https://github.com/nightscout/android-uploader
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/PacketBuilder.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/PacketBuilder.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/PacketBuilder.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/PacketBuilder.java
index 72134cfa62..2c38898ef8 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/PacketBuilder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/PacketBuilder.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadData.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadData.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadData.java
index c49e6b212b..e102e09aae 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadData.java
@@ -1,16 +1,16 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.GenericXMLRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.MeterRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.PageHeader;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver.UsbSerialDriver;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.GenericXMLRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.MeterRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.PageHeader;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver.UsbSerialDriver;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import org.w3c.dom.Element;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadDataShare.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadDataShare.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadDataShare.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadDataShare.java
index 2305645d9e..85c638b1a2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadDataShare.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadDataShare.java
@@ -1,14 +1,14 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.GenericXMLRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.MeterRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.PageHeader;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
-import com.eveningoutpost.dexdrip.Services.DexShareCollectionService;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.GenericXMLRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.MeterRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.PageHeader;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.services.DexShareCollectionService;
 import com.eveningoutpost.dexdrip.ShareTest;
 
 import org.w3c.dom.Element;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadPacket.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadPacket.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadPacket.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadPacket.java
index f84f20c61f..949aa8d8a0 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadPacket.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadPacket.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/SyncingService.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/SyncingService.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/SyncingService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/SyncingService.java
index c06b48aedb..8b28de29ba 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/SyncingService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/SyncingService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 import android.app.IntentService;
 import android.content.Context;
@@ -10,19 +10,19 @@
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.GlucoseDataSet;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.MeterRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver.CdcAcmSerialDriver;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver.ProbeTable;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver.UsbSerialDriver;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver.UsbSerialProber;
-import com.eveningoutpost.dexdrip.Models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.GlucoseDataSet;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.MeterRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver.CdcAcmSerialDriver;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver.ProbeTable;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver.UsbSerialDriver;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver.UsbSerialProber;
+import com.eveningoutpost.dexdrip.models.Calibration;
 
 import org.json.JSONArray;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Utils.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Utils.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Utils.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Utils.java
index ca698538dc..81e76dca6a 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Utils.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Utils.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.GlucoseDataSet;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.GlucoseDataSet;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
 
 import java.util.Date;
 import java.util.TimeZone;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalRecord.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalRecord.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalRecord.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalRecord.java
index 8353cea430..bff6cd027b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalRecord.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalSubrecord.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalSubrecord.java
similarity index 88%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalSubrecord.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalSubrecord.java
index be2f954223..3b85f054e0 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalSubrecord.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalSubrecord.java
@@ -1,8 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Utils;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Utils;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/EGVRecord.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/EGVRecord.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/EGVRecord.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/EGVRecord.java
index 6d2c378e55..9f276023b1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/EGVRecord.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/EGVRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Dex_Constants;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Dex_Constants;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericTimestampRecord.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericTimestampRecord.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericTimestampRecord.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericTimestampRecord.java
index d1b09d4c42..da4fa39c43 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericTimestampRecord.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericTimestampRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Utils;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Utils;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericXMLRecord.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericXMLRecord.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericXMLRecord.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericXMLRecord.java
index 73137ac4ae..67729f72e0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericXMLRecord.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericXMLRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -8,7 +8,7 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.Serializable;
+
 import java.io.StringReader;
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GlucoseDataSet.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GlucoseDataSet.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GlucoseDataSet.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GlucoseDataSet.java
index 13bbbb3999..8e665241ca 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GlucoseDataSet.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GlucoseDataSet.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Dex_Constants;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Dex_Constants;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/MeterRecord.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/MeterRecord.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/MeterRecord.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/MeterRecord.java
index 3187923883..2a313808d0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/MeterRecord.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/MeterRecord.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/PageHeader.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/PageHeader.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/PageHeader.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/PageHeader.java
index a831d4edf4..9db81c6b10 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/PageHeader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/PageHeader.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.CRC16;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.CRCFailRuntimeException;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Dex_Constants;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Utils;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.CRC16;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.CRCFailRuntimeException;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Dex_Constants;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Utils;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/SensorRecord.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/SensorRecord.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/SensorRecord.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/SensorRecord.java
index 033ad6f53f..9750d62c31 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/SensorRecord.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/SensorRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/BuildInfo.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/BuildInfo.java
similarity index 87%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/BuildInfo.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/BuildInfo.java
index 012c47b981..d4a75c0315 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/BuildInfo.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/BuildInfo.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial;
 
 /**
  * Static container of information about this library.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/CdcAcmSerialDriver.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/CdcAcmSerialDriver.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/CdcAcmSerialDriver.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/CdcAcmSerialDriver.java
index 2aadb1d3b2..c5f837e384 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/CdcAcmSerialDriver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/CdcAcmSerialDriver.java
@@ -19,7 +19,7 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.hardware.usb.UsbConstants;
 import android.hardware.usb.UsbDevice;
@@ -28,7 +28,7 @@
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbRequest;
 import android.os.Build;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/CommonUsbSerialPort.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/CommonUsbSerialPort.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/CommonUsbSerialPort.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/CommonUsbSerialPort.java
index eb0adf28f2..88800fcda0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/CommonUsbSerialPort.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/CommonUsbSerialPort.java
@@ -19,7 +19,7 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/Cp21xxSerialDriver.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/Cp21xxSerialDriver.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/Cp21xxSerialDriver.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/Cp21xxSerialDriver.java
index 535e18bfa5..ef99bff178 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/Cp21xxSerialDriver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/Cp21xxSerialDriver.java
@@ -19,7 +19,7 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.hardware.usb.UsbConstants;
 import android.hardware.usb.UsbDevice;
@@ -27,7 +27,7 @@
 import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbRequest;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/FtdiSerialDriver.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/FtdiSerialDriver.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/FtdiSerialDriver.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/FtdiSerialDriver.java
index 7506629cd4..611ee35cd8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/FtdiSerialDriver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/FtdiSerialDriver.java
@@ -19,16 +19,16 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.hardware.usb.UsbConstants;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
 import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbRequest;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/ProbeTable.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/ProbeTable.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/ProbeTable.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/ProbeTable.java
index 001943dfcf..30e4100d67 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/ProbeTable.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/ProbeTable.java
@@ -19,7 +19,7 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.util.Pair;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/ProlificSerialDriver.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/ProlificSerialDriver.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/ProlificSerialDriver.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/ProlificSerialDriver.java
index d666d185eb..947cbd640a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/ProlificSerialDriver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/ProlificSerialDriver.java
@@ -25,7 +25,7 @@
  * See https://github.com/eblot/pyftdi
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.hardware.usb.UsbConstants;
 import android.hardware.usb.UsbDevice;
@@ -33,7 +33,7 @@
 import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbRequest;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbId.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbId.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbId.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbId.java
index c2467b1b45..ae1a1a34e7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbId.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbId.java
@@ -19,7 +19,7 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 /**
  * Registry of USB vendor/product ID constants.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialDriver.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialDriver.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialDriver.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialDriver.java
index 08ac5e57fe..908a6185a9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialDriver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialDriver.java
@@ -19,7 +19,7 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.hardware.usb.UsbDevice;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialPort.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialPort.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialPort.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialPort.java
index 8131baa8fc..1b4d3116a6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialPort.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialPort.java
@@ -19,7 +19,7 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.hardware.usb.UsbDeviceConnection;
 import android.hardware.usb.UsbManager;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialProber.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialProber.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialProber.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialProber.java
index 54507ce080..97e4133462 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialProber.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialProber.java
@@ -19,12 +19,12 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialRuntimeException.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialRuntimeException.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialRuntimeException.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialRuntimeException.java
index e4e971090b..853c6522ca 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/driver/UsbSerialRuntimeException.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/driver/UsbSerialRuntimeException.java
@@ -17,7 +17,7 @@
  * USA.
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver;
 
 /**
  * Generic unchecked exception for the usbserial package.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/HexDump.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/HexDump.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/HexDump.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/HexDump.java
index 023e41a80c..cb456e54a9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/HexDump.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/HexDump.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.util;
 
 /**
  * Clone of Android's HexDump class, for use in debugging. Cosmetic changes
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/SerialInputOutputManager.java b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/SerialInputOutputManager.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/SerialInputOutputManager.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/SerialInputOutputManager.java
index 8267c48159..8ddfe8aa1d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/SerialInputOutputManager.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/SerialInputOutputManager.java
@@ -19,12 +19,12 @@
  * Project home page: https://github.com/mik3y/usb-serial-for-android
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.util;
 
 import android.hardware.usb.UsbRequest;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver.UsbSerialPort;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.driver.UsbSerialPort;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/InfluxDB/InfluxDBUploader.java b/app/src/main/java/com/eveningoutpost/dexdrip/influxdb/InfluxDBUploader.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/InfluxDB/InfluxDBUploader.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/influxdb/InfluxDBUploader.java
index d714a1f32c..0feb5f1c6e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/InfluxDB/InfluxDBUploader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/influxdb/InfluxDBUploader.java
@@ -4,15 +4,15 @@
  */
 
 
-package com.eveningoutpost.dexdrip.InfluxDB;
+package com.eveningoutpost.dexdrip.influxdb;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import org.influxdb.InfluxDB;
 import org.influxdb.InfluxDBFactory;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinManager.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinManager.java
index bc7d23b02b..0efd068352 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinManager.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinManager.java
@@ -3,11 +3,10 @@
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/MultipleInsulins.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/MultipleInsulins.java
index 89cf2714b0..77e542c0bf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/MultipleInsulins.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/MultipleInsulins.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.insulin;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 public class MultipleInsulins {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/FindNearby.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/FindNearby.java
index 899172e368..a9abee6e9b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/FindNearby.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/FindNearby.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.insulin.inpen;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.utils.BtCallBack;
 import com.eveningoutpost.dexdrip.utils.bt.ScanMeister;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPen.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPen.java
index 88f3299c56..50b220e679 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPen.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPen.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.insulin.inpen;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenEntry.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenEntry.java
index beb01412ea..522e600747 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenEntry.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenEntry.java
@@ -1,9 +1,9 @@
 package com.eveningoutpost.dexdrip.insulin.inpen;
 
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenScanMeister.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenScanMeister.java
index 9bdd11c7cd..0d77477460 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenScanMeister.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenScanMeister.java
@@ -2,11 +2,11 @@
 
 import android.os.ParcelUuid;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.eveningoutpost.dexdrip.utils.bt.ScanMeister;
 import com.eveningoutpost.dexdrip.utils.bt.Subscription;
 import com.polidea.rxandroidble2.scan.ScanFilter;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenService.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenService.java
index 1363efea41..fe7394cf22 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/InPenService.java
@@ -9,16 +9,16 @@
 import android.os.Build;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.PenData;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.PenData;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.insulin.inpen.messages.AdvertRx;
 import com.eveningoutpost.dexdrip.insulin.inpen.messages.BatteryRx;
 import com.eveningoutpost.dexdrip.insulin.inpen.messages.BondTx;
@@ -52,30 +52,27 @@
 
 //import rx.schedulers.Schedulers;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
 
 import static android.bluetooth.BluetoothDevice.BOND_BONDED;
 import static android.bluetooth.BluetoothDevice.BOND_NONE;
-import static com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump.dumpHexString;
-import static com.eveningoutpost.dexdrip.Models.JoH.bytesToHex;
-import static com.eveningoutpost.dexdrip.Models.JoH.dateTimeText;
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.Models.JoH.hourMinuteString;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.quietratelimit;
-import static com.eveningoutpost.dexdrip.Models.JoH.ratelimit;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CLOSE;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.INIT;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.INPEN_SERVICE_FAILOVER_ID;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.SECOND_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.GOOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NORMAL;
+import static com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump.dumpHexString;
+import static com.eveningoutpost.dexdrip.models.JoH.bytesToHex;
+import static com.eveningoutpost.dexdrip.models.JoH.dateTimeText;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.hourMinuteString;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.quietratelimit;
+import static com.eveningoutpost.dexdrip.models.JoH.ratelimit;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CLOSE;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.INIT;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.INPEN_SERVICE_FAILOVER_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.SECOND_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.BAD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.GOOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NORMAL;
 import static com.eveningoutpost.dexdrip.insulin.inpen.Constants.AUTHENTICATION;
 import static com.eveningoutpost.dexdrip.insulin.inpen.Constants.BATTERY;
 import static com.eveningoutpost.dexdrip.insulin.inpen.Constants.BONDCONTROL;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BaseRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BaseRx.java
index 882541dc51..42d1ab9ad6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BaseRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BaseRx.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.insulin.inpen.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.utils.math.SkeletonCRC16;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BaseTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BaseTx.java
index 3c19cab9d1..fb47ba1bac 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BaseTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BaseTx.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.insulin.inpen.messages;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
 import com.eveningoutpost.dexdrip.insulin.inpen.Constants;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BondTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BondTx.java
index 09eb4ccb2e..a125bc10a0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BondTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/BondTx.java
@@ -2,7 +2,7 @@
 
 import android.annotation.SuppressLint;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.insulin.inpen.Constants;
 
 import java.security.SecureRandom;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/RecordRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/RecordRx.java
index e719bcb1e4..f21bc8ab8d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/RecordRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/RecordRx.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.insulin.inpen.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/TimeRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/TimeRx.java
index ef32c2f966..95d9907d8d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/TimeRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/inpen/messages/TimeRx.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.insulin.inpen.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/Pendiq.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/Pendiq.java
index d10979f67e..ce0cdef3ee 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/Pendiq.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/Pendiq.java
@@ -6,9 +6,9 @@
 
 import android.content.Intent;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import static com.eveningoutpost.dexdrip.insulin.pendiq.Const.MINIMUM_DOSE;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/PendiqService.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/PendiqService.java
index 5eef095ad7..365000e8ea 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/PendiqService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/PendiqService.java
@@ -5,15 +5,15 @@
 import android.os.PowerManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.JamBaseBluetoothService;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.RxBleProvider;
+import com.eveningoutpost.dexdrip.services.JamBaseBluetoothService;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.RxBleProvider;
 import com.eveningoutpost.dexdrip.insulin.pendiq.messages.InjectionStatusTx;
 import com.eveningoutpost.dexdrip.insulin.pendiq.messages.InsulinLogRx;
 import com.eveningoutpost.dexdrip.insulin.pendiq.messages.InsulinLogTx;
@@ -45,13 +45,10 @@
 import rx.Subscription;
 import rx.schedulers.Schedulers;
 */
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.ratelimit;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.ratelimit;
 import static com.eveningoutpost.dexdrip.insulin.pendiq.Const.INCOMING_CHAR;
 import static com.eveningoutpost.dexdrip.insulin.pendiq.Const.INSULIN_CLASSIFIER;
 import static com.eveningoutpost.dexdrip.insulin.pendiq.Const.OUTGOING_CHAR;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/SequenceCounter.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/SequenceCounter.java
index 0d1553aada..c0c72bfdfd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/SequenceCounter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/SequenceCounter.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.insulin.pendiq;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/BaseMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/BaseMessage.java
index d24797cb2d..d647354431 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/BaseMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/BaseMessage.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.insulin.pendiq.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.utils.CRC16ccitt;
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/InsulinLogRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/InsulinLogRx.java
index 58f79aa38c..0779df9ffe 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/InsulinLogRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/InsulinLogRx.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.insulin.pendiq.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/SetTimeTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/SetTimeTx.java
index 6ad108c5fd..60bd353e04 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/SetTimeTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/SetTimeTx.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.insulin.pendiq.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.insulin.pendiq.Const;
 
 import static com.eveningoutpost.dexdrip.insulin.pendiq.SequenceCounter.getNext;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/StatusRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/StatusRx.java
index 21bbf4d263..becf9916ff 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/StatusRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/pendiq/messages/StatusRx.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.insulin.pendiq.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/shared/PrimeDetection.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/shared/PrimeDetection.java
index ce8514dee4..9598eb8eec 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/shared/PrimeDetection.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/shared/PrimeDetection.java
@@ -1,15 +1,15 @@
 package com.eveningoutpost.dexdrip.insulin.shared;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.PenData;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.PenData;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.roundDouble;
+import static com.eveningoutpost.dexdrip.models.JoH.roundDouble;
 import static com.eveningoutpost.dexdrip.insulin.inpen.InPenEntry.ID_INPEN;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/shared/ProcessPenData.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/shared/ProcessPenData.java
index e185fdb96f..dd3826eef4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/shared/ProcessPenData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/shared/ProcessPenData.java
@@ -1,11 +1,11 @@
 package com.eveningoutpost.dexdrip.insulin.shared;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.PenData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.PenData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageAdapter.java b/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageAdapter.java
index 35d34ee075..7228462435 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageAdapter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageAdapter.java
@@ -15,10 +15,10 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.JamorhamShowcaseDrawer;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.JamorhamShowcaseDrawer;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
 import com.github.amlcurran.showcaseview.ShowcaseView;
 import com.github.amlcurran.showcaseview.targets.ViewTarget;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageEditor.java b/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageEditor.java
index 97eabdd56e..89e2558ce4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageEditor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageEditor.java
@@ -13,7 +13,6 @@
 import android.support.annotation.IdRes;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -29,12 +28,12 @@
 import android.widget.Toast;
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.JamorhamShowcaseDrawer;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.SendFeedBack;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.JamorhamShowcaseDrawer;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.SendFeedBack;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
 import com.github.amlcurran.showcaseview.ShowcaseView;
 import com.github.amlcurran.showcaseview.targets.Target;
 import com.github.amlcurran.showcaseview.targets.ViewTarget;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageStore.java b/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageStore.java
index 9ab33d9ee0..6cf779aa1d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageStore.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/languageeditor/LanguageStore.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.Locale;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/Constants.java b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/Constants.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/Constants.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/localetasker/Constants.java
index b9e79357a1..3be05ab7c4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/Constants.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/Constants.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.eveningoutpost.dexdrip.localeTasker;
+package com.eveningoutpost.dexdrip.localetasker;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/PluginApplication.java b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/PluginApplication.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/PluginApplication.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/localetasker/PluginApplication.java
index 46823bf485..7599fd3dde 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/PluginApplication.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/PluginApplication.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.eveningoutpost.dexdrip.localeTasker;
+package com.eveningoutpost.dexdrip.localetasker;
 
 import android.annotation.TargetApi;
 import android.app.Application;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/TaskerPlugin.java b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/TaskerPlugin.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/TaskerPlugin.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/localetasker/TaskerPlugin.java
index 44ab979ca1..7c890e0d70 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/TaskerPlugin.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/TaskerPlugin.java
@@ -1,6 +1,6 @@
 //package com.yourcompany.yourcondition;
 //package com.yourcompany.yoursetting;
-package com.eveningoutpost.dexdrip.localeTasker;
+package com.eveningoutpost.dexdrip.localetasker;
 
 // Constants and functions for Tasker *extensions* to the plugin protocol
 // See Also: http://tasker.dinglisch.net/plugins.html
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/bundle/BundleScrubber.java b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/bundle/BundleScrubber.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/bundle/BundleScrubber.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/localetasker/bundle/BundleScrubber.java
index e8e87f8020..b8f40a1b21 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/bundle/BundleScrubber.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/bundle/BundleScrubber.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.eveningoutpost.dexdrip.localeTasker.bundle;
+package com.eveningoutpost.dexdrip.localetasker.bundle;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/bundle/PluginBundleManager.java b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/bundle/PluginBundleManager.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/bundle/PluginBundleManager.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/localetasker/bundle/PluginBundleManager.java
index 5d7ff38da1..d22fc66338 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/bundle/PluginBundleManager.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/bundle/PluginBundleManager.java
@@ -10,14 +10,14 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.eveningoutpost.dexdrip.localeTasker.bundle;
+package com.eveningoutpost.dexdrip.localetasker.bundle;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.localeTasker.Constants;
+import com.eveningoutpost.dexdrip.localetasker.Constants;
 
 /**
  * Class for managing the {@link com.twofortyfouram.locale.Intent#EXTRA_BUNDLE} for this plug-in.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/receiver/FireReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/receiver/FireReceiver.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/receiver/FireReceiver.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/localetasker/receiver/FireReceiver.java
index 79ec572040..7be399b502 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/receiver/FireReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/receiver/FireReceiver.java
@@ -13,7 +13,7 @@
  *
  */
 
-package com.eveningoutpost.dexdrip.localeTasker.receiver;
+package com.eveningoutpost.dexdrip.localetasker.receiver;
 
 
 import android.content.BroadcastReceiver;
@@ -24,15 +24,15 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.localeTasker.Constants;
-import com.eveningoutpost.dexdrip.localeTasker.bundle.BundleScrubber;
-import com.eveningoutpost.dexdrip.localeTasker.bundle.PluginBundleManager;
-import com.eveningoutpost.dexdrip.localeTasker.ui.EditActivity;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.localetasker.Constants;
+import com.eveningoutpost.dexdrip.localetasker.bundle.BundleScrubber;
+import com.eveningoutpost.dexdrip.localetasker.bundle.PluginBundleManager;
+import com.eveningoutpost.dexdrip.localetasker.ui.EditActivity;
 import com.eveningoutpost.dexdrip.utils.BgToSpeech;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/ui/AbstractPluginActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/ui/AbstractPluginActivity.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/ui/AbstractPluginActivity.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/localetasker/ui/AbstractPluginActivity.java
index 2fdd97a2d3..54955e9293 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/ui/AbstractPluginActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/ui/AbstractPluginActivity.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-package com.eveningoutpost.dexdrip.localeTasker.ui;
+package com.eveningoutpost.dexdrip.localetasker.ui;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -23,7 +23,7 @@
 
 
 import com.twofortyfouram.locale.BreadCrumber;
-import com.eveningoutpost.dexdrip.localeTasker.Constants;
+import com.eveningoutpost.dexdrip.localetasker.Constants;
 import com.eveningoutpost.dexdrip.R;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/ui/EditActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/ui/EditActivity.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/ui/EditActivity.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/localetasker/ui/EditActivity.java
index a5eb9e2679..95a915f38f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/localeTasker/ui/EditActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/localetasker/ui/EditActivity.java
@@ -12,7 +12,7 @@
  * jamorham additions
  */
 
-package com.eveningoutpost.dexdrip.localeTasker.ui;
+package com.eveningoutpost.dexdrip.localetasker.ui;
 
 import android.content.Context;
 import android.content.Intent;
@@ -22,9 +22,9 @@
 import android.widget.EditText;
 
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.localeTasker.TaskerPlugin;
-import com.eveningoutpost.dexdrip.localeTasker.bundle.BundleScrubber;
-import com.eveningoutpost.dexdrip.localeTasker.bundle.PluginBundleManager;
+import com.eveningoutpost.dexdrip.localetasker.TaskerPlugin;
+import com.eveningoutpost.dexdrip.localetasker.bundle.BundleScrubber;
+import com.eveningoutpost.dexdrip.localetasker.bundle.PluginBundleManager;
 
 /**
  * This is the "Edit" activity for a Locale Plug-in.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/APStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/APStatus.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/APStatus.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/APStatus.java
index 4304fc7f90..40b5d40c4a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/APStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/APStatus.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
@@ -6,7 +6,7 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.wearintegration.ExternalStatusService;
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Accuracy.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Accuracy.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Accuracy.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Accuracy.java
index 84aa199463..47caae0462 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Accuracy.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Accuracy.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 /**
  * Created by jamorham on 01/02/2017.
@@ -11,8 +11,8 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.google.gson.annotations.Expose;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBgAlert.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBgAlert.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBgAlert.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBgAlert.java
index f7a20e50b8..b4ba64c6cf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBgAlert.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBgAlert.java
@@ -1,15 +1,15 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
 
 import java.text.DateFormat;
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBluetoothDevice.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBluetoothDevice.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBluetoothDevice.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBluetoothDevice.java
index aa2e8fc56c..a3f97858bf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBluetoothDevice.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBluetoothDevice.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/AlertType.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/AlertType.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/AlertType.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/AlertType.java
index 14203b0844..7a9e9ec85c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/AlertType.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/AlertType.java
@@ -1,35 +1,29 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
-import android.app.AlarmManager;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
-import com.eveningoutpost.dexdrip.Services.MissedReadingService;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
 import com.google.gson.internal.bind.DateTypeAdapter;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 
 /**
  * Created by Emma Black on 1/14/15.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/BgReading.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/BgReading.java
index e0e923afa4..da4978abdd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/BgReading.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -16,21 +16,21 @@
 import com.eveningoutpost.dexdrip.BestGlucose;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.SyncService;
-import com.eveningoutpost.dexdrip.ShareModels.ShareUploadableBg;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.services.SyncService;
+import com.eveningoutpost.dexdrip.sharemodels.ShareUploadableBg;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.messages.BgReadingMessage;
 import com.eveningoutpost.dexdrip.messages.BgReadingMultiMessage;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/BloodTest.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/BloodTest.java
index ba5ba73dd3..f4cb478b56 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/BloodTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 import android.util.Log;
@@ -10,14 +10,14 @@
 import com.activeandroid.query.Select;
 import com.activeandroid.util.SQLiteUtils;
 import com.eveningoutpost.dexdrip.AddCalibration;
-import com.eveningoutpost.dexdrip.GlucoseMeter.GlucoseReadingRx;
+import com.eveningoutpost.dexdrip.glucosemeter.GlucoseReadingRx;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Services.SyncService;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
+import com.eveningoutpost.dexdrip.services.SyncService;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.calibrations.NativeCalibrationPipe;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Bubble.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Bubble.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Bubble.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Bubble.java
index d580ad2655..e54ab96c59 100755
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Bubble.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Bubble.java
@@ -1,13 +1,13 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.NFCReaderX;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BridgeResponse;
-import com.eveningoutpost.dexdrip.UtilityModels.LibreUtils;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.BridgeResponse;
+import com.eveningoutpost.dexdrip.utilitymodels.LibreUtils;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.nio.ByteBuffer;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Calibration.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Calibration.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java
index 4bef985db9..34b7af0275 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Calibration.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -14,16 +14,16 @@
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalSubrecord;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.CalibrationSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalSubrecord;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.CalibrationSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.calibrations.NativeCalibrationPipe;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
@@ -39,7 +39,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import static com.eveningoutpost.dexdrip.Models.BgReading.isDataSuitableForDoubleCalibration;
+import static com.eveningoutpost.dexdrip.models.BgReading.isDataSuitableForDoubleCalibration;
 import static com.eveningoutpost.dexdrip.calibrations.PluggableCalibration.newFingerStickData;
 
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/CalibrationRequest.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/CalibrationRequest.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/CalibrationRequest.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/CalibrationRequest.java
index ea9d56888e..cb4b2b8e2f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/CalibrationRequest.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/CalibrationRequest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/CobCalc.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/CobCalc.java
similarity index 78%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/CobCalc.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/CobCalc.java
index 0b37a795bc..ca4c5d226c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/CobCalc.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/CobCalc.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 /**
  * Created by jamorham on 04/01/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/DateUtil.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/DateUtil.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/DateUtil.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/DateUtil.java
index 9e30ba8fac..46aa83561e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/DateUtil.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/DateUtil.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/DesertSync.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/DesertSync.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/DesertSync.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/DesertSync.java
index 84042d3e1c..8b82bd3180 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/DesertSync.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/DesertSync.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.os.Bundle;
 import android.provider.BaseColumns;
@@ -12,13 +12,13 @@
 import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.JamListenerSvc;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.desertsync.DesertComms;
-import com.eveningoutpost.dexdrip.UtilityModels.desertsync.RouteTools;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.desertsync.DesertComms;
+import com.eveningoutpost.dexdrip.utilitymodels.desertsync.RouteTools;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.webservices.XdripWebService;
 import com.eveningoutpost.dexdrip.xdrip;
@@ -39,9 +39,9 @@
 import lombok.NoArgsConstructor;
 
 import static com.eveningoutpost.dexdrip.GoogleDriveInterface.getDriveIdentityString;
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.UtilityModels.desertsync.RouteTools.getBestInterfaceAddress;
-import static com.eveningoutpost.dexdrip.UtilityModels.desertsync.RouteTools.ip;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.utilitymodels.desertsync.RouteTools.getBestInterfaceAddress;
+import static com.eveningoutpost.dexdrip.utilitymodels.desertsync.RouteTools.ip;
 
 // created by jamorham 18/08/2018
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Forecast.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Forecast.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/Forecast.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Forecast.java
index 1ea072c722..415f3a0c10 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Forecast.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Forecast.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.util.Log;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/GlucoseData.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/GlucoseData.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/GlucoseData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/GlucoseData.java
index 3500cf177b..19b918e2d0 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/GlucoseData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/GlucoseData.java
@@ -1,5 +1,5 @@
 
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import java.text.DecimalFormat;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/HeartRate.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/HeartRate.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/HeartRate.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/HeartRate.java
index 82d2633e58..7485df2e0f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/HeartRate.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/HeartRate.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/InsulinInjection.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/InsulinInjection.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/InsulinInjection.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/InsulinInjection.java
index bf924c7b38..fa59e98149 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/InsulinInjection.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/InsulinInjection.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.eveningoutpost.dexdrip.insulin.Insulin;
 import com.eveningoutpost.dexdrip.insulin.InsulinManager;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Iob.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Iob.java
similarity index 86%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Iob.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Iob.java
index 96e8906582..61517db253 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Iob.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Iob.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 /**
  * Created by jamorham on 02/01/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/JoH.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/JoH.java
index 1d1ce2eb1e..535f3bc964 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/JoH.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -56,10 +56,10 @@
 import com.activeandroid.ActiveAndroid;
 import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.XdripNotificationCompat;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.XdripNotificationCompat;
 import com.eveningoutpost.dexdrip.utils.BestGZIPOutputStream;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.xdrip;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Libre2RawValue.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Libre2RawValue.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Libre2RawValue.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Libre2RawValue.java
index 703259644a..49cfa68051 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Libre2RawValue.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Libre2RawValue.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 
         import android.provider.BaseColumns;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Libre2Sensor.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Libre2Sensor.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Libre2Sensor.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Libre2Sensor.java
index 3a761871dd..35dd962943 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Libre2Sensor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Libre2Sensor.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 import android.text.format.DateFormat;
@@ -7,7 +7,6 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
 
-import java.sql.SQLException;
 import java.util.List;
 
 @Table(name = "Libre2Sensors", id = BaseColumns._ID)
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreBlock.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/LibreBlock.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreBlock.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/LibreBlock.java
index 1ff4ca53c1..739d7f33b0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreBlock.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/LibreBlock.java
@@ -1,21 +1,20 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
 import com.google.gson.annotations.Expose;
-import java.text.DecimalFormat;
+
 import java.util.List;
 import java.util.UUID;
 
-import org.json.JSONObject;
 /**
  * Created by jamorham on 19/10/2017.
  */
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreData.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/LibreData.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/LibreData.java
index 46ee1f8622..1e0c0867ba 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/LibreData.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreOOPAlgorithm.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/LibreOOPAlgorithm.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreOOPAlgorithm.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/LibreOOPAlgorithm.java
index 3f3632544b..f244e68b78 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/LibreOOPAlgorithm.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/LibreOOPAlgorithm.java
@@ -1,16 +1,16 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
 import com.eveningoutpost.dexdrip.LibreAlarmReceiver;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.CompatibleApps;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.CompatibleApps;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/NSClientChat.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/NSClientChat.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/NSClientChat.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/NSClientChat.java
index 0749bc5b60..ebd4abf1a2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/NSClientChat.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/NSClientChat.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Context;
 import android.content.Intent;
@@ -6,7 +6,7 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import org.json.JSONException;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Noise.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Noise.java
similarity index 83%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/Noise.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Noise.java
index 38338fd442..9c09b3fd7d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Noise.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Noise.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 /**
  * Created by jamorham on 04/03/2018.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/OOPResultsContainer.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/OOPResultsContainer.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/OOPResultsContainer.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/OOPResultsContainer.java
index 62547279e7..8157ce0685 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/OOPResultsContainer.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/OOPResultsContainer.java
@@ -1,11 +1,9 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.util.List;
-
 class HistoricBg {
 
     public int quality;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/PenData.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/PenData.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/PenData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/PenData.java
index c5611f5d56..6e6e2e7b81 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/PenData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/PenData.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
@@ -6,7 +6,7 @@
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/PlusModel.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/PlusModel.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/PlusModel.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/PlusModel.java
index 8c782d7abf..ba21ad60d6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/PlusModel.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/PlusModel.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.activeandroid.Model;
 import com.activeandroid.util.SQLiteUtils;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Prediction.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Prediction.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Prediction.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Prediction.java
index 5bb639af2d..6023187e55 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Prediction.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Prediction.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/PredictionData.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/PredictionData.java
similarity index 88%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/PredictionData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/PredictionData.java
index 048f5461f3..d1727bffba 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/PredictionData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/PredictionData.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 // class from LibreAlarm
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQuality.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQuality.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQuality.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQuality.java
index dae6a1844f..a03e19e0aa 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQuality.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQuality.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.databinding.BaseObservable;
 
@@ -7,8 +7,8 @@
 
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.STALE_CALIBRATION_CUT_OFF;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.STALE_CALIBRATION_CUT_OFF;
 
 /**
  * Created by jamorham on 01/10/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Profile.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Profile.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Profile.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Profile.java
index 79c8136b00..3cd0897537 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Profile.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Profile.java
@@ -1,12 +1,12 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.profileeditor.ProfileEditor;
 import com.eveningoutpost.dexdrip.profileeditor.ProfileItem;
 import com.eveningoutpost.dexdrip.xdrip;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/ReadingData.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/ReadingData.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/ReadingData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/ReadingData.java
index 95bf23ed60..9ee8046c8a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/ReadingData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/ReadingData.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 // class from LibreAlarm
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Reminder.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Reminder.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Reminder.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Reminder.java
index 244db4d313..0a4b31738d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Reminder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Reminder.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Context;
 import android.provider.BaseColumns;
@@ -8,10 +8,9 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.Reminders;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.HomeWifi;
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/RollCall.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/RollCall.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/RollCall.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/RollCall.java
index fcd7bd9acf..9d7a74a35e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/RollCall.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/RollCall.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -7,10 +7,10 @@
 
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.UtilityModels.BridgeBattery;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.desertsync.RouteTools;
+import com.eveningoutpost.dexdrip.utilitymodels.BridgeBattery;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.desertsync.RouteTools;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.gson.Gson;
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
 /**
  * Created by jamorham on 20/01/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Sensor.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Sensor.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Sensor.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Sensor.java
index 20d369695f..d433ab87d1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Sensor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Sensor.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
@@ -8,9 +8,9 @@
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.SensorSendQueue;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.SensorSendQueue;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/SensorSanity.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/SensorSanity.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/SensorSanity.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/SensorSanity.java
index c6f8d5a181..6891c76048 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/SensorSanity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/SensorSanity.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/StepCounter.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/StepCounter.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/StepCounter.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/StepCounter.java
index c9f6d7992d..8d94005a6f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/StepCounter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/StepCounter.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Tomato.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Tomato.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Tomato.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Tomato.java
index 5da7f9f185..d233b76a89 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Tomato.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Tomato.java
@@ -1,14 +1,13 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.NFCReaderX;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Blukon;
-import com.eveningoutpost.dexdrip.UtilityModels.BridgeResponse;
-import com.eveningoutpost.dexdrip.UtilityModels.LibreUtils;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.BridgeResponse;
+import com.eveningoutpost.dexdrip.utilitymodels.LibreUtils;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/TransmitterData.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/TransmitterData.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/TransmitterData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/TransmitterData.java
index 9edd0ae68c..7620babe33 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/TransmitterData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/TransmitterData.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
@@ -8,10 +8,10 @@
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.google.gson.annotations.Expose;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Treatments.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Treatments.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Treatments.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/Treatments.java
index 30364b89d8..94a4230581 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Treatments.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/Treatments.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 /**
  * Created by jamorham on 31/12/15.
@@ -16,12 +16,12 @@
 import com.activeandroid.util.SQLiteUtils;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.SyncService;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.UndoRedo;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
+import com.eveningoutpost.dexdrip.services.SyncService;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.UndoRedo;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
 import com.eveningoutpost.dexdrip.insulin.Insulin;
 import com.eveningoutpost.dexdrip.insulin.InsulinManager;
 import com.eveningoutpost.dexdrip.insulin.MultipleInsulins;
@@ -46,10 +46,10 @@
 import java.util.TreeMap;
 import java.util.UUID;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
 import static java.lang.StrictMath.abs;
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
 // TODO Switchable Carb models
 // TODO Linear array timeline optimization
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/UserError.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/UserError.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/UserError.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/UserError.java
index a363ad2988..988f963135 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/UserError.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/UserError.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.os.AsyncTask;
 import android.provider.BaseColumns;
@@ -9,8 +9,8 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.google.gson.annotations.Expose;
 
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/UserNotification.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/UserNotification.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/UserNotification.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/UserNotification.java
index 56ddcda5d1..45f3bc1528 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/UserNotification.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/UserNotification.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
@@ -6,9 +6,9 @@
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import java.util.Arrays;
 import java.util.Date;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/blueReader.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/blueReader.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/blueReader.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/models/blueReader.java
index d82c078531..83f5313b86 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/blueReader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/models/blueReader.java
@@ -1,14 +1,14 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.text.format.DateFormat;
 import com.eveningoutpost.dexdrip.Home;
 import java.nio.ByteBuffer;
 import java.util.Date;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.eveningoutpost.dexdrip.R;
 import java.io.BufferedWriter;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfileEditor.java b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfileEditor.java
index 454e8b9e5c..83739607d6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfileEditor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfileEditor.java
@@ -18,11 +18,11 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.ColorCache;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.ColorCache;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.eveningoutpost.dexdrip.ui.charts.BasalChart;
 import com.eveningoutpost.dexdrip.ui.helpers.ColorUtil;
 
@@ -38,7 +38,7 @@
 import lecho.lib.hellocharts.model.Viewport;
 import lecho.lib.hellocharts.view.ColumnChartView;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.getCol;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.getCol;
 import static com.eveningoutpost.dexdrip.ui.helpers.UiHelper.convertDpToPixel;
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/ProfileAdapter.java b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/ProfileAdapter.java
index 9e55b3d9c2..fca91706e6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/ProfileAdapter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/ProfileAdapter.java
@@ -15,7 +15,7 @@
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
 
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/ProfileEditor.java b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/ProfileEditor.java
index 98cc034509..7ee3f72273 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/ProfileEditor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/ProfileEditor.java
@@ -9,7 +9,6 @@
 import android.graphics.Point;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -22,14 +21,14 @@
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Dex_Constants;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Profile;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Dex_Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Profile;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.JamorhamShowcaseDrawer;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.JamorhamShowcaseDrawer;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
 import com.eveningoutpost.dexdrip.utils.Preferences;
 import com.github.amlcurran.showcaseview.ShowcaseView;
 import com.github.amlcurran.showcaseview.targets.Target;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/ActivityRecognizedService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/ActivityRecognizedService.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/ActivityRecognizedService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/ActivityRecognizedService.java
index fac3b48f03..9fe81df8db 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/ActivityRecognizedService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/ActivityRecognizedService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.IntentService;
 import android.app.PendingIntent;
@@ -19,14 +19,13 @@
 import com.eveningoutpost.dexdrip.ErrorsActivity;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
-import com.eveningoutpost.dexdrip.UtilityModels.VehicleMode;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.VehicleMode;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
-import com.eveningoutpost.dexdrip.utils.WebAppHelper;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/BluetoothGlucoseMeter.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/BluetoothGlucoseMeter.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/BluetoothGlucoseMeter.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/BluetoothGlucoseMeter.java
index a70d375fc4..06d900a485 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/BluetoothGlucoseMeter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/BluetoothGlucoseMeter.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.TargetApi;
 import android.app.Service;
@@ -28,23 +28,23 @@
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.GcmActivity;
-import com.eveningoutpost.dexdrip.GlucoseMeter.CurrentTimeRx;
-import com.eveningoutpost.dexdrip.GlucoseMeter.GlucoseReadingRx;
-import com.eveningoutpost.dexdrip.GlucoseMeter.RecordsCmdTx;
-import com.eveningoutpost.dexdrip.GlucoseMeter.VerioHelper;
-import com.eveningoutpost.dexdrip.GlucoseMeter.caresens.ContextRx;
-import com.eveningoutpost.dexdrip.GlucoseMeter.caresens.TimeTx;
+import com.eveningoutpost.dexdrip.glucosemeter.CurrentTimeRx;
+import com.eveningoutpost.dexdrip.glucosemeter.GlucoseReadingRx;
+import com.eveningoutpost.dexdrip.glucosemeter.RecordsCmdTx;
+import com.eveningoutpost.dexdrip.glucosemeter.VerioHelper;
+import com.eveningoutpost.dexdrip.glucosemeter.caresens.ContextRx;
+import com.eveningoutpost.dexdrip.glucosemeter.caresens.TimeTx;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.lang.reflect.Method;
@@ -54,11 +54,11 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import static com.eveningoutpost.dexdrip.GlucoseMeter.VerioHelper.VERIO_F7A1_SERVICE;
-import static com.eveningoutpost.dexdrip.GlucoseMeter.VerioHelper.VERIO_F7A2_WRITE;
-import static com.eveningoutpost.dexdrip.GlucoseMeter.VerioHelper.VERIO_F7A3_NOTIFICATION;
-import static com.eveningoutpost.dexdrip.Models.CalibrationRequest.isSlopeFlatEnough;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.unitized_string_with_units_static;
+import static com.eveningoutpost.dexdrip.glucosemeter.VerioHelper.VERIO_F7A1_SERVICE;
+import static com.eveningoutpost.dexdrip.glucosemeter.VerioHelper.VERIO_F7A2_WRITE;
+import static com.eveningoutpost.dexdrip.glucosemeter.VerioHelper.VERIO_F7A3_NOTIFICATION;
+import static com.eveningoutpost.dexdrip.models.CalibrationRequest.isSlopeFlatEnough;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.unitized_string_with_units_static;
 
 /**
  * Created by jamorham on 09/12/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/CollectorStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/CollectorStatus.java
similarity index 79%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/CollectorStatus.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/CollectorStatus.java
index 2ea6b9b2f3..e6f29b94af 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/CollectorStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/CollectorStatus.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 /**
  * Created by jamorham on 19/01/2018.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/ComunicationHeader.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/ComunicationHeader.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/ComunicationHeader.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/ComunicationHeader.java
index 67f84bff73..8e948b6548 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/ComunicationHeader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/ComunicationHeader.java
@@ -1,6 +1,5 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
-import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/DailyIntentService.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/DailyIntentService.java
index 73eef5cddd..42e6b921ac 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/DailyIntentService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.AlarmManager;
 import android.app.IntentService;
@@ -8,25 +8,25 @@
 import android.os.PowerManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.RollCall;
-import com.eveningoutpost.dexdrip.Models.StepCounter;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.CalibrationSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.IncompatibleApps;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.RollCall;
+import com.eveningoutpost.dexdrip.models.StepCounter;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.CalibrationSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.IncompatibleApps;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
 import com.eveningoutpost.dexdrip.utils.DatabaseUtil;
 import com.eveningoutpost.dexdrip.utils.Telemetry;
 import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import static com.eveningoutpost.dexdrip.Home.startWatchUpdaterService;
-import static com.eveningoutpost.dexdrip.UtilityModels.UpdateActivity.checkForAnUpdate;
+import static com.eveningoutpost.dexdrip.utilitymodels.UpdateActivity.checkForAnUpdate;
 
 public class DailyIntentService extends IntentService {
     private final static String TAG = DailyIntentService.class.getSimpleName();
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/DexCollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/DexCollectionService.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/DexCollectionService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/DexCollectionService.java
index 73fcd039ac..3d5b857e71 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/DexCollectionService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/DexCollectionService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -42,29 +42,29 @@
 
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Bubble;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.Tomato;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.blueReader;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Bubble;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.Tomato;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.blueReader;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Blukon;
-import com.eveningoutpost.dexdrip.UtilityModels.BridgeResponse;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.HM10Attributes;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.XbridgePlus;
+import com.eveningoutpost.dexdrip.utilitymodels.Blukon;
+import com.eveningoutpost.dexdrip.utilitymodels.BridgeResponse;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.HM10Attributes;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.XbridgePlus;
 import com.eveningoutpost.dexdrip.utils.BtCallBack;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
@@ -84,8 +84,8 @@
 import java.util.UUID;
 
 import static android.bluetooth.BluetoothDevice.TRANSPORT_LE;
-import static com.eveningoutpost.dexdrip.Models.JoH.convertPinToBytes;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.models.JoH.convertPinToBytes;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 import static com.eveningoutpost.dexdrip.utils.bt.Helper.getStatusName;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DexShareCollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/DexShareCollectionService.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/DexShareCollectionService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/DexShareCollectionService.java
index e143a46a56..5e542e573f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DexShareCollectionService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/DexShareCollectionService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.TargetApi;
 import android.app.AlarmManager;
@@ -24,20 +24,20 @@
 import android.preference.PreferenceManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.ReadDataShare;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.DexShareAttributes;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.HM10Attributes;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.ReadDataShare;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.DexShareAttributes;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.HM10Attributes;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DoNothingService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/DoNothingService.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/DoNothingService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/DoNothingService.java
index 06bc498f4a..ab02f14a81 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DoNothingService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/DoNothingService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.PendingIntent;
 import android.app.Service;
@@ -13,16 +13,16 @@
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.GcmListenerSvc;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.InstalledApps;
-import com.eveningoutpost.dexdrip.UtilityModels.NanoStatus;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.InstalledApps;
+import com.eveningoutpost.dexdrip.utilitymodels.NanoStatus;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.ui.helpers.Span;
 import com.eveningoutpost.dexdrip.utils.framework.WakeLockTrampoline;
 import com.eveningoutpost.dexdrip.R;
@@ -33,8 +33,8 @@
 import java.util.List;
 
 import static com.eveningoutpost.dexdrip.GcmListenerSvc.lastMessageReceived;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NOTICE;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.BAD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NOTICE;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
 
 public class DoNothingService extends Service {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/G5BaseService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/G5BaseService.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/G5BaseService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/G5BaseService.java
index df6a3ec439..cea98d31e2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/G5BaseService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/G5BaseService.java
@@ -1,16 +1,16 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
 import android.content.SharedPreferences;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.google.android.gms.wearable.DataMap;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/G5CollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/G5CollectionService.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/G5CollectionService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/G5CollectionService.java
index 4404b61f1a..8ca9bf49a6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/G5CollectionService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/G5CollectionService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 /**
  * Created by jcostik1 on 3/15/16.
@@ -34,39 +34,39 @@
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.G5Model.AuthChallengeRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.AuthChallengeTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.AuthRequestTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.AuthStatusRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.BatteryInfoRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.BatteryInfoTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.BluetoothServices;
-import com.eveningoutpost.dexdrip.G5Model.BondRequestTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.DisconnectTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.Extensions;
-import com.eveningoutpost.dexdrip.G5Model.FirmwareCapability;
-import com.eveningoutpost.dexdrip.G5Model.GlucoseRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.GlucoseTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.KeepAliveTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.SensorRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.SensorTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.Transmitter;
-import com.eveningoutpost.dexdrip.G5Model.TransmitterStatus;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequestRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequestTxMessage;
+import com.eveningoutpost.dexdrip.g5model.AuthChallengeRxMessage;
+import com.eveningoutpost.dexdrip.g5model.AuthChallengeTxMessage;
+import com.eveningoutpost.dexdrip.g5model.AuthRequestTxMessage;
+import com.eveningoutpost.dexdrip.g5model.AuthStatusRxMessage;
+import com.eveningoutpost.dexdrip.g5model.BatteryInfoRxMessage;
+import com.eveningoutpost.dexdrip.g5model.BatteryInfoTxMessage;
+import com.eveningoutpost.dexdrip.g5model.BluetoothServices;
+import com.eveningoutpost.dexdrip.g5model.BondRequestTxMessage;
+import com.eveningoutpost.dexdrip.g5model.DisconnectTxMessage;
+import com.eveningoutpost.dexdrip.g5model.Extensions;
+import com.eveningoutpost.dexdrip.g5model.FirmwareCapability;
+import com.eveningoutpost.dexdrip.g5model.GlucoseRxMessage;
+import com.eveningoutpost.dexdrip.g5model.GlucoseTxMessage;
+import com.eveningoutpost.dexdrip.g5model.KeepAliveTxMessage;
+import com.eveningoutpost.dexdrip.g5model.SensorRxMessage;
+import com.eveningoutpost.dexdrip.g5model.SensorTxMessage;
+import com.eveningoutpost.dexdrip.g5model.Transmitter;
+import com.eveningoutpost.dexdrip.g5model.TransmitterStatus;
+import com.eveningoutpost.dexdrip.g5model.VersionRequestRxMessage;
+import com.eveningoutpost.dexdrip.g5model.VersionRequestTxMessage;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.NotificationChannels;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.NotificationChannels;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
 import com.eveningoutpost.dexdrip.utils.bt.Helper;
 import com.eveningoutpost.dexdrip.xdrip;
@@ -93,7 +93,7 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
 
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.getUUIDName;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.getUUIDName;
 import static com.eveningoutpost.dexdrip.utils.bt.Helper.getStatusName;
 
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/JamBaseBluetoothSequencer.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/JamBaseBluetoothSequencer.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/JamBaseBluetoothSequencer.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/JamBaseBluetoothSequencer.java
index 5a3f35c954..9cb802fa82 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/JamBaseBluetoothSequencer.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/JamBaseBluetoothSequencer.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -12,13 +12,13 @@
 import android.os.Build;
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.RxBleProvider;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.RxBleProvider;
 import com.eveningoutpost.dexdrip.utils.BtCallBack;
 import com.eveningoutpost.dexdrip.utils.BytesGenerator;
 import com.eveningoutpost.dexdrip.utils.DisconnectReceiver;
@@ -55,14 +55,14 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CLOSE;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CLOSED;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CONNECT_NOW;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.DISCOVER;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.INIT;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.SEND_QUEUE;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.SLEEP;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CLOSE;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CLOSED;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CONNECT_NOW;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.DISCOVER;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.INIT;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.SEND_QUEUE;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.SLEEP;
 import static com.eveningoutpost.dexdrip.utils.bt.ScanMeister.SCAN_FOUND_CALLBACK;
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/JamBaseBluetoothService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/JamBaseBluetoothService.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/JamBaseBluetoothService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/JamBaseBluetoothService.java
index 3b07cad5c9..5aad515c47 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/JamBaseBluetoothService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/JamBaseBluetoothService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.Service;
 import android.bluetooth.BluetoothGatt;
@@ -7,12 +7,12 @@
 import android.os.PowerManager;
 import android.support.annotation.NonNull;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.bt.HandleBleScanException;
 import com.polidea.rxandroidble2.RxBleConnection;
 import com.polidea.rxandroidble2.RxBleCustomOperation;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/LibreWifiData.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/LibreWifiData.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/LibreWifiData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/LibreWifiData.java
index 0e22d86ecb..e3039a2418 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/LibreWifiData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/LibreWifiData.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/LibreWifiReader.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/LibreWifiReader.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/LibreWifiReader.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/LibreWifiReader.java
index 92003c11a5..864df53438 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/LibreWifiReader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/LibreWifiReader.java
@@ -1,30 +1,21 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.PowerManager;
 import android.util.Base64;
 
-import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.MapsActivity;
 import com.eveningoutpost.dexdrip.NFCReaderX;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.ParakeetHelper;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.MockDataSource;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.MockDataSource;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.Mdns;
 import com.google.gson.Gson;
@@ -42,7 +33,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 
 // Important note, this class is based on the fact that android will always run it one thread, which means it does not
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/MissedReadingService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/MissedReadingService.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/MissedReadingService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/MissedReadingService.java
index 149263d269..0b4a9b8296 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/MissedReadingService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/MissedReadingService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.IntentService;
 import android.app.PendingIntent;
@@ -9,22 +9,22 @@
 import android.preference.PreferenceManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Reminder;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.UserNotification;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.NanoStatus;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleUtil;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleWatchSync;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Reminder;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserNotification;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.NanoStatus;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleUtil;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleWatchSync;
 import com.eveningoutpost.dexdrip.insulin.inpen.InPenEntry;
 import com.eveningoutpost.dexdrip.ui.LockScreenWallPaper;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/MongoWrapper.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/MongoWrapper.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/MongoWrapper.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/MongoWrapper.java
index b8ae28bd59..b098d75b91 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/MongoWrapper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/MongoWrapper.java
@@ -1,5 +1,5 @@
-package com.eveningoutpost.dexdrip.Services;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+package com.eveningoutpost.dexdrip.services;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/Ob1G5CollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/Ob1G5CollectionService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java
index 93f83a54b0..ea34d7ef50 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/Ob1G5CollectionService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.TargetApi;
 import android.app.PendingIntent;
@@ -23,33 +23,33 @@
 
 import com.eveningoutpost.dexdrip.AddCalibration;
 import com.eveningoutpost.dexdrip.DoubleCalibrationActivity;
-import com.eveningoutpost.dexdrip.G5Model.BatteryInfoRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.BluetoothServices;
-import com.eveningoutpost.dexdrip.G5Model.CalibrationState;
-import com.eveningoutpost.dexdrip.G5Model.DexSyncKeeper;
-import com.eveningoutpost.dexdrip.G5Model.DexTimeKeeper;
-import com.eveningoutpost.dexdrip.G5Model.FirmwareCapability;
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.G5Model.TransmitterStatus;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequest1RxMessage;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequest2RxMessage;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequestRxMessage;
+import com.eveningoutpost.dexdrip.g5model.BatteryInfoRxMessage;
+import com.eveningoutpost.dexdrip.g5model.BluetoothServices;
+import com.eveningoutpost.dexdrip.g5model.CalibrationState;
+import com.eveningoutpost.dexdrip.g5model.DexSyncKeeper;
+import com.eveningoutpost.dexdrip.g5model.DexTimeKeeper;
+import com.eveningoutpost.dexdrip.g5model.FirmwareCapability;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.g5model.TransmitterStatus;
+import com.eveningoutpost.dexdrip.g5model.VersionRequest1RxMessage;
+import com.eveningoutpost.dexdrip.g5model.VersionRequest2RxMessage;
+import com.eveningoutpost.dexdrip.g5model.VersionRequestRxMessage;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BroadcastGlucose;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.RxBleProvider;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.utilitymodels.BroadcastGlucose;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.RxBleProvider;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.ui.helpers.Span;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.bt.Subscription;
@@ -84,38 +84,38 @@
 import io.reactivex.schedulers.Schedulers;
 import lombok.Setter;
 
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.getUUIDName;
-import static com.eveningoutpost.dexdrip.G5Model.CalibrationState.Ok;
-import static com.eveningoutpost.dexdrip.G5Model.CalibrationState.Unknown;
-import static com.eveningoutpost.dexdrip.G5Model.G6CalibrationParameters.getCurrentSensorCode;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.CLOSED_OK_TEXT;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.evaluateG6Settings;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.pendingCalibration;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.pendingStart;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.pendingStop;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.usingAlt;
-import static com.eveningoutpost.dexdrip.Models.JoH.niceTimeScalar;
-import static com.eveningoutpost.dexdrip.Models.JoH.tsl;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.BOND;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CLOSE;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CLOSED;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CONNECT;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CONNECT_NOW;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.DISCOVER;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.GET_DATA;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.INIT;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.PREBOND;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.SCAN;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.G5_CALIBRATION_REQUEST;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.G5_SENSOR_FAILED;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.G5_SENSOR_RESTARTED;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.G5_SENSOR_STARTED;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.SECOND_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.CRITICAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NORMAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NOTICE;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.getUUIDName;
+import static com.eveningoutpost.dexdrip.g5model.CalibrationState.Ok;
+import static com.eveningoutpost.dexdrip.g5model.CalibrationState.Unknown;
+import static com.eveningoutpost.dexdrip.g5model.G6CalibrationParameters.getCurrentSensorCode;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.CLOSED_OK_TEXT;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.evaluateG6Settings;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.pendingCalibration;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.pendingStart;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.pendingStop;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.usingAlt;
+import static com.eveningoutpost.dexdrip.models.JoH.niceTimeScalar;
+import static com.eveningoutpost.dexdrip.models.JoH.tsl;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.BOND;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.CLOSE;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.CLOSED;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.CONNECT;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.CONNECT_NOW;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.DISCOVER;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.GET_DATA;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.INIT;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.PREBOND;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.SCAN;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.G5_CALIBRATION_REQUEST;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.G5_SENSOR_FAILED;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.G5_SENSOR_RESTARTED;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.G5_SENSOR_STARTED;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.SECOND_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.BAD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.CRITICAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NORMAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NOTICE;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.DexcomG5;
 import static com.eveningoutpost.dexdrip.utils.bt.Subscription.addErrorHandler;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/PlusSyncService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/PlusSyncService.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/PlusSyncService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/PlusSyncService.java
index 8aa900e4d1..c6e3497db9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/PlusSyncService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/PlusSyncService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.Service;
 import android.content.Context;
@@ -12,7 +12,7 @@
 
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.GoogleDriveInterface;
-import com.eveningoutpost.dexdrip.UtilityModels.UpdateActivity;
+import com.eveningoutpost.dexdrip.utilitymodels.UpdateActivity;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.lang.ref.WeakReference;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/ProximitySensorService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/ProximitySensorService.java
similarity index 100%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/ProximitySensorService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/ProximitySensorService.java
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/SnoozeOnNotificationDismissService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/SnoozeOnNotificationDismissService.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/SnoozeOnNotificationDismissService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/SnoozeOnNotificationDismissService.java
index a2614c1101..b3ceb478e8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/SnoozeOnNotificationDismissService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/SnoozeOnNotificationDismissService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.IntentService;
 import android.content.Intent;
@@ -6,16 +6,16 @@
 import android.preference.PreferenceManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.UserNotification;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserNotification;
 import com.eveningoutpost.dexdrip.SnoozeActivity;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.wearintegration.Amazfitservice;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/SyncService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/SyncService.java
similarity index 81%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/SyncService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/SyncService.java
index b95b809852..cabfedd7e4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/SyncService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/SyncService.java
@@ -1,17 +1,17 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.IntentService;
 import android.app.PendingIntent;
 import android.content.Intent;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderTask;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderTask;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.SYNC_QUEUE_RETRY_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.SYNC_QUEUE_RETRY_ID;
 
 public class SyncService extends IntentService {
     private static final String TAG = "SyncService";
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/TransmitterRawData.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/TransmitterRawData.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/TransmitterRawData.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/TransmitterRawData.java
index 719b38c8a6..d94624237d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/TransmitterRawData.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/TransmitterRawData.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 import java.util.Date;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.gson.annotations.Expose;
 import com.mongodb.BasicDBObject;
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/WifiCollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/WifiCollectionService.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/WifiCollectionService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/WifiCollectionService.java
index d605a07b82..8ce52f0c58 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/WifiCollectionService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/WifiCollectionService.java
@@ -1,7 +1,6 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.TargetApi;
-import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -13,14 +12,14 @@
 import android.preference.PreferenceManager;
 import android.text.SpannableString;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.Mdns;
 import com.eveningoutpost.dexdrip.utils.framework.WakeLockTrampoline;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/WixelReader.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/WixelReader.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/WixelReader.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/services/WixelReader.java
index dc6709361f..dd2c8625e0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/WixelReader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/WixelReader.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -7,17 +7,17 @@
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.MapsActivity;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.ParakeetHelper;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.MockDataSource;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.MockDataSource;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.Mdns;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/BgUploader.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/BgUploader.java
similarity index 89%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/BgUploader.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/BgUploader.java
index 08f5bc3b23..d738f7b96d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/BgUploader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/BgUploader.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.ShareModels;
+package com.eveningoutpost.dexdrip.sharemodels;
 
 import android.content.Context;
 
-import com.eveningoutpost.dexdrip.ShareModels.Models.ShareUploadPayload;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ShareUploadPayload;
 import com.squareup.okhttp.ResponseBody;
 
 import retrofit.Callback;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/DexcomShare.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/DexcomShare.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/DexcomShare.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/DexcomShare.java
index f3a4ce12c9..791b97cae3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/DexcomShare.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/DexcomShare.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.ShareModels;
+package com.eveningoutpost.dexdrip.sharemodels;
 
-import com.eveningoutpost.dexdrip.ShareModels.Models.ExistingFollower;
-import com.eveningoutpost.dexdrip.ShareModels.Models.InvitationPayload;
-import com.eveningoutpost.dexdrip.ShareModels.Models.ShareUploadPayload;
-import com.eveningoutpost.dexdrip.ShareModels.UserAgentInfo.UserAgent;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ExistingFollower;
+import com.eveningoutpost.dexdrip.sharemodels.Models.InvitationPayload;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ShareUploadPayload;
+import com.eveningoutpost.dexdrip.sharemodels.UserAgentInfo.UserAgent;
 import com.squareup.okhttp.ResponseBody;
 
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/Egv.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/Egv.java
similarity index 87%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/Egv.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/Egv.java
index c36c2e1de9..fde2926153 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/Egv.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/Egv.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ShareModels.Models;
+package com.eveningoutpost.dexdrip.sharemodels.Models;
 
-import com.eveningoutpost.dexdrip.ShareModels.ShareUploadableBg;
+import com.eveningoutpost.dexdrip.sharemodels.ShareUploadableBg;
 import com.google.gson.annotations.Expose;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ExistingFollower.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ExistingFollower.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ExistingFollower.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ExistingFollower.java
index e5c29b661e..ef50503487 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ExistingFollower.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ExistingFollower.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ShareModels.Models;
+package com.eveningoutpost.dexdrip.sharemodels.Models;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/InvitationPayload.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/InvitationPayload.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/InvitationPayload.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/InvitationPayload.java
index 936b888c50..06c33811ab 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/InvitationPayload.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/InvitationPayload.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ShareModels.Models;
+package com.eveningoutpost.dexdrip.sharemodels.Models;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareAuthenticationBody.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareAuthenticationBody.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareAuthenticationBody.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareAuthenticationBody.java
index f6730e26ea..9f3cb7abd0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareAuthenticationBody.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareAuthenticationBody.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ShareModels.Models;
+package com.eveningoutpost.dexdrip.sharemodels.Models;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareGlucose.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareGlucose.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareGlucose.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareGlucose.java
index 9a5372795f..7facb8ff01 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareGlucose.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareGlucose.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.ShareModels.Models;
+package com.eveningoutpost.dexdrip.sharemodels.Models;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryManager;
 import android.provider.BaseColumns;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareUploadPayload.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareUploadPayload.java
similarity index 81%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareUploadPayload.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareUploadPayload.java
index b72b2b148b..7ab07280f0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/Models/ShareUploadPayload.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/Models/ShareUploadPayload.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ShareModels.Models;
+package com.eveningoutpost.dexdrip.sharemodels.Models;
 
-import com.eveningoutpost.dexdrip.ShareModels.ShareUploadableBg;
+import com.eveningoutpost.dexdrip.sharemodels.ShareUploadableBg;
 import com.google.gson.annotations.Expose;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareRest.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareRest.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareRest.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareRest.java
index 9ca96cf127..2a17ac8027 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareRest.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareRest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ShareModels;
+package com.eveningoutpost.dexdrip.sharemodels;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -6,11 +6,11 @@
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.ShareModels.Models.ExistingFollower;
-import com.eveningoutpost.dexdrip.ShareModels.Models.InvitationPayload;
-import com.eveningoutpost.dexdrip.ShareModels.Models.ShareAuthenticationBody;
-import com.eveningoutpost.dexdrip.ShareModels.Models.ShareUploadPayload;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ExistingFollower;
+import com.eveningoutpost.dexdrip.sharemodels.Models.InvitationPayload;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ShareAuthenticationBody;
+import com.eveningoutpost.dexdrip.sharemodels.Models.ShareUploadPayload;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareUploadableBg.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareUploadableBg.java
similarity index 89%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareUploadableBg.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareUploadableBg.java
index 222f742b35..489432cace 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareUploadableBg.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareUploadableBg.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ShareModels;
+package com.eveningoutpost.dexdrip.sharemodels;
 
 /**
  * Created by Emma Black on 8/10/15.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/UserAgentInfo/RuntimeInfo.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/UserAgentInfo/RuntimeInfo.java
similarity index 89%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/UserAgentInfo/RuntimeInfo.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/UserAgentInfo/RuntimeInfo.java
index b36bd37031..79274e1d85 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/UserAgentInfo/RuntimeInfo.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/UserAgentInfo/RuntimeInfo.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ShareModels.UserAgentInfo;
+package com.eveningoutpost.dexdrip.sharemodels.UserAgentInfo;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/UserAgentInfo/UserAgent.java b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/UserAgentInfo/UserAgent.java
similarity index 71%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/UserAgentInfo/UserAgent.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/UserAgentInfo/UserAgent.java
index 6a8d36248f..e6e2d09d57 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/UserAgentInfo/UserAgent.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/sharemodels/UserAgentInfo/UserAgent.java
@@ -1,6 +1,5 @@
-package com.eveningoutpost.dexdrip.ShareModels.UserAgentInfo;
+package com.eveningoutpost.dexdrip.sharemodels.UserAgentInfo;
 
-import com.eveningoutpost.dexdrip.ShareModels.UserAgentInfo.RuntimeInfo;
 import com.google.gson.annotations.Expose;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/stats/ChartFragment.java b/app/src/main/java/com/eveningoutpost/dexdrip/stats/ChartFragment.java
index 70ca9e6628..f79d372eff 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/stats/ChartFragment.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/stats/ChartFragment.java
@@ -3,7 +3,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/stats/ChartView.java b/app/src/main/java/com/eveningoutpost/dexdrip/stats/ChartView.java
index 6c37688215..6a324bea08 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/stats/ChartView.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/stats/ChartView.java
@@ -7,7 +7,7 @@
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.DisplayMetrics;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import android.view.View;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/stats/DBSearchUtil.java b/app/src/main/java/com/eveningoutpost/dexdrip/stats/DBSearchUtil.java
index 12ac99b24a..57b296c767 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/stats/DBSearchUtil.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/stats/DBSearchUtil.java
@@ -6,13 +6,13 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import com.activeandroid.Cache;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/stats/FirstPageFragment.java b/app/src/main/java/com/eveningoutpost/dexdrip/stats/FirstPageFragment.java
index b9c6f64065..572a089ef7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/stats/FirstPageFragment.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/stats/FirstPageFragment.java
@@ -7,13 +7,13 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Dex_Constants;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Dex_Constants;
 import com.eveningoutpost.dexdrip.R;
 
 import java.text.DecimalFormat;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/stats/PercentileFragment.java b/app/src/main/java/com/eveningoutpost/dexdrip/stats/PercentileFragment.java
index 85984b558e..d0c58db78a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/stats/PercentileFragment.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/stats/PercentileFragment.java
@@ -3,7 +3,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/stats/PercentileView.java b/app/src/main/java/com/eveningoutpost/dexdrip/stats/PercentileView.java
index 716e2e9149..43e0430412 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/stats/PercentileView.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/stats/PercentileView.java
@@ -12,12 +12,12 @@
 import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import android.view.View;
 
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.util.Calendar;
 import java.util.Collections;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/stats/StatsActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/stats/StatsActivity.java
index 9be4f2718a..6b8c1af7f3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/stats/StatsActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/stats/StatsActivity.java
@@ -25,19 +25,19 @@
 import android.widget.TextView;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.JamorhamShowcaseDrawer;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.JamorhamShowcaseDrawer;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 import com.github.amlcurran.showcaseview.ShowcaseView;
 import com.github.amlcurran.showcaseview.targets.ViewTarget;
 
 import java.io.File;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.goFullScreen;
+import static com.eveningoutpost.dexdrip.models.JoH.goFullScreen;
 import static com.eveningoutpost.dexdrip.R.id.pager;
 
 public class StatsActivity extends ActivityWithMenu {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/stats/StatsResult.java b/app/src/main/java/com/eveningoutpost/dexdrip/stats/StatsResult.java
index d6da733071..bd4c00690d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/stats/StatsResult.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/stats/StatsResult.java
@@ -5,10 +5,10 @@
 import android.database.sqlite.SQLiteDatabase;
 
 import com.activeandroid.Cache;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.text.DecimalFormat;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Tables/BgReadingTable.java b/app/src/main/java/com/eveningoutpost/dexdrip/tables/BgReadingTable.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Tables/BgReadingTable.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/tables/BgReadingTable.java
index 02a9ff11c3..fec6ebb57e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Tables/BgReadingTable.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tables/BgReadingTable.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Tables;
+package com.eveningoutpost.dexdrip.tables;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -14,12 +14,12 @@
 import android.widget.TextView;
 
 import com.eveningoutpost.dexdrip.BaseListActivity;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.NavigationDrawerFragment;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Tables/CalibrationDataTable.java b/app/src/main/java/com/eveningoutpost/dexdrip/tables/CalibrationDataTable.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Tables/CalibrationDataTable.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/tables/CalibrationDataTable.java
index 17f56ad22c..25d59d9096 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Tables/CalibrationDataTable.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tables/CalibrationDataTable.java
@@ -1,7 +1,6 @@
-package com.eveningoutpost.dexdrip.Tables;
+package com.eveningoutpost.dexdrip.tables;
 
 import android.app.AlertDialog;
-import android.app.ListActivity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
@@ -14,11 +13,11 @@
 import android.widget.TextView;
 
 import com.eveningoutpost.dexdrip.BaseListActivity;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.NavigationDrawerFragment;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Tables/SensorDataTable.java b/app/src/main/java/com/eveningoutpost/dexdrip/tables/SensorDataTable.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Tables/SensorDataTable.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/tables/SensorDataTable.java
index ac040a1f8a..5c2ab240bc 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Tables/SensorDataTable.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tables/SensorDataTable.java
@@ -1,6 +1,5 @@
-package com.eveningoutpost.dexdrip.Tables;
+package com.eveningoutpost.dexdrip.tables;
 
-import android.app.ListActivity;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.v4.widget.DrawerLayout;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/BaseMessage.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/BaseMessage.java
index c96d3da1c4..1e3bb2bdf3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/BaseMessage.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/BaseMessage.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.tidepool;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBasal.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBasal.java
index 96819ba31c..b8bf2bfdbc 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBasal.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBasal.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.tidepool;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.gson.annotations.Expose;
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBloodGlucose.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBloodGlucose.java
index 31242be0dc..3a696dda81 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBloodGlucose.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBloodGlucose.java
@@ -2,9 +2,8 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.gson.annotations.Expose;
 
 import java.util.LinkedList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBolus.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBolus.java
index da60fe54bf..b72765de09 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBolus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EBolus.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.tidepool;
 
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.gson.annotations.Expose;
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/ESensorGlucose.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/ESensorGlucose.java
index c6b8f0bd84..8e0558d016 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/ESensorGlucose.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/ESensorGlucose.java
@@ -2,8 +2,8 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.gson.annotations.Expose;
 
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EWizard.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EWizard.java
index aac37c8511..4c2f1bfd3d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EWizard.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/EWizard.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.tidepool;
 
-import com.eveningoutpost.dexdrip.Models.Profile;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.Profile;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.gson.annotations.Expose;
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/InfoInterceptor.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/InfoInterceptor.java
index e6da78bf99..380065c811 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/InfoInterceptor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/InfoInterceptor.java
@@ -2,7 +2,7 @@
 
 import android.support.annotation.NonNull;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MAuthReply.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MAuthReply.java
index 77dc6e0739..b9c581c13b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MAuthReply.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MAuthReply.java
@@ -2,7 +2,7 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MAuthRequest.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MAuthRequest.java
index a5b9a6a43c..e59fd56922 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MAuthRequest.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MAuthRequest.java
@@ -2,11 +2,11 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import okhttp3.Credentials;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
 public class MAuthRequest extends BaseMessage {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MOpenDatasetRequest.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MOpenDatasetRequest.java
index 072aaced3f..2edecd8388 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MOpenDatasetRequest.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/MOpenDatasetRequest.java
@@ -1,14 +1,14 @@
 package com.eveningoutpost.dexdrip.tidepool;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.google.gson.annotations.Expose;
 
 import java.util.TimeZone;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.getTimeZoneOffsetMs;
+import static com.eveningoutpost.dexdrip.models.JoH.getTimeZoneOffsetMs;
 
 public class MOpenDatasetRequest extends BaseMessage {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolCallback.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolCallback.java
index 6d6b3aad76..2167036203 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolCallback.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolCallback.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.tidepool;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.store.FastStore;
 
 import lombok.RequiredArgsConstructor;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolEntry.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolEntry.java
index 1cd5ef5e25..7af837c151 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolEntry.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolEntry.java
@@ -4,10 +4,10 @@
 
 // lightweight class entry point
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.isLANConnected;
+import static com.eveningoutpost.dexdrip.models.JoH.isLANConnected;
 import static com.eveningoutpost.dexdrip.utils.PowerStateReceiver.is_power_connected;
 
 public class TidepoolEntry {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolStatus.java
index 82e76c4d1f..34836795cf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolStatus.java
@@ -2,16 +2,16 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.store.FastStore;
 import com.eveningoutpost.dexdrip.store.KeyStore;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.niceTimeScalar;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.niceTimeScalar;
 
 public class TidepoolStatus {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolUploader.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolUploader.java
index 0e395c54c0..7e96683ae5 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolUploader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/TidepoolUploader.java
@@ -3,10 +3,10 @@
 import android.os.PowerManager;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.store.FastStore;
 
 import java.util.List;
@@ -28,7 +28,7 @@
 import retrofit2.http.Path;
 import retrofit2.http.Query;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.OkHttpWrapper.enableTls12OnPreLollipop;
+import static com.eveningoutpost.dexdrip.utilitymodels.OkHttpWrapper.enableTls12OnPreLollipop;
 
 /** jamorham
  *
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/UploadChunk.java b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/UploadChunk.java
index 346c7fb331..18d1e18f67 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/UploadChunk.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/tidepool/UploadChunk.java
@@ -1,16 +1,16 @@
 package com.eveningoutpost.dexdrip.tidepool;
 
 
-import com.eveningoutpost.dexdrip.Models.APStatus;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Profile;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.APStatus;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Profile;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.LogSlider;
 import com.eveningoutpost.dexdrip.utils.NamedSliderProcessor;
 
@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.dateTimeText;
+import static com.eveningoutpost.dexdrip.models.JoH.dateTimeText;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/BaseShelf.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/BaseShelf.java
index 74d173f4e2..a21a7881da 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/BaseShelf.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/BaseShelf.java
@@ -2,7 +2,7 @@
 
 import android.databinding.ObservableArrayMap;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/LockScreenWallPaper.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/LockScreenWallPaper.java
index e22a258563..01220545c9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/LockScreenWallPaper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/LockScreenWallPaper.java
@@ -8,11 +8,11 @@
 import android.preference.Preference;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.ui.activities.NumberWallPreview;
 import com.eveningoutpost.dexdrip.ui.helpers.BitmapUtil;
 import com.eveningoutpost.dexdrip.utils.time.TimeRangeUtils;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/NumberGraphic.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/NumberGraphic.java
index 2a175b6c83..d62bf4cdea 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/NumberGraphic.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/NumberGraphic.java
@@ -11,15 +11,15 @@
 import android.graphics.drawable.Icon;
 import android.os.Build;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.ColorCache;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.ColorCache;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import static android.content.Context.NOTIFICATION_SERVICE;
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.getCol;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.getCol;
 import static com.eveningoutpost.dexdrip.ui.activities.NumberWallPreview.ViewModel.PREF_numberwall_multi_param;
 import static com.eveningoutpost.dexdrip.ui.helpers.BitmapUtil.getScreenDpi;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/DatabaseAdmin.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/DatabaseAdmin.java
index df360dd69f..cca409eb62 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/DatabaseAdmin.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/DatabaseAdmin.java
@@ -7,9 +7,9 @@
 
 import com.activeandroid.Cache;
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 import com.eveningoutpost.dexdrip.databinding.ActivityDatabaseAdminBinding;
 
 import java.io.File;
@@ -19,8 +19,8 @@
 import java.util.Map;
 import java.util.SortedSet;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.Models.JoH.mapSortedByValue;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.mapSortedByValue;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/NumberWallPreview.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/NumberWallPreview.java
index d8b974ea03..d5b162979e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/NumberWallPreview.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/NumberWallPreview.java
@@ -11,14 +11,14 @@
 import android.view.View;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.ColorCache;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl;
-import com.eveningoutpost.dexdrip.UtilityModels.PrefsViewString;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.ColorCache;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PrefsViewImpl;
+import com.eveningoutpost.dexdrip.utilitymodels.PrefsViewString;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 import com.eveningoutpost.dexdrip.adapters.ObservableBackground;
 import com.eveningoutpost.dexdrip.databinding.ActivityNumberWallPreviewBinding;
 import com.eveningoutpost.dexdrip.ui.LockScreenWallPaper;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/SelectAudioDevice.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/SelectAudioDevice.java
index 833e8dc413..450dc1471e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/SelectAudioDevice.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/SelectAudioDevice.java
@@ -3,12 +3,11 @@
 import android.databinding.ObservableField;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.databinding.ActivitySelectAudioDeviceBinding;
 import com.eveningoutpost.dexdrip.utils.HeadsetStateReceiver;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/ThinJamActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/ThinJamActivity.java
index f0d23128c4..99dac9c077 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/ThinJamActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/ThinJamActivity.java
@@ -24,12 +24,12 @@
 
 import com.eveningoutpost.dexdrip.BR;
 import com.eveningoutpost.dexdrip.MegaStatus;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.databinding.ActivityThinJamBinding;
 import com.eveningoutpost.dexdrip.ui.dialog.GenericConfirmDialog;
 import com.eveningoutpost.dexdrip.ui.dialog.QuickSettingsDialogs;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/TimePickerPrefActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/TimePickerPrefActivity.java
index 38189aa6d4..acac50abaf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/TimePickerPrefActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/activities/TimePickerPrefActivity.java
@@ -4,9 +4,9 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.profileeditor.TimePickerFragment;
 
 import java.util.Locale;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/charts/BasalChart.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/charts/BasalChart.java
index 3936a06072..8ea4444633 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/charts/BasalChart.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/charts/BasalChart.java
@@ -4,9 +4,9 @@
 import android.support.annotation.NonNull;
 import android.text.format.DateFormat;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.ColorCache;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.ColorCache;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.text.DateFormatSymbols;
@@ -27,7 +27,7 @@
 import lecho.lib.hellocharts.model.SubcolumnValue;
 import lecho.lib.hellocharts.view.ColumnChartView;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.getCol;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.getCol;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/classifier/NoteClassifier.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/classifier/NoteClassifier.java
index 27cd8ea3bc..eda5356c85 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/classifier/NoteClassifier.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/classifier/NoteClassifier.java
@@ -7,7 +7,7 @@
 import android.support.annotation.DrawableRes;
 
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.PointValueExtended;
+import com.eveningoutpost.dexdrip.utilitymodels.PointValueExtended;
 import com.eveningoutpost.dexdrip.ui.helpers.BitmapLoader;
 import com.eveningoutpost.dexdrip.ui.helpers.ColorUtil;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/ColorPreferenceDialog.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/ColorPreferenceDialog.java
index 92c1ead89b..3b1cd922b6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/ColorPreferenceDialog.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/ColorPreferenceDialog.java
@@ -6,8 +6,8 @@
 import android.graphics.Color;
 
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.ColorCache;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.ColorCache;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.rarepebble.colorpicker.ColorPickerView;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/G6CalibrationCodeDialog.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/G6CalibrationCodeDialog.java
index 6aad43b087..22ecdc1904 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/G6CalibrationCodeDialog.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/G6CalibrationCodeDialog.java
@@ -8,8 +8,8 @@
 import android.view.WindowManager;
 import android.widget.EditText;
 
-import com.eveningoutpost.dexdrip.G5Model.G6CalibrationParameters;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.g5model.G6CalibrationParameters;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/HeyFamUpdateOptInDialog.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/HeyFamUpdateOptInDialog.java
index df79e9762b..bc89c3188b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/HeyFamUpdateOptInDialog.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/HeyFamUpdateOptInDialog.java
@@ -4,13 +4,13 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Experience;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Experience;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.UpdateActivity.AUTO_UPDATE_PREFS_NAME;
+import static com.eveningoutpost.dexdrip.utilitymodels.UpdateActivity.AUTO_UPDATE_PREFS_NAME;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/QuickSettingsDialogs.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/QuickSettingsDialogs.java
index 85501cb6e3..764c78386f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/QuickSettingsDialogs.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/dialog/QuickSettingsDialogs.java
@@ -8,9 +8,9 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/graphic/JamTrendArrowImpl.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/graphic/JamTrendArrowImpl.java
index f0582fd29f..4274547cc1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/graphic/JamTrendArrowImpl.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/graphic/JamTrendArrowImpl.java
@@ -12,7 +12,7 @@
 import android.widget.SeekBar;
 
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import static com.eveningoutpost.dexdrip.ui.helpers.ColorUtil.hueFilter;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/graphic/TrendArrowFactory.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/graphic/TrendArrowFactory.java
index 4c882579de..2612885567 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/graphic/TrendArrowFactory.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/graphic/TrendArrowFactory.java
@@ -3,9 +3,9 @@
 import android.os.Build;
 import android.widget.ImageView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 /*
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/helpers/BitmapLoader.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/helpers/BitmapLoader.java
index 00cebb3f6a..f079d7aafa 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/helpers/BitmapLoader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/helpers/BitmapLoader.java
@@ -12,7 +12,7 @@
 import android.support.v7.content.res.AppCompatResources;
 import android.util.LruCache;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import lecho.lib.hellocharts.model.PointValue;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/helpers/BitmapUtil.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/helpers/BitmapUtil.java
index 739b4861e3..8a23225656 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ui/helpers/BitmapUtil.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ui/helpers/BitmapUtil.java
@@ -13,8 +13,8 @@
 import android.media.ExifInterface;
 import android.net.Uri;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.io.FileDescriptor;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/AlertPlayer.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/AlertPlayer.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
index d69028abc8..4133a6ebe2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/AlertPlayer.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -17,15 +17,15 @@
 
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.SnoozeOnNotificationDismissService;
+import com.eveningoutpost.dexdrip.services.SnoozeOnNotificationDismissService;
 import com.eveningoutpost.dexdrip.SnoozeActivity;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleWatchSync;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleWatchSync;
 import com.eveningoutpost.dexdrip.eassist.AlertTracker;
 import com.eveningoutpost.dexdrip.watch.lefun.LeFun;
 import com.eveningoutpost.dexdrip.watch.lefun.LeFunEntry;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
index bb4b8dcd84..2055d85979 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.Activity;
 import android.content.Context;
@@ -17,24 +17,24 @@
 import com.eveningoutpost.dexdrip.AddCalibration;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.APStatus;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.Forecast;
-import com.eveningoutpost.dexdrip.Models.Forecast.PolyTrendLine;
-import com.eveningoutpost.dexdrip.Models.Forecast.TrendLine;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.Iob;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Libre2RawValue;
-import com.eveningoutpost.dexdrip.Models.Prediction;
-import com.eveningoutpost.dexdrip.Models.Profile;
-import com.eveningoutpost.dexdrip.Models.StepCounter;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.APStatus;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.Forecast;
+import com.eveningoutpost.dexdrip.models.Forecast.PolyTrendLine;
+import com.eveningoutpost.dexdrip.models.Forecast.TrendLine;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.Iob;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Libre2RawValue;
+import com.eveningoutpost.dexdrip.models.Prediction;
+import com.eveningoutpost.dexdrip.models.Profile;
+import com.eveningoutpost.dexdrip.models.StepCounter;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 import com.eveningoutpost.dexdrip.store.FastStore;
@@ -77,8 +77,8 @@
 import lecho.lib.hellocharts.util.ChartUtils;
 import lecho.lib.hellocharts.view.Chart;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.X;
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.getCol;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.X;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.getCol;
 
 public class BgGraphBuilder {
     public static final int FUZZER = (1000 * 30 * 5); // 2.5 minutes
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSendQueue.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSendQueue.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSendQueue.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSendQueue.java
index 28fce1df20..658c413fc9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSendQueue.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSendQueue.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
@@ -14,16 +14,15 @@
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.NewDataObserver;
-import com.eveningoutpost.dexdrip.Services.SyncService;
+import com.eveningoutpost.dexdrip.services.SyncService;
 import com.eveningoutpost.dexdrip.WidgetUpdateService;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 import com.eveningoutpost.dexdrip.xDripWidget;
-import com.rits.cloning.Cloner;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSparklineBuilder.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSparklineBuilder.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSparklineBuilder.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSparklineBuilder.java
index d7ce4f0e43..f3ecce7e00 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSparklineBuilder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSparklineBuilder.java
@@ -1,15 +1,13 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Matrix;
-import android.util.DisplayMetrics;
 import android.view.View;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Blukon.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Blukon.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Blukon.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Blukon.java
index 21f9912c88..a24e5525d5 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Blukon.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Blukon.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -7,19 +7,18 @@
 import android.view.WindowManager;
 import android.widget.EditText;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.NFCReaderX;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.xdrip;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeBattery.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeBattery.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeBattery.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeBattery.java
index 3381def703..2d3192a3a6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeBattery.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeBattery.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeResponse.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeResponse.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeResponse.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeResponse.java
index b2ef1a13e8..41694a0a67 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeResponse.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeResponse.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastGlucose.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastGlucose.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
index c4032d0710..2ad5e6dfae 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastGlucose.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
@@ -1,15 +1,15 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Intent;
 import android.os.Bundle;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Noise;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Noise;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastSnooze.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastSnooze.java
similarity index 83%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastSnooze.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastSnooze.java
index 72ef42e18d..82a7e76d7a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastSnooze.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastSnooze.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Intent;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import static com.eveningoutpost.dexdrip.xdrip.getAppContext;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastSnoozeReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastSnoozeReceiver.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastSnoozeReceiver.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastSnoozeReceiver.java
index 3f33adae35..70de6ed7be 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastSnoozeReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastSnoozeReceiver.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CalibrationSendQueue.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CalibrationSendQueue.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CalibrationSendQueue.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CalibrationSendQueue.java
index f9c25cc604..c37d0fc5a6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CalibrationSendQueue.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CalibrationSendQueue.java
@@ -1,8 +1,6 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 
 import com.activeandroid.Model;
@@ -10,9 +8,9 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CollectionServiceStarter.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CollectionServiceStarter.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CollectionServiceStarter.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CollectionServiceStarter.java
index 462dbad716..dab21bc36c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CollectionServiceStarter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CollectionServiceStarter.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,16 +10,16 @@
 import com.eveningoutpost.dexdrip.BuildConfig;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.DexShareCollectionService;
-import com.eveningoutpost.dexdrip.Services.DoNothingService;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.WifiCollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleUtil;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleWatchSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.DexShareCollectionService;
+import com.eveningoutpost.dexdrip.services.DoNothingService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.services.WifiCollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleUtil;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleWatchSync;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
 import com.eveningoutpost.dexdrip.xdrip;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ColorCache.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ColorCache.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ColorCache.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ColorCache.java
index 87afeec8b3..90095fee87 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ColorCache.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ColorCache.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.graphics.Color;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.EnumMap;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ColorPicker.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ColorPicker.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ColorPicker.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ColorPicker.java
index 89de7efb7f..843793abd4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ColorPicker.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ColorPicker.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CompatibleApps.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CompatibleApps.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CompatibleApps.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CompatibleApps.java
index 392527c102..7799a8533b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CompatibleApps.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CompatibleApps.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -14,15 +14,15 @@
 
 import com.eveningoutpost.dexdrip.BuildConfig;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.G5BaseService;
+import com.eveningoutpost.dexdrip.services.G5BaseService;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.webservices.XdripWebService;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.COMPATIBLE_BASE_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.COMPATIBLE_BASE_ID;
 
 /**
  * Created by jamorham on 01/11/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Constants.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Constants.java
index 2998fcf19e..c18e05574c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Constants.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * Various constants
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/DexShareAttributes.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/DexShareAttributes.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/DexShareAttributes.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/DexShareAttributes.java
index 643e6742fe..237187ceb7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/DexShareAttributes.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/DexShareAttributes.java
@@ -1,6 +1,5 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import java.math.BigInteger;
 import java.util.UUID;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Experience.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Experience.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Experience.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Experience.java
index ecaf1ee0a2..3a180576be 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Experience.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Experience.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -7,9 +7,9 @@
 
 import com.eveningoutpost.dexdrip.BuildConfig;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.utils.Preferences;
 import com.eveningoutpost.dexdrip.utils.SdcardImportExport;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ForegroundServiceStarter.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ForegroundServiceStarter.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ForegroundServiceStarter.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ForegroundServiceStarter.java
index 225c938e3b..d423e88979 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ForegroundServiceStarter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ForegroundServiceStarter.java
@@ -1,16 +1,16 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.Service;
 import android.content.Context;
 import android.os.Build;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
-import static com.eveningoutpost.dexdrip.UtilityModels.Notifications.ongoingNotificationId;
+import static com.eveningoutpost.dexdrip.utilitymodels.Notifications.ongoingNotificationId;
 
 /**
  * Created by Emma Black on 12/25/14.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/GraphTools.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/GraphTools.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/GraphTools.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/GraphTools.java
index 82fe8d8247..cc7404ec1b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/GraphTools.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/GraphTools.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
 import android.util.Pair;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.BgReading;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/HM10Attributes.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/HM10Attributes.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/HM10Attributes.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/HM10Attributes.java
index 2d49769263..e248484eea 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/HM10Attributes.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/HM10Attributes.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * Created by Emma Black on 10/26/14.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/IdempotentMigrations.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/IdempotentMigrations.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java
index 5969ccf901..306e3bbb9f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/IdempotentMigrations.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java
@@ -1,24 +1,24 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.Libre2RawValue;
-import com.eveningoutpost.dexdrip.Models.Libre2Sensor;
-import com.eveningoutpost.dexdrip.Models.APStatus;
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.Libre2RawValue;
+import com.eveningoutpost.dexdrip.models.Libre2Sensor;
+import com.eveningoutpost.dexdrip.models.APStatus;
+import com.eveningoutpost.dexdrip.models.BgReading;
 //import com.eveningoutpost.dexdrip.Models.BgReadingArchive;
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.LibreData;
-import com.eveningoutpost.dexdrip.Models.PenData;
-import com.eveningoutpost.dexdrip.Models.Prediction;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.LibreData;
+import com.eveningoutpost.dexdrip.models.PenData;
+import com.eveningoutpost.dexdrip.models.Prediction;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.SnoozeActivity;
-import com.eveningoutpost.dexdrip.Models.AlertType;
+import com.eveningoutpost.dexdrip.models.AlertType;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/IncompatibleApps.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IncompatibleApps.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/IncompatibleApps.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IncompatibleApps.java
index a8786363f6..9e9a8fddfd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/IncompatibleApps.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IncompatibleApps.java
@@ -1,15 +1,15 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.INCOMPATIBLE_BASE_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.INCOMPATIBLE_BASE_ID;
 
 /**
  * Created by jamorham on 01/11/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Inevitable.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Inevitable.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Inevitable.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Inevitable.java
index c781d67820..9f6fb5755f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Inevitable.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Inevitable.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/InstalledApps.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/InstalledApps.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/InstalledApps.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/InstalledApps.java
index 48022320d7..8be5bd1b71 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/InstalledApps.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/InstalledApps.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -8,7 +8,7 @@
 import android.content.pm.ResolveInfo;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Intents.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Intents.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Intents.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Intents.java
index ceaab8b519..1f4b5e3d1c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Intents.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Intents.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * For integration.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/JamorhamShowcaseDrawer.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/JamorhamShowcaseDrawer.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/JamorhamShowcaseDrawer.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/JamorhamShowcaseDrawer.java
index 56b5ab499f..3efbf1cb8e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/JamorhamShowcaseDrawer.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/JamorhamShowcaseDrawer.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * Created by jamorham on 20/06/2016.
@@ -7,8 +7,6 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.util.DisplayMetrics;
-import android.util.Log;
 
 import com.eveningoutpost.dexdrip.R;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LibreUtils.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LibreUtils.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LibreUtils.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LibreUtils.java
index 1c2eb87bc8..0f0a1532ff 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LibreUtils.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LibreUtils.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LowPriorityThread.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LowPriorityThread.java
similarity index 85%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LowPriorityThread.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LowPriorityThread.java
index 27dfb7649e..7cccf61e87 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LowPriorityThread.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LowPriorityThread.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MockDataSource.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MockDataSource.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MockDataSource.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MockDataSource.java
index 82e8249086..34ea361599 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MockDataSource.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MockDataSource.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigure.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigure.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigure.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigure.java
index edb1e542fc..e9dc8a907e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigure.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigure.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Intent;
 import android.hardware.usb.UsbDevice;
@@ -8,8 +8,8 @@
 import android.support.annotation.StringRes;
 import android.text.SpannableString;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.ui.helpers.Span;
 import com.eveningoutpost.dexdrip.utils.usb.MtpTools.MtpDeviceHelper;
 import com.eveningoutpost.dexdrip.utils.usb.UsbTools;
@@ -18,9 +18,9 @@
 
 import java.nio.charset.Charset;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.GOOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NORMAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.BAD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.GOOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NORMAL;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.DEX_COLLECTION_METHOD;
 import static com.eveningoutpost.dexdrip.utils.GetWearApk.getBytes;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigureActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigureActivity.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigureActivity.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigureActivity.java
index f32fb83619..8bbecb7db2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigureActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigureActivity.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.databinding.ActivityMtpConfigureBinding;
 import com.eveningoutpost.dexdrip.utils.usb.UsbTools;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NanoStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NanoStatus.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NanoStatus.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NanoStatus.java
index 5a38563b80..3bb79192f0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NanoStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NanoStatus.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * NanoStatus allows access to a static class based status interface
@@ -17,11 +17,11 @@
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.G5Model.SensorDays;
+import com.eveningoutpost.dexdrip.g5model.SensorDays;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.adapters.SpannableSerializer;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
@@ -31,7 +31,7 @@
 import lombok.Setter;
 import lombok.val;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
 public class NanoStatus {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutTreatments.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutTreatments.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
index ed9bbc2179..d392ac96bf 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutTreatments.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
@@ -1,12 +1,12 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.DateUtil;
-import com.eveningoutpost.dexdrip.Models.InsulinInjection;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.DateUtil;
+import com.eveningoutpost.dexdrip.models.InsulinInjection;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -16,7 +16,7 @@
 import java.util.HashSet;
 import java.util.UUID;
 
-import static com.eveningoutpost.dexdrip.Models.Treatments.pushTreatmentSyncToWatch;
+import static com.eveningoutpost.dexdrip.models.Treatments.pushTreatmentSyncToWatch;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutUploader.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutUploader.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutUploader.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutUploader.java
index c581eaaedc..23fdb78fc7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutUploader.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutUploader.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,20 +12,20 @@
 
 import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.MegaStatus;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.DateUtil;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.StepCounter;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.DateUtil;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.StepCounter;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.Mdns;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NotificationChannels.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NotificationChannels.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NotificationChannels.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NotificationChannels.java
index 489e50f517..547312a150 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NotificationChannels.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NotificationChannels.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Notifications.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Notifications.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java
index 02e4aa6633..8a35e33b7a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Notifications.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.IntentService;
 import android.app.Notification;
@@ -30,19 +30,19 @@
 import com.eveningoutpost.dexdrip.DoubleCalibrationActivity;
 import com.eveningoutpost.dexdrip.EditAlertActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.CalibrationRequest;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.UserNotification;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.CalibrationRequest;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserNotification;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
-import com.eveningoutpost.dexdrip.Services.MissedReadingService;
-import com.eveningoutpost.dexdrip.Services.SnoozeOnNotificationDismissService;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.services.MissedReadingService;
+import com.eveningoutpost.dexdrip.services.SnoozeOnNotificationDismissService;
 import com.eveningoutpost.dexdrip.evaluators.PersistentHigh;
 import com.eveningoutpost.dexdrip.ui.NumberGraphic;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
@@ -53,8 +53,8 @@
 import java.util.Date;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.X;
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.getCol;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.X;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.getCol;
 
 /**
  * Created by Emma Black on 11/28/14.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/OkHttpWrapper.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/OkHttpWrapper.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/OkHttpWrapper.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/OkHttpWrapper.java
index b087a91c6b..74946544bd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/OkHttpWrapper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/OkHttpWrapper.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.annotation.SuppressLint;
 import android.os.Build;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PersistentStore.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PersistentStore.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PersistentStore.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PersistentStore.java
index 4d1f8dad38..e3466ebae1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PersistentStore.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PersistentStore.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.common.primitives.Bytes;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PlusAsyncExecutor.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PlusAsyncExecutor.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PlusAsyncExecutor.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PlusAsyncExecutor.java
index 97b8a09e1c..cd1616e6c1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PlusAsyncExecutor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PlusAsyncExecutor.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.PowerManager;
 import android.support.annotation.NonNull;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.util.ArrayDeque;
 import java.util.HashMap;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PointValueExtended.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PointValueExtended.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PointValueExtended.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PointValueExtended.java
index af55ba8365..e8a81ab0b2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PointValueExtended.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PointValueExtended.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import lecho.lib.hellocharts.model.PointValue;
 import lombok.NoArgsConstructor;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Pref.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Pref.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Pref.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Pref.java
index 9046233904..16bf22212f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Pref.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Pref.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsView.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsView.java
similarity index 83%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsView.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsView.java
index 792feca8db..c316309fa1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsView.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsView.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * Created by jamorham on 04/10/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsViewImpl.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImpl.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsViewImpl.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImpl.java
index 6ced916a1e..69cef658fb 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsViewImpl.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImpl.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.support.annotation.NonNull;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsViewString.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewString.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsViewString.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewString.java
index 7bb037aa15..c3c21a2d06 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PrefsViewString.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewString.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.support.annotation.NonNull;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PumpStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PumpStatus.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PumpStatus.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PumpStatus.java
index fc6ed41671..2d0420d8da 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PumpStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PumpStatus.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RedBearLabAttributes.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RedBearLabAttributes.java
similarity index 89%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RedBearLabAttributes.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RedBearLabAttributes.java
index f84acd60cb..b04b455a9b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RedBearLabAttributes.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RedBearLabAttributes.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import java.util.UUID;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RxBleProvider.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RxBleProvider.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RxBleProvider.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RxBleProvider.java
index fcdb6bdafc..d2f5a784d6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RxBleProvider.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RxBleProvider.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
 // TODO check this reference handling
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.polidea.rxandroidble2.RxBleClient;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendFeedBack.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendFeedBack.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendFeedBack.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendFeedBack.java
index 9a1c89235d..b138d16ad2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendFeedBack.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendFeedBack.java
@@ -1,10 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.text.InputType;
 import android.util.Log;
 import android.view.View;
@@ -15,7 +14,7 @@
 import android.widget.Toast;
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
 import com.squareup.okhttp.FormEncodingBuilder;
 import com.squareup.okhttp.Interceptor;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendXdripBroadcast.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendXdripBroadcast.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendXdripBroadcast.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendXdripBroadcast.java
index 88d5a4298b..6ec92cc91b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendXdripBroadcast.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendXdripBroadcast.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorSendQueue.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorSendQueue.java
similarity index 86%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorSendQueue.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorSendQueue.java
index 69a845e698..4beba494a1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorSendQueue.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorSendQueue.java
@@ -1,8 +1,5 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 
 import com.activeandroid.Model;
@@ -11,8 +8,7 @@
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.xdrip;
-import com.eveningoutpost.dexdrip.Models.Sensor;
+import com.eveningoutpost.dexdrip.models.Sensor;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorStatus.java
similarity index 85%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorStatus.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorStatus.java
index f84eb6d8b2..f3c3c41b87 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorStatus.java
@@ -1,12 +1,12 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import com.eveningoutpost.dexdrip.Models.Sensor;
+import com.eveningoutpost.dexdrip.models.Sensor;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.tsl;
+import static com.eveningoutpost.dexdrip.models.JoH.tsl;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ShotStateStore.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ShotStateStore.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ShotStateStore.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ShotStateStore.java
index c8fcd2d5fb..95ffbb2e2a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ShotStateStore.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ShotStateStore.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * Created by jamorham on 20/06/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SimpleImageEncoder.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SimpleImageEncoder.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SimpleImageEncoder.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SimpleImageEncoder.java
index e6e7dd0f65..1d3f159ca8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SimpleImageEncoder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SimpleImageEncoder.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SourceWizard.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SourceWizard.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SourceWizard.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SourceWizard.java
index aa5f8d07b5..47398dc634 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SourceWizard.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SourceWizard.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -10,7 +10,7 @@
 import android.view.View;
 
 import com.eveningoutpost.dexdrip.BR;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.databinding.DialogTreeSelectorBinding;
 import com.eveningoutpost.dexdrip.utils.DexCollectionHelper;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SpeechUtil.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SpeechUtil.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SpeechUtil.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SpeechUtil.java
index 3382a61586..adbf34b331 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SpeechUtil.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SpeechUtil.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -7,8 +7,8 @@
 import android.os.PowerManager;
 import android.speech.tts.TextToSpeech;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.Locale;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StandardShowcaseDrawer.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StandardShowcaseDrawer.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StandardShowcaseDrawer.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StandardShowcaseDrawer.java
index 467c0231c6..ca32a8dd6f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StandardShowcaseDrawer.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StandardShowcaseDrawer.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusItem.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusItem.java
similarity index 78%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusItem.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusItem.java
index de73d6e8e3..3867f297f1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusItem.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusItem.java
@@ -1,17 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.graphics.Color;
 import android.support.annotation.ColorInt;
 
-import com.google.common.base.MoreObjects;
-
-import java.util.HashMap;
-
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.CRITICAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.GOOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NORMAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NOTICE;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NORMAL;
 
 /**
  * Created by jamorham on 14/01/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusLine.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusLine.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusLine.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusLine.java
index f66ba27408..86a49567ac 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusLine.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusLine.java
@@ -1,13 +1,13 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.support.annotation.NonNull;
 
-import com.eveningoutpost.dexdrip.Models.Accuracy;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.Accuracy;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 import com.eveningoutpost.dexdrip.stats.StatsResult;
@@ -16,7 +16,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.DAY_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.DAY_IN_MS;
 import static com.eveningoutpost.dexdrip.calibrations.PluggableCalibration.getCalibrationPlugin;
 import static com.eveningoutpost.dexdrip.calibrations.PluggableCalibration.getCalibrationPluginFromPreferences;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Tls12SocketFactory.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Tls12SocketFactory.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Tls12SocketFactory.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Tls12SocketFactory.java
index 683540293b..23e8edbc8e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Tls12SocketFactory.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Tls12SocketFactory.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Tree.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Tree.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Tree.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Tree.java
index c5f53c94b3..70344f4dbb 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Tree.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Tree.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UndoRedo.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UndoRedo.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UndoRedo.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UndoRedo.java
index 6145305c21..06bab9987d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UndoRedo.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UndoRedo.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Unitized.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Unitized.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Unitized.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Unitized.java
index 84e1bfabd9..4276fc7345 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Unitized.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Unitized.java
@@ -1,9 +1,8 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.BgReading;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UpdateActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UpdateActivity.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
index 10a7212fac..44f24ca759 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UpdateActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
@@ -17,7 +17,6 @@
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
@@ -29,8 +28,8 @@
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 
@@ -51,7 +50,7 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.OkHttpWrapper.enableTls12OnPreLollipop;
+import static com.eveningoutpost.dexdrip.utilitymodels.OkHttpWrapper.enableTls12OnPreLollipop;
 
 public class UpdateActivity extends BaseAppCompatActivity {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderQueue.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderQueue.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderQueue.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderQueue.java
index f311c02844..463bf4e870 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderQueue.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderQueue.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.database.Cursor;
 import android.provider.BaseColumns;
@@ -12,15 +12,14 @@
 import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.tidepool.TidepoolEntry;
 import com.eveningoutpost.dexdrip.tidepool.TidepoolStatus;
 import com.eveningoutpost.dexdrip.tidepool.TidepoolUploader;
@@ -35,7 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Services.SyncService.startSyncService;
+import static com.eveningoutpost.dexdrip.services.SyncService.startSyncService;
 
 /**
  * Created by jamorham on 15/11/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderTask.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderTask.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderTask.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderTask.java
index f0fe1fc1af..2e0924b543 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderTask.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderTask.java
@@ -1,19 +1,19 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 import android.os.AsyncTask;
 
-import com.eveningoutpost.dexdrip.InfluxDB.InfluxDBUploader;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.influxdb.InfluxDBUploader;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
-import com.eveningoutpost.dexdrip.Services.SyncService;
+import com.eveningoutpost.dexdrip.services.SyncService;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VehicleMode.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VehicleMode.java
similarity index 86%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VehicleMode.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VehicleMode.java
index d388bd03b3..03624dfe79 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VehicleMode.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VehicleMode.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * jamorham
@@ -11,10 +11,10 @@
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Intents.ACTION_VEHICLE_MODE;
-import static com.eveningoutpost.dexdrip.UtilityModels.Intents.EXTRA_VEHICLE_MODE_ENABLED;
+import static com.eveningoutpost.dexdrip.utilitymodels.Intents.ACTION_VEHICLE_MODE;
+import static com.eveningoutpost.dexdrip.utilitymodels.Intents.EXTRA_VEHICLE_MODE_ENABLED;
 
 public class VehicleMode {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VersionTracker.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VersionTracker.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VersionTracker.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VersionTracker.java
index bfe03b0e8f..5174abcfc2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VersionTracker.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VersionTracker.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.dateTimeText;
+import static com.eveningoutpost.dexdrip.models.JoH.dateTimeText;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VoiceCommands.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VoiceCommands.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VoiceCommands.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VoiceCommands.java
index 13c7b50541..0b18e9da3e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VoiceCommands.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VoiceCommands.java
@@ -1,21 +1,21 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
 import android.app.Activity;
 
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
-import com.eveningoutpost.dexdrip.Services.G5BaseService;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.services.G5BaseService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
 import com.eveningoutpost.dexdrip.cgm.medtrum.MedtrumCollectionService;
 import com.eveningoutpost.dexdrip.ui.activities.DatabaseAdmin;
 import com.eveningoutpost.dexdrip.ui.dialog.G6CalibrationCodeDialog;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncBooleans.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncBooleans.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncBooleans.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncBooleans.java
index bffba51a08..10b84b0855 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncBooleans.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncBooleans.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncPersistentStrings.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncPersistentStrings.java
similarity index 77%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncPersistentStrings.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncPersistentStrings.java
index f8534adf35..72f0be8ef1 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncPersistentStrings.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncPersistentStrings.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import com.eveningoutpost.dexdrip.G5Model.G6CalibrationParameters;
+import com.eveningoutpost.dexdrip.g5model.G6CalibrationParameters;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WholeHouse.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WholeHouse.java
similarity index 89%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WholeHouse.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WholeHouse.java
index 67935e6f3d..80f94cecc5 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WholeHouse.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WholeHouse.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
 import android.content.pm.PackageManager;
 import android.os.Build;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
 public class WholeHouse {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XDripDreamService.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XDripDreamService.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XDripDreamService.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XDripDreamService.java
index 9f14bcef01..0282d91138 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XDripDreamService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XDripDreamService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.animation.TimeAnimator;
 import android.content.Context;
@@ -24,12 +24,12 @@
 import android.widget.TextView;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static com.eveningoutpost.dexdrip.UtilityModels.ColorCache.getCol;
+import static com.eveningoutpost.dexdrip.utilitymodels.ColorCache.getCol;
 
 /**
  * Created by jamorham on 31/10/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XDripDreamSettingsActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XDripDreamSettingsActivity.java
similarity index 85%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XDripDreamSettingsActivity.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XDripDreamSettingsActivity.java
index 16409a73a9..e8b2429800 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XDripDreamSettingsActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XDripDreamSettingsActivity.java
@@ -1,7 +1,6 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
 import com.eveningoutpost.dexdrip.databinding.ActivityXdripDreamSettingsBinding;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XbridgePlus.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XbridgePlus.java
similarity index 94%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XbridgePlus.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XbridgePlus.java
index a3febb5183..dc039fbbfb 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XbridgePlus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XbridgePlus.java
@@ -1,12 +1,12 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.LIBRE_MULTIPLIER;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.LIBRE_MULTIPLIER;
 
 /**
  * Created by jamorham on 27/03/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XdripNotification.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XdripNotification.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XdripNotification.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XdripNotification.java
index 17299d13f0..7ad177e53c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XdripNotification.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XdripNotification.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XdripNotificationCompat.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XdripNotificationCompat.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XdripNotificationCompat.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XdripNotificationCompat.java
index 6d4e63ae92..cf8bb82582 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XdripNotificationCompat.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XdripNotificationCompat.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/DesertComms.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/DesertComms.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/DesertComms.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/DesertComms.java
index ebe6ec0b8b..ce63140d60 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/DesertComms.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/DesertComms.java
@@ -1,15 +1,15 @@
-package com.eveningoutpost.dexdrip.UtilityModels.desertsync;
+package com.eveningoutpost.dexdrip.utilitymodels.desertsync;
 
 import android.os.PowerManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.webservices.XdripWebService;
 import com.google.gson.annotations.Expose;
 
@@ -25,20 +25,20 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.cancelNotification;
-import static com.eveningoutpost.dexdrip.Models.JoH.defaultGsonInstance;
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.Models.JoH.getWakeLock;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.pratelimit;
-import static com.eveningoutpost.dexdrip.Models.JoH.releaseWakeLock;
-import static com.eveningoutpost.dexdrip.Models.JoH.showNotification;
-import static com.eveningoutpost.dexdrip.Models.JoH.tsl;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.DESERT_MASTER_UNREACHABLE;
-import static com.eveningoutpost.dexdrip.UtilityModels.desertsync.DesertComms.QueueHandler.MasterPing;
-import static com.eveningoutpost.dexdrip.UtilityModels.desertsync.DesertComms.QueueHandler.None;
-import static com.eveningoutpost.dexdrip.UtilityModels.desertsync.DesertComms.QueueHandler.Pull;
-import static com.eveningoutpost.dexdrip.UtilityModels.desertsync.DesertComms.QueueHandler.ToFollower;
+import static com.eveningoutpost.dexdrip.models.JoH.cancelNotification;
+import static com.eveningoutpost.dexdrip.models.JoH.defaultGsonInstance;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.getWakeLock;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.pratelimit;
+import static com.eveningoutpost.dexdrip.models.JoH.releaseWakeLock;
+import static com.eveningoutpost.dexdrip.models.JoH.showNotification;
+import static com.eveningoutpost.dexdrip.models.JoH.tsl;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.DESERT_MASTER_UNREACHABLE;
+import static com.eveningoutpost.dexdrip.utilitymodels.desertsync.DesertComms.QueueHandler.MasterPing;
+import static com.eveningoutpost.dexdrip.utilitymodels.desertsync.DesertComms.QueueHandler.None;
+import static com.eveningoutpost.dexdrip.utilitymodels.desertsync.DesertComms.QueueHandler.Pull;
+import static com.eveningoutpost.dexdrip.utilitymodels.desertsync.DesertComms.QueueHandler.ToFollower;
 
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/RouteTools.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/RouteTools.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/RouteTools.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/RouteTools.java
index fa07b2ee2c..27c732386e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/RouteTools.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/RouteTools.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels.desertsync;
+package com.eveningoutpost.dexdrip.utilitymodels.desertsync;
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/TrustManager.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/TrustManager.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/TrustManager.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/TrustManager.java
index 3ddac95c75..98be3e93ed 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/TrustManager.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/TrustManager.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.UtilityModels.desertsync;
+package com.eveningoutpost.dexdrip.utilitymodels.desertsync;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 
 import java.security.KeyManagementException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayAbstract.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayAbstract.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayAbstract.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayAbstract.java
index fc8385b33d..c401e10ed4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayAbstract.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayAbstract.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
 import android.content.Context;
 import android.content.Intent;
@@ -7,13 +7,13 @@
 import android.preference.PreferenceManager;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.ParakeetHelper;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.store.FastStore;
 import com.eveningoutpost.dexdrip.store.KeyStore;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayDummy.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayDummy.java
similarity index 84%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayDummy.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayDummy.java
index 14b0348285..d00d83a2fd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayDummy.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayDummy.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
 import com.getpebble.android.kit.util.PebbleDictionary;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayInterface.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayInterface.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayInterface.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayInterface.java
index 623997de0e..01fefb6c11 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayInterface.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayInterface.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
 import android.content.Context;
 
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
 import com.getpebble.android.kit.util.PebbleDictionary;
 
 import java.util.UUID;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayStandard.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayStandard.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayStandard.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayStandard.java
index 6fd33cafdf..35c712290b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayStandard.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayStandard.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
 import android.content.Intent;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.getpebble.android.kit.PebbleKit;
 import com.getpebble.android.kit.util.PebbleDictionary;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrend.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayTrend.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrend.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayTrend.java
index 9ffe451545..b13ac9d64d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrend.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayTrend.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
 import android.graphics.Bitmap;
 import android.os.PowerManager;
@@ -6,15 +6,15 @@
 
 import com.eveningoutpost.dexdrip.BestGlucose;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSparklineBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.SimpleImageEncoder;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSparklineBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.SimpleImageEncoder;
 import com.getpebble.android.kit.PebbleKit;
 import com.getpebble.android.kit.util.PebbleDictionary;
 import com.getpebble.android.kit.util.PebbleTuple;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrendOld.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayTrendOld.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrendOld.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayTrendOld.java
index 968d827216..b3086dd971 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrendOld.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayTrendOld.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
 import android.graphics.Bitmap;
 import android.os.PowerManager;
@@ -6,15 +6,15 @@
 
 import com.eveningoutpost.dexdrip.BestGlucose;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSparklineBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.SimpleImageEncoder;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSparklineBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.SimpleImageEncoder;
 import com.getpebble.android.kit.PebbleKit;
 import com.getpebble.android.kit.util.PebbleDictionary;
 import com.getpebble.android.kit.util.PebbleTuple;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayType.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayType.java
similarity index 71%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayType.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayType.java
index 4a8e65991f..166bb319dd 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayType.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleDisplayType.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
 /**
  * Created by andy on 01/06/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleUtil.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleUtil.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleUtil.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleUtil.java
index 9656f54a0d..6d4569c331 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleUtil.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleUtil.java
@@ -1,9 +1,7 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
-import android.content.SharedPreferences;
-
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleWatchSync.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleWatchSync.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleWatchSync.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleWatchSync.java
index c675f94788..a3244f7941 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleWatchSync.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/PebbleWatchSync.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble;
 
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
@@ -7,15 +7,15 @@
 import android.os.IBinder;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.StepCounter;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BroadcastSnooze;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.StepCounter;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BroadcastSnooze;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.framework.ForegroundService;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.getpebble.android.kit.PebbleKit;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleClassicTrendWatchface.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleClassicTrendWatchface.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleClassicTrendWatchface.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleClassicTrendWatchface.java
index 53e860eb0a..4713e9e298 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleClassicTrendWatchface.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleClassicTrendWatchface.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface;
 
 import com.eveningoutpost.dexdrip.R;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleSnoozeControlApp.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleSnoozeControlApp.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleSnoozeControlApp.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleSnoozeControlApp.java
index 41f17038b1..fda109015f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleSnoozeControlApp.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleSnoozeControlApp.java
@@ -1,5 +1,5 @@
 
-package com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface;
 
 import com.eveningoutpost.dexdrip.R;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleTrendClayWatchFace.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleTrendClayWatchFace.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleTrendClayWatchFace.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleTrendClayWatchFace.java
index cb4f245060..24ff941421 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleTrendClayWatchFace.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleTrendClayWatchFace.java
@@ -1,5 +1,5 @@
 
-package com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface;
 
 import com.eveningoutpost.dexdrip.R;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleTrendWatchFace.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleTrendWatchFace.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleTrendWatchFace.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleTrendWatchFace.java
index 7a8a1adf30..5422cc1c14 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleTrendWatchFace.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleTrendWatchFace.java
@@ -1,5 +1,5 @@
 
-package com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface;
 
 import com.eveningoutpost.dexdrip.R;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleWatchFace.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleWatchFace.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleWatchFace.java
rename to app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleWatchFace.java
index 8aceb72376..ee75209695 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/watchface/InstallPebbleWatchFace.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/pebble/watchface/InstallPebbleWatchFace.java
@@ -1,5 +1,5 @@
 
-package com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface;
+package com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface;
 
 import android.Manifest;
 import android.app.Activity;
@@ -14,14 +14,12 @@
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutCompat;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 
 import java.io.File;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/ActivityWithMenu.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/ActivityWithMenu.java
index 1444646fb5..fe8d6ea682 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/ActivityWithMenu.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/ActivityWithMenu.java
@@ -5,8 +5,8 @@
 import android.support.v4.widget.DrawerLayout;
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.NavDrawerBuilder;
 import com.eveningoutpost.dexdrip.NavigationDrawerFragment;
 import com.eveningoutpost.dexdrip.R;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/BgToSpeech.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/BgToSpeech.java
index 95b3efee4d..8b2c94875f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/BgToSpeech.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/BgToSpeech.java
@@ -1,21 +1,21 @@
 package com.eveningoutpost.dexdrip.utils;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.SpeechUtil;
-import com.eveningoutpost.dexdrip.UtilityModels.VehicleMode;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.SpeechUtil;
+import com.eveningoutpost.dexdrip.utilitymodels.VehicleMode;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.text.DecimalFormat;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.SpeechUtil.TWICE_DELIMITER;
+import static com.eveningoutpost.dexdrip.utilitymodels.SpeechUtil.TWICE_DELIMITER;
 
 /**
  * Created by adrian on 07/09/15.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/CRC16ccitt.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/CRC16ccitt.java
index f6f7305d6c..a195513822 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/CRC16ccitt.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/CRC16ccitt.java
@@ -2,8 +2,8 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 public class CRC16ccitt {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/CheckBridgeBattery.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/CheckBridgeBattery.java
index b7ef86e939..50550d399d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/CheckBridgeBattery.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/CheckBridgeBattery.java
@@ -4,17 +4,17 @@
 import android.content.Intent;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.NotificationChannels;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.NotificationChannels;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.cancelNotification;
-import static com.eveningoutpost.dexdrip.Models.JoH.showNotification;
+import static com.eveningoutpost.dexdrip.models.JoH.cancelNotification;
+import static com.eveningoutpost.dexdrip.models.JoH.showNotification;
 
 /**
  * Created by jamorham on 26/01/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/CipherUtils.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/CipherUtils.java
index 24c970d0e3..ac9909d328 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/CipherUtils.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/CipherUtils.java
@@ -8,7 +8,7 @@
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.GoogleDriveInterface;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DatabaseUtil.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DatabaseUtil.java
index 24f6adc153..58eb391919 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DatabaseUtil.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DatabaseUtil.java
@@ -11,9 +11,9 @@
 
 import com.activeandroid.Cache;
 import com.activeandroid.Configuration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionHelper.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionHelper.java
index 70fb20a260..9bc279789a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionHelper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionHelper.java
@@ -6,11 +6,11 @@
 
 import com.eveningoutpost.dexdrip.BluetoothScan;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.cgm.sharefollow.ShareFollowService;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
index 4164737318..bfe55e5f2b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
@@ -1,12 +1,12 @@
 package com.eveningoutpost.dexdrip.utils;
 
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.DexShareCollectionService;
-import com.eveningoutpost.dexdrip.Services.DoNothingService;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.WifiCollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.DexShareCollectionService;
+import com.eveningoutpost.dexdrip.services.DoNothingService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.services.WifiCollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.cgm.medtrum.MedtrumCollectionService;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.NightscoutFollowService;
 import com.eveningoutpost.dexdrip.cgm.sharefollow.ShareFollowService;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DisconnectReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DisconnectReceiver.java
index bb1766db0e..2fa4ebb677 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DisconnectReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DisconnectReceiver.java
@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DisplayQRCode.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DisplayQRCode.java
index f2d4d414e9..3390c7f67f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DisplayQRCode.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DisplayQRCode.java
@@ -11,11 +11,11 @@
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
 import com.eveningoutpost.dexdrip.GcmActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl;
-import com.eveningoutpost.dexdrip.UtilityModels.desertsync.RouteTools;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PrefsViewImpl;
+import com.eveningoutpost.dexdrip.utilitymodels.desertsync.RouteTools;
 import com.eveningoutpost.dexdrip.databinding.ActivityDisplayQrcodeBinding;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.gson.Gson;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/ExampleChartPreferenceView.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/ExampleChartPreferenceView.java
index 76d92179c1..330a96452a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/ExampleChartPreferenceView.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/ExampleChartPreferenceView.java
@@ -9,7 +9,7 @@
 import android.view.ViewGroup;
 
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
 
 import lecho.lib.hellocharts.model.Viewport;
 import lecho.lib.hellocharts.view.LineChartView;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/FileUtils.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/FileUtils.java
index e534070ee0..42bbc35c33 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/FileUtils.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/FileUtils.java
@@ -10,7 +10,7 @@
 import java.util.Date;
 
 import com.eveningoutpost.dexdrip.xdrip;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 public class FileUtils {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/GetWearApk.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/GetWearApk.java
index 33f8e16bd3..bfcdb7e397 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/GetWearApk.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/GetWearApk.java
@@ -3,7 +3,7 @@
 import android.content.pm.ApplicationInfo;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.io.BufferedInputStream;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/HeadsetStateReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/HeadsetStateReceiver.java
index 4b75553b6c..84eaa0eaca 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/HeadsetStateReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/HeadsetStateReceiver.java
@@ -9,17 +9,17 @@
 import android.content.Intent;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.SpeechUtil;
-import com.eveningoutpost.dexdrip.UtilityModels.VehicleMode;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.SpeechUtil;
+import com.eveningoutpost.dexdrip.utilitymodels.VehicleMode;
 import com.eveningoutpost.dexdrip.ui.activities.SelectAudioDevice;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.SpeechUtil.TWICE_DELIMITER;
+import static com.eveningoutpost.dexdrip.utilitymodels.SpeechUtil.TWICE_DELIMITER;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/HomeWifi.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/HomeWifi.java
index 2139a5581b..7983a67448 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/HomeWifi.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/HomeWifi.java
@@ -4,11 +4,11 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.isLANConnected;
+import static com.eveningoutpost.dexdrip.models.JoH.isLANConnected;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendGraph.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendGraph.java
index 37ab2d94a8..eee6c5c063 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendGraph.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendGraph.java
@@ -1,21 +1,20 @@
 package com.eveningoutpost.dexdrip.utils;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.GlucoseData;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.ReadingData;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.GlucoseData;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.ReadingData;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.NFCReaderX;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -29,7 +28,7 @@
 import lecho.lib.hellocharts.util.ChartUtils;
 import lecho.lib.hellocharts.view.LineChartView;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.FUZZER;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.FUZZER;
 
 
 public class LibreTrendGraph extends BaseAppCompatActivity {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendUtil.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendUtil.java
index ee306b9463..65a06e392a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendUtil.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendUtil.java
@@ -6,11 +6,11 @@
 import java.util.List;
 
 import com.eveningoutpost.dexdrip.NFCReaderX;
-import com.eveningoutpost.dexdrip.Models.GlucoseData;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.ReadingData;
+import com.eveningoutpost.dexdrip.models.GlucoseData;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.ReadingData;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 /* 
     This class helps to retrieve the latest libre trend points. It holds data of one sensor only.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/LocationHelper.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/LocationHelper.java
index 8cf0279d74..af39253486 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/LocationHelper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/LocationHelper.java
@@ -13,7 +13,7 @@
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Mdns.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Mdns.java
index e7ffe371c0..1c737bc27c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Mdns.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Mdns.java
@@ -11,14 +11,14 @@
 
 import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.MegaStatus;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.JamorhamShowcaseDrawer;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.JamorhamShowcaseDrawer;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.github.amlcurran.showcaseview.ShowcaseView;
 import com.github.amlcurran.showcaseview.targets.ViewTarget;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
index 4b8466a07a..cc27c61167 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
@@ -47,43 +47,43 @@
 import com.bytehamster.lib.preferencesearch.SearchPreferenceResult;
 import com.bytehamster.lib.preferencesearch.SearchPreferenceResultListener;
 import com.eveningoutpost.dexdrip.BasePreferenceActivity;
-import com.eveningoutpost.dexdrip.G5Model.DexSyncKeeper;
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.g5model.DexSyncKeeper;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Profile;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.ExtraLogTags;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.UserNotification;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Profile;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.ExtraLogTags;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserNotification;
 import com.eveningoutpost.dexdrip.NFCReaderX;
 import com.eveningoutpost.dexdrip.ParakeetHelper;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
-import com.eveningoutpost.dexdrip.Services.BluetoothGlucoseMeter;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.G5BaseService;
-import com.eveningoutpost.dexdrip.Services.PlusSyncService;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Experience;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.ShotStateStore;
-import com.eveningoutpost.dexdrip.UtilityModels.SpeechUtil;
-import com.eveningoutpost.dexdrip.UtilityModels.UpdateActivity;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleUtil;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleWatchSync;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface.InstallPebbleClassicTrendWatchface;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface.InstallPebbleSnoozeControlApp;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface.InstallPebbleTrendClayWatchFace;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface.InstallPebbleTrendWatchFace;
-import com.eveningoutpost.dexdrip.UtilityModels.pebble.watchface.InstallPebbleWatchFace;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.services.BluetoothGlucoseMeter;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.G5BaseService;
+import com.eveningoutpost.dexdrip.services.PlusSyncService;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Experience;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.ShotStateStore;
+import com.eveningoutpost.dexdrip.utilitymodels.SpeechUtil;
+import com.eveningoutpost.dexdrip.utilitymodels.UpdateActivity;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleUtil;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.PebbleWatchSync;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface.InstallPebbleClassicTrendWatchface;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface.InstallPebbleSnoozeControlApp;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface.InstallPebbleTrendClayWatchFace;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface.InstallPebbleTrendWatchFace;
+import com.eveningoutpost.dexdrip.utilitymodels.pebble.watchface.InstallPebbleWatchFace;
 import com.eveningoutpost.dexdrip.WidgetUpdateService;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.NightscoutFollow;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Root.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Root.java
index 917fb813e6..bf5f0419ba 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Root.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Root.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.utils;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/SMS.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/SMS.java
index a61c2c72bb..b91ddcce16 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/SMS.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/SMS.java
@@ -4,7 +4,7 @@
 import android.telephony.SmsManager;
 import android.telephony.TelephonyManager;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/SdcardImportExport.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/SdcardImportExport.java
index ae140550e4..55db435252 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/SdcardImportExport.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/SdcardImportExport.java
@@ -17,10 +17,10 @@
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.io.File;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/SqliteRejigger.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/SqliteRejigger.java
index 68452d7ab7..a816399acb 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/SqliteRejigger.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/SqliteRejigger.java
@@ -7,7 +7,7 @@
 import android.database.sqlite.SQLiteDatabase;
 
 import com.activeandroid.Cache;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import lombok.NonNull;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Telemetry.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Telemetry.java
index 93dd408f88..145c70d92a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Telemetry.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Telemetry.java
@@ -6,17 +6,17 @@
 
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
 import com.eveningoutpost.dexdrip.NFCReaderX;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.stats.StatsResult;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.getVersionDetails;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.getTransmitterID;
+import static com.eveningoutpost.dexdrip.models.JoH.getVersionDetails;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.getTransmitterID;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.DexcomG5;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/BtReconnect.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/BtReconnect.java
index d73fca4a21..05ddf0631b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/BtReconnect.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/BtReconnect.java
@@ -9,9 +9,9 @@
 import android.os.Build;
 import android.os.Handler;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.lang.reflect.Method;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ConnectReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ConnectReceiver.java
index 78ccdde2dc..b8af43871d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ConnectReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ConnectReceiver.java
@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/HandleBleScanException.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/HandleBleScanException.java
index 990988c084..756c939927 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/HandleBleScanException.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/HandleBleScanException.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.utils.bt;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.Date;
 import java.util.Locale;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Mimeograph.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Mimeograph.java
index 085173fdba..fba2b77ab2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Mimeograph.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Mimeograph.java
@@ -1,11 +1,11 @@
 package com.eveningoutpost.dexdrip.utils.bt;
 
 import com.eveningoutpost.dexdrip.GcmActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.utils.Root;
 import com.eveningoutpost.dexdrip.xdrip;
@@ -22,7 +22,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 import static com.eveningoutpost.dexdrip.utils.bt.Mimeograph.SearchState.COPY_COLLISION_KEY;
 import static com.eveningoutpost.dexdrip.utils.bt.Mimeograph.SearchState.COPY_DEVICE_KEY;
 import static com.eveningoutpost.dexdrip.utils.bt.Mimeograph.SearchState.COPY_SCAN;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ScanMeister.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ScanMeister.java
index 57a2850b09..a476d00d35 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ScanMeister.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ScanMeister.java
@@ -5,11 +5,11 @@
 import android.os.ParcelUuid;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.RxBleProvider;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.RxBleProvider;
 import com.eveningoutpost.dexdrip.utils.BtCallBack;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.polidea.rxandroidble2.RxBleClient;
@@ -29,7 +29,7 @@
 import io.reactivex.schedulers.Schedulers;
 import lombok.NoArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.ratelimit;
+import static com.eveningoutpost.dexdrip.models.JoH.ratelimit;
 
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Subscription.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Subscription.java
index a53b6f7159..b0280e346b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Subscription.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Subscription.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.utils.bt;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import io.reactivex.disposables.Disposable;
 import io.reactivex.exceptions.UndeliverableException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/BuggySamsung.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/BuggySamsung.java
index 109896e4a1..63f0496de9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/BuggySamsung.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/BuggySamsung.java
@@ -2,15 +2,15 @@
 
 import android.os.Build;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.buggy_samsung;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.buggy_samsung;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/ForegroundService.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/ForegroundService.java
index 5c3c220c37..53d0a9d488 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/ForegroundService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/ForegroundService.java
@@ -4,10 +4,10 @@
 
 import android.app.Service;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 
 public abstract class ForegroundService extends Service {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/IncomingCallsReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/IncomingCallsReceiver.java
index e3b64f592b..0e506d60fb 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/IncomingCallsReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/IncomingCallsReceiver.java
@@ -17,10 +17,10 @@
 import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 import com.eveningoutpost.dexdrip.watch.lefun.LeFun;
 import com.eveningoutpost.dexdrip.watch.lefun.LeFunEntry;
 import com.eveningoutpost.dexdrip.watch.miband.MiBand;
@@ -33,7 +33,6 @@
 import static com.eveningoutpost.dexdrip.watch.miband.Const.MIBAND_NOTIFY_TYPE_CALL;
 import static com.eveningoutpost.dexdrip.watch.miband.Const.MIBAND_NOTIFY_TYPE_CANCEL;
 import static com.eveningoutpost.dexdrip.watch.thinjam.Const.THINJAM_NOTIFY_TYPE_CALL;
-import static com.eveningoutpost.dexdrip.watch.thinjam.Const.THINJAM_NOTIFY_TYPE_CANCEL;
 
 public class IncomingCallsReceiver extends BroadcastReceiver {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/WakeLockTrampoline.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/WakeLockTrampoline.java
index 3dd5565233..fea5f5e366 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/WakeLockTrampoline.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/framework/WakeLockTrampoline.java
@@ -9,9 +9,9 @@
 import android.util.SparseArray;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java
index 91f59f2edb..7e643589a3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java
@@ -2,10 +2,10 @@
 
 import android.support.annotation.NonNull;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.DailyIntentService;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.DailyIntentService;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.evernote.android.job.Job;
 import com.evernote.android.job.JobRequest;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/XDripJobCreator.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/XDripJobCreator.java
index 08e5f99e36..d2a16732b6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/XDripJobCreator.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/XDripJobCreator.java
@@ -3,8 +3,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.evernote.android.job.Job;
 import com.evernote.android.job.JobCreator;
 import com.evernote.android.job.JobManager;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/time/SlidingWindowConstraint.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/time/SlidingWindowConstraint.java
index 8a222c8d69..55d2cbe9b6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/time/SlidingWindowConstraint.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/time/SlidingWindowConstraint.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.utils.time;
 
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -10,7 +10,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
 /**
  * Created by jamorham on 14/02/2018.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/time/TimeRangeUtils.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/time/TimeRangeUtils.java
index 0df5434623..85b84f1187 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/time/TimeRangeUtils.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/time/TimeRangeUtils.java
@@ -6,14 +6,14 @@
 import android.text.format.DateFormat;
 import android.util.Pair;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.tolerantParseInt;
+import static com.eveningoutpost.dexdrip.models.JoH.tolerantParseInt;
 
 public class TimeRangeUtils {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/usb/MtpTools.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/usb/MtpTools.java
index 0943b87f3a..dfaf0d03af 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/usb/MtpTools.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/usb/MtpTools.java
@@ -11,9 +11,9 @@
 import android.os.ParcelFileDescriptor;
 import android.support.annotation.RequiresApi;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/usb/UsbTools.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/usb/UsbTools.java
index 29d4ea996f..a19090e94d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/usb/UsbTools.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/usb/UsbTools.java
@@ -8,7 +8,7 @@
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/PrefBinding.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/PrefBinding.java
index 24d826b133..716a77c5e2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/PrefBinding.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/PrefBinding.java
@@ -4,7 +4,7 @@
 
 import android.util.Pair;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/FindNearby.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/FindNearby.java
index 7ec6d39a38..375768dfe2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/FindNearby.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/FindNearby.java
@@ -2,7 +2,7 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.utils.BtCallBack;
 import com.eveningoutpost.dexdrip.utils.bt.ScanMeister;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/FunAlmanac.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/FunAlmanac.java
index 23d80629e9..1c2ca81af8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/FunAlmanac.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/FunAlmanac.java
@@ -2,8 +2,7 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.util.Calendar;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFun.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFun.java
index d9f3a1e76a..027487a57b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFun.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFun.java
@@ -1,9 +1,9 @@
 package com.eveningoutpost.dexdrip.watch.lefun;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 /**
  * Jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFunEntry.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFunEntry.java
index bcd3056d73..15490d7ca9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFunEntry.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFunEntry.java
@@ -2,9 +2,9 @@
 
 import android.content.SharedPreferences;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFunService.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFunService.java
index 90028d88ca..c876b1dea0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFunService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/LeFunService.java
@@ -6,15 +6,15 @@
 import android.os.PowerManager;
 import android.util.Pair;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.store.FastStore;
 import com.eveningoutpost.dexdrip.store.KeyStore;
 import com.eveningoutpost.dexdrip.utils.framework.IncomingCallsReceiver;
@@ -43,16 +43,16 @@
 
 import io.reactivex.schedulers.Schedulers;
 
-import static com.eveningoutpost.dexdrip.Models.ActiveBgAlert.currentlyAlerting;
-import static com.eveningoutpost.dexdrip.Models.JoH.bytesToHex;
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.Models.JoH.msTill;
-import static com.eveningoutpost.dexdrip.Models.JoH.niceTimeScalar;
-import static com.eveningoutpost.dexdrip.Models.JoH.roundDouble;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CLOSE;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.DISCOVER;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.INIT;
-import static com.eveningoutpost.dexdrip.UtilityModels.Unitized.mmolConvert;
+import static com.eveningoutpost.dexdrip.models.ActiveBgAlert.currentlyAlerting;
+import static com.eveningoutpost.dexdrip.models.JoH.bytesToHex;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.msTill;
+import static com.eveningoutpost.dexdrip.models.JoH.niceTimeScalar;
+import static com.eveningoutpost.dexdrip.models.JoH.roundDouble;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CLOSE;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.DISCOVER;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.INIT;
+import static com.eveningoutpost.dexdrip.utilitymodels.Unitized.mmolConvert;
 import static com.eveningoutpost.dexdrip.watch.lefun.Const.REPLY_CHARACTERISTIC;
 import static com.eveningoutpost.dexdrip.watch.lefun.Const.WRITE_CHARACTERISTIC;
 import static com.eveningoutpost.dexdrip.watch.lefun.LeFun.shakeToSnooze;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/ModelFeatures.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/ModelFeatures.java
index d0c390f7b3..eaff802778 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/ModelFeatures.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/ModelFeatures.java
@@ -2,7 +2,7 @@
 
 // jamorham
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
 public class ModelFeatures {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/messages/BaseTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/messages/BaseTx.java
index 2f1a891ee8..8bed34980f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/messages/BaseTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/lefun/messages/BaseTx.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.watch.lefun.messages;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/FindNearby.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/FindNearby.java
index a1d23cafca..932eaa1a9b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/FindNearby.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/FindNearby.java
@@ -4,7 +4,7 @@
 
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.utils.bt.BtCallBack2;
 import com.eveningoutpost.dexdrip.utils.bt.ScanMeister;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/FirmwareOperations.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/FirmwareOperations.java
index 88f466489b..b55fcf7556 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/FirmwareOperations.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/FirmwareOperations.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.watch.miband.Firmware;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.watch.miband.Const;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceGenerator.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceGenerator.java
index fe2c156e2d..8aeb140cc6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceGenerator.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceGenerator.java
@@ -10,11 +10,11 @@
 import android.graphics.Typeface;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.watch.miband.Firmware.WatchFaceParts.Header;
 import com.eveningoutpost.dexdrip.watch.miband.Firmware.WatchFaceParts.Image;
 import com.eveningoutpost.dexdrip.watch.miband.Firmware.WatchFaceParts.Parameter;
@@ -33,8 +33,8 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import static com.eveningoutpost.dexdrip.Models.JoH.hourMinuteString;
-import static com.eveningoutpost.dexdrip.Models.JoH.threadSleep;
+import static com.eveningoutpost.dexdrip.models.JoH.hourMinuteString;
+import static com.eveningoutpost.dexdrip.models.JoH.threadSleep;
 import static com.eveningoutpost.dexdrip.utils.FileUtils.getExternalDir;
 import static com.eveningoutpost.dexdrip.utils.FileUtils.makeSureDirectoryExists;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceParts/Image.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceParts/Image.java
index 1158aa1efb..6c01d69286 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceParts/Image.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceParts/Image.java
@@ -3,7 +3,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.watch.miband.Firmware.WatchFaceGenerator;
 import com.eveningoutpost.dexdrip.watch.miband.Firmware.WatchFaceParts.Utils.PnnQuantizer;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceParts/Utils/BgMibandSparklineBuilder.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceParts/Utils/BgMibandSparklineBuilder.java
index da9d89cedb..ab0ea42cd7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceParts/Utils/BgMibandSparklineBuilder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/Firmware/WatchFaceParts/Utils/BgMibandSparklineBuilder.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 
-import com.eveningoutpost.dexdrip.UtilityModels.BgSparklineBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSparklineBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/FunAlmanac.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/FunAlmanac.java
index 3bc3725f92..cf831edbfa 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/FunAlmanac.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/FunAlmanac.java
@@ -1,14 +1,14 @@
 package com.eveningoutpost.dexdrip.watch.miband;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 
 import java.util.Calendar;
 
 import lombok.AllArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.roundDouble;
-import static com.eveningoutpost.dexdrip.UtilityModels.Unitized.mmolConvert;
+import static com.eveningoutpost.dexdrip.models.JoH.roundDouble;
+import static com.eveningoutpost.dexdrip.utilitymodels.Unitized.mmolConvert;
 
 public class FunAlmanac {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBand.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBand.java
index 923fc812d9..2f5e56f842 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBand.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBand.java
@@ -1,9 +1,9 @@
 package com.eveningoutpost.dexdrip.watch.miband;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import static com.eveningoutpost.dexdrip.watch.miband.Const.MIBAND_NAME_2;
 import static com.eveningoutpost.dexdrip.watch.miband.Const.MIBAND_NAME_3;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBandEntry.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBandEntry.java
index a40693d2d5..b4f30921da 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBandEntry.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBandEntry.java
@@ -5,12 +5,12 @@
 import android.preference.Preference;
 import android.support.v4.content.LocalBroadcastManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBandService.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBandService.java
index 5b8cdd75d4..707f1a3e96 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBandService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/MiBandService.java
@@ -9,17 +9,17 @@
 import android.os.PowerManager;
 import android.util.Pair;
 
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 import com.eveningoutpost.dexdrip.utils.bt.Subscription;
 import com.eveningoutpost.dexdrip.utils.framework.PoorMansConcurrentLinkedDeque;
 import com.eveningoutpost.dexdrip.utils.framework.WakeLockTrampoline;
@@ -54,15 +54,15 @@
 import io.reactivex.schedulers.Schedulers;
 import lombok.Getter;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.bytesToHex;
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.Models.JoH.getResourceURI;
-import static com.eveningoutpost.dexdrip.Models.JoH.msTill;
-import static com.eveningoutpost.dexdrip.Models.JoH.niceTimeScalar;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CLOSE;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CLOSED;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.INIT;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.SLEEP;
+import static com.eveningoutpost.dexdrip.models.JoH.bytesToHex;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.getResourceURI;
+import static com.eveningoutpost.dexdrip.models.JoH.msTill;
+import static com.eveningoutpost.dexdrip.models.JoH.niceTimeScalar;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CLOSE;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CLOSED;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.INIT;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.SLEEP;
 import static com.eveningoutpost.dexdrip.watch.miband.Const.MIBAND_NOTIFY_TYPE_ALARM;
 import static com.eveningoutpost.dexdrip.watch.miband.Const.MIBAND_NOTIFY_TYPE_CALL;
 import static com.eveningoutpost.dexdrip.watch.miband.Const.MIBAND_NOTIFY_TYPE_CANCEL;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/message/AuthMessages.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/message/AuthMessages.java
index 599da1a11b..90e8065c76 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/message/AuthMessages.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/miband/message/AuthMessages.java
@@ -2,9 +2,9 @@
 
 import android.os.Environment;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.watch.miband.Const;
 import com.eveningoutpost.dexdrip.watch.miband.MiBand;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BackgroundScanReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BackgroundScanReceiver.java
index a9d3123a8c..7216372256 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BackgroundScanReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BackgroundScanReceiver.java
@@ -7,8 +7,8 @@
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.RxBleProvider;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.RxBleProvider;
 import com.eveningoutpost.dexdrip.utils.bt.BtCallBack2;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.polidea.rxandroidble2.exceptions.BleScanException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJay.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJay.java
index 074e8138ab..b7becc0f6b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJay.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJay.java
@@ -1,10 +1,10 @@
 package com.eveningoutpost.dexdrip.watch.thinjam;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusLine;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusLine;
 import com.eveningoutpost.dexdrip.ui.activities.ThinJamActivity;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayAPI.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayAPI.java
index 6f8d274be8..a0c85f4e3e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayAPI.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayAPI.java
@@ -2,7 +2,7 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import static com.eveningoutpost.dexdrip.watch.thinjam.Const.THINJAM_NOTIFY_TYPE_DIALOG;
 import static com.eveningoutpost.dexdrip.watch.thinjam.Const.THINJAM_NOTIFY_TYPE_TEXTBOX1;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayAdapter.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayAdapter.java
index b0e767b312..702a8ad592 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayAdapter.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayAdapter.java
@@ -4,7 +4,7 @@
 
 import android.preference.Preference;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayEmit.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayEmit.java
index 0ac4f649c3..fab47d1784 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayEmit.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayEmit.java
@@ -4,8 +4,8 @@
 
 import android.content.Intent;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import lombok.val;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayEntry.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayEntry.java
index e82a331a3c..db533c5a96 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayEntry.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayEntry.java
@@ -2,10 +2,10 @@
 
 import android.content.SharedPreferences;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import lombok.val;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayInfo.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayInfo.java
index f634a54079..22bd4a4b31 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayInfo.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayInfo.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.watch.thinjam;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.eveningoutpost.dexdrip.watch.thinjam.messages.BaseTx;
 import com.eveningoutpost.dexdrip.watch.thinjam.messages.PushRx;
 import com.eveningoutpost.dexdrip.watch.thinjam.messages.SetTimeTx;
@@ -13,7 +13,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
 
 
 public class BlueJayInfo extends BaseTx {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayRemote.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayRemote.java
index 4bfd6a3595..d5b3e96432 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayRemote.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayRemote.java
@@ -5,14 +5,14 @@
 import android.content.Intent;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
 import com.eveningoutpost.dexdrip.watch.thinjam.io.ThinJamApiReceiver;
 
 import lombok.val;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
 import static com.eveningoutpost.dexdrip.xdrip.getAppContext;
 
 public class BlueJayRemote {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayService.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayService.java
index 9e0d3a4389..31ff0fc152 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/BlueJayService.java
@@ -10,22 +10,22 @@
 import android.os.PowerManager;
 import android.util.Pair;
 
-import com.eveningoutpost.dexdrip.G5Model.CalibrationState;
+import com.eveningoutpost.dexdrip.g5model.CalibrationState;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BroadcastSnooze;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BroadcastSnooze;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 import com.eveningoutpost.dexdrip.ui.activities.ThinJamActivity;
 import com.eveningoutpost.dexdrip.utils.BytesGenerator;
 import com.eveningoutpost.dexdrip.utils.bt.Helper;
@@ -74,27 +74,27 @@
 import lombok.Setter;
 import lombok.val;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.bytesToHex;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.msTill;
-import static com.eveningoutpost.dexdrip.Models.JoH.niceTimeScalar;
-import static com.eveningoutpost.dexdrip.Models.JoH.threadSleep;
-import static com.eveningoutpost.dexdrip.Models.JoH.tsl;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CLOSE;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.CLOSED;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.DISCOVER;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.INIT;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.SEND_QUEUE;
-import static com.eveningoutpost.dexdrip.Services.JamBaseBluetoothSequencer.BaseState.SLEEP;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.SECOND_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.CRITICAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.GOOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NORMAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NOTICE;
+import static com.eveningoutpost.dexdrip.models.JoH.bytesToHex;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.msTill;
+import static com.eveningoutpost.dexdrip.models.JoH.niceTimeScalar;
+import static com.eveningoutpost.dexdrip.models.JoH.threadSleep;
+import static com.eveningoutpost.dexdrip.models.JoH.tsl;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CLOSE;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.CLOSED;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.DISCOVER;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.INIT;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.SEND_QUEUE;
+import static com.eveningoutpost.dexdrip.services.JamBaseBluetoothSequencer.BaseState.SLEEP;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.SECOND_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.BAD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.CRITICAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.GOOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NORMAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NOTICE;
 import static com.eveningoutpost.dexdrip.watch.thinjam.BlueJay.shouldSendReadings;
 import static com.eveningoutpost.dexdrip.watch.thinjam.BlueJay.versionSufficient;
 import static com.eveningoutpost.dexdrip.watch.thinjam.BlueJayService.ThinJamState.ENABLE_NOTIFICATIONS;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/DebugUnitTestLogger.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/DebugUnitTestLogger.java
index fa25d44c30..24f939e42b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/DebugUnitTestLogger.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/DebugUnitTestLogger.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.watch.thinjam;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 import com.eveningoutpost.dexdrip.watch.thinjam.io.GetURL;
 
 import lombok.RequiredArgsConstructor;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayFirmware.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayFirmware.java
index aa4694a146..dfcb6de772 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayFirmware.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayFirmware.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.watch.thinjam.firmware;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayFwId.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayFwId.java
index f0c812da53..05aefbe3a4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayFwId.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayFwId.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.watch.thinjam.firmware;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayManifest.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayManifest.java
index d1efb9121f..bd16d6f078 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayManifest.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/BlueJayManifest.java
@@ -2,8 +2,8 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.annotations.Expose;
 import com.google.gson.reflect.TypeToken;
@@ -12,7 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
 public class BlueJayManifest {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/DigitalSignature.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/DigitalSignature.java
index f5843f347e..fafffecee7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/DigitalSignature.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/DigitalSignature.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.watch.thinjam.firmware;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.security.KeyFactory;
 import java.security.PublicKey;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/FirmwareDownload.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/FirmwareDownload.java
index 8b2cbdc6c8..001889b3aa 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/FirmwareDownload.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/FirmwareDownload.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.watch.thinjam.firmware;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.watch.thinjam.BlueJay;
 import com.eveningoutpost.dexdrip.watch.thinjam.BlueJayInfo;
 import com.eveningoutpost.dexdrip.watch.thinjam.io.GetURL;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/FirmwareInfo.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/FirmwareInfo.java
index f9b0816b5a..1bed9dc020 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/FirmwareInfo.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/firmware/FirmwareInfo.java
@@ -2,9 +2,9 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 import com.eveningoutpost.dexdrip.watch.thinjam.BlueJay;
 
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/io/GetURL.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/io/GetURL.java
index 05bcbe72fa..a82b573f35 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/io/GetURL.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/io/GetURL.java
@@ -8,7 +8,7 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.OkHttpWrapper.enableTls12OnPreLollipop;
+import static com.eveningoutpost.dexdrip.utilitymodels.OkHttpWrapper.enableTls12OnPreLollipop;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/io/ThinJamApiReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/io/ThinJamApiReceiver.java
index 84b7d82861..c02e75f7e6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/io/ThinJamApiReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/io/ThinJamApiReceiver.java
@@ -7,14 +7,14 @@
 import android.content.Intent;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.watch.thinjam.BlueJayAPI;
 
 import lombok.val;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.UtilityModels.Intents.BLUEJAY_THINJAM_API;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.utilitymodels.Intents.BLUEJAY_THINJAM_API;
 
 public class ThinJamApiReceiver extends BroadcastReceiver {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/AuthReqTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/AuthReqTx.java
index c0a9a1df47..6ad3dd799f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/AuthReqTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/AuthReqTx.java
@@ -2,8 +2,8 @@
 
 import android.annotation.SuppressLint;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.watch.thinjam.BlueJay;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/BaseTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/BaseTx.java
index 500f0f1143..0891a677ec 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/BaseTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/BaseTx.java
@@ -2,7 +2,7 @@
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/GlucoseTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/GlucoseTx.java
index 4e738a4fbe..43ef17fede 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/GlucoseTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/GlucoseTx.java
@@ -1,14 +1,14 @@
 package com.eveningoutpost.dexdrip.watch.thinjam.messages;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.G5Model.CalibrationState;
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.g5model.CalibrationState;
+import com.eveningoutpost.dexdrip.models.BgReading;
 
 import lombok.Getter;
 import lombok.val;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
 import static com.eveningoutpost.dexdrip.watch.thinjam.Const.OPCODE_INBOUND_GLUCOSE;
 
 // jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/NotifyTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/NotifyTx.java
index 121369de5c..870ef6c0f7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/NotifyTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/NotifyTx.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.watch.thinjam.messages;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/PushRx.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/PushRx.java
index 4f96d72889..2e769e0914 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/PushRx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/PushRx.java
@@ -2,9 +2,9 @@
 
 import android.util.SparseArray;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 import com.eveningoutpost.dexdrip.watch.thinjam.Const;
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/SetTimeTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/SetTimeTx.java
index 6f839491c0..4554408493 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/SetTimeTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/SetTimeTx.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.watch.thinjam.messages;
 
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/SetTxIdTx.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/SetTxIdTx.java
index ee7c086e7a..5aba52c0ea 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/SetTxIdTx.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/messages/SetTxIdTx.java
@@ -1,9 +1,9 @@
 package com.eveningoutpost.dexdrip.watch.thinjam.messages;
 
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 import com.eveningoutpost.dexdrip.watch.thinjam.BlueJay;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/utils/BitmapTools.java b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/utils/BitmapTools.java
index 12be462f4e..91431bb8c1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/utils/BitmapTools.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/watch/thinjam/utils/BitmapTools.java
@@ -3,7 +3,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/Amazfitservice.java b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/Amazfitservice.java
index 45c6c513ab..c4e61f3b78 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/Amazfitservice.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/Amazfitservice.java
@@ -16,21 +16,21 @@
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.G5Model.Extensions;
-import com.eveningoutpost.dexdrip.G5Model.Transmitter;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Dex_Constants;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.StepCounter;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSparklineBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.g5model.Extensions;
+import com.eveningoutpost.dexdrip.g5model.Transmitter;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Dex_Constants;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.StepCounter;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSparklineBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.huami.watch.transport.DataBundle;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/ExternalStatusBroadcastReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/ExternalStatusBroadcastReceiver.java
index 6905901dbf..4a8ff25844 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/ExternalStatusBroadcastReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/ExternalStatusBroadcastReceiver.java
@@ -4,8 +4,6 @@
 import android.content.Intent;
 import android.support.v4.content.WakefulBroadcastReceiver;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-
 /**
  * Created by adrian on 14/02/16.
  */
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/ExternalStatusService.java b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/ExternalStatusService.java
index 53b5afe74a..66e7ce7de4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/ExternalStatusService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/ExternalStatusService.java
@@ -5,12 +5,12 @@
 import android.support.annotation.NonNull;
 import android.support.v4.content.WakefulBroadcastReceiver;
 
-import com.eveningoutpost.dexdrip.Models.APStatus;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.APStatus;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.NewDataObserver;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 /**
  * Created by adrian on 14/02/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/SendToDataLayerThread.java b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/SendToDataLayerThread.java
index 9cc4c41ebc..c08dcd3373 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/SendToDataLayerThread.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/SendToDataLayerThread.java
@@ -4,8 +4,8 @@
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.wearable.DataApi;
 import com.google.android.gms.wearable.DataMap;
@@ -16,7 +16,6 @@
 import com.google.android.gms.wearable.Wearable;
 
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/WatchUpdaterService.java b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/WatchUpdaterService.java
index fe82e80aeb..68c26350a5 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/wearintegration/WatchUpdaterService.java
@@ -16,37 +16,37 @@
 
 import com.eveningoutpost.dexdrip.BestGlucose;
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.G5Model.CalibrationState;
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.g5model.CalibrationState;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.StepCounter;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.StepCounter;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.Blukon;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.LowPriorityThread;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusLine;
-import com.eveningoutpost.dexdrip.UtilityModels.WearSyncBooleans;
-import com.eveningoutpost.dexdrip.UtilityModels.WearSyncPersistentStrings;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.Blukon;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.LowPriorityThread;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusLine;
+import com.eveningoutpost.dexdrip.utilitymodels.WearSyncBooleans;
+import com.eveningoutpost.dexdrip.utilitymodels.WearSyncPersistentStrings;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.GetWearApk;
@@ -87,9 +87,9 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.PREF_QUEUE_DRAINED;
-import static com.eveningoutpost.dexdrip.Models.JoH.showNotification;
-import static com.eveningoutpost.dexdrip.Models.JoH.ts;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.PREF_QUEUE_DRAINED;
+import static com.eveningoutpost.dexdrip.models.JoH.showNotification;
+import static com.eveningoutpost.dexdrip.models.JoH.ts;
 
 @SuppressLint("LogNotTimber")
 public class WatchUpdaterService extends WearableListenerService implements
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebResponse.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebResponse.java
index cc2aa152fc..8cff8638af 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebResponse.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebResponse.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.webservices;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.io.UnsupportedEncodingException;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceHeart.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceHeart.java
index 021995087e..2285aa7492 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceHeart.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceHeart.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.webservices;
 
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServicePebble.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServicePebble.java
index afd29319f8..308023c79b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServicePebble.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServicePebble.java
@@ -1,16 +1,14 @@
 package com.eveningoutpost.dexdrip.webservices;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.dagger.Injectors;
 import com.eveningoutpost.dexdrip.ui.MicroStatus;
-import com.eveningoutpost.dexdrip.ui.MicroStatusImpl;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSgv.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSgv.java
index 0ffd9a97b1..843f4ee70a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSgv.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSgv.java
@@ -3,12 +3,12 @@
 import android.util.Log;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.DateUtil;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.NanoStatus;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.SensorStatus;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.DateUtil;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.NanoStatus;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.SensorStatus;
 import com.eveningoutpost.dexdrip.dagger.Singleton;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceStatus.java
index a2fcfe1165..cb92d8a33b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceStatus.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceStatus.java
@@ -2,15 +2,15 @@
 
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.tolerantParseDouble;
+import static com.eveningoutpost.dexdrip.models.JoH.tolerantParseDouble;
 
 /**
  * Created by jamorham on 04/02/2018.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSteps.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSteps.java
index 39342f0f67..6e87be6e81 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSteps.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSteps.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.webservices;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.StepCounter;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.StepCounter;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSync.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSync.java
index 1b4e6950e1..942ddc082a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSync.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceSync.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.webservices;
 
-import com.eveningoutpost.dexdrip.Models.DesertSync;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.DesertSync;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.net.InetAddress;
 import java.util.List;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceTasker.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceTasker.java
index 0cfc87a166..9b1395957f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceTasker.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/WebServiceTasker.java
@@ -2,14 +2,13 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.localeTasker.bundle.PluginBundleManager;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.localetasker.bundle.PluginBundleManager;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import static com.eveningoutpost.dexdrip.BuildConfig.APPLICATION_ID;
-import static com.eveningoutpost.dexdrip.localeTasker.bundle.PluginBundleManager.BUNDLE_EXTRA_INT_VERSION_CODE;
+import static com.eveningoutpost.dexdrip.localetasker.bundle.PluginBundleManager.BUNDLE_EXTRA_INT_VERSION_CODE;
 
 /**
  * Created by jamorham on 06/01/2018.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/XdripWebService.java b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/XdripWebService.java
index 236e741d2d..29287543d9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/webservices/XdripWebService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/webservices/XdripWebService.java
@@ -5,11 +5,11 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.dagger.Singleton;
 import com.eveningoutpost.dexdrip.utils.TriState;
 import com.eveningoutpost.dexdrip.xdrip;
@@ -26,7 +26,6 @@
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
-import java.net.URLDecoder;
 import java.time.format.DateTimeFormatter;
 import java.time.ZonedDateTime;
 import java.time.ZoneOffset;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/xDripWidget.java b/app/src/main/java/com/eveningoutpost/dexdrip/xDripWidget.java
index 196997d1d9..b33147bb13 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/xDripWidget.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/xDripWidget.java
@@ -11,15 +11,15 @@
 import android.view.View;
 import android.widget.RemoteViews;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSparklineBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.ColorCache;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusLine;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSparklineBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.ColorCache;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusLine;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 
 import java.util.Date;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/xdrip.java b/app/src/main/java/com/eveningoutpost/dexdrip/xdrip.java
index 9189de90c6..05a3a9b234 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/xdrip.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/xdrip.java
@@ -13,18 +13,18 @@
 
 import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.core.CrashlyticsCore;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Reminder;
-import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
-import com.eveningoutpost.dexdrip.Services.BluetoothGlucoseMeter;
-import com.eveningoutpost.dexdrip.Services.MissedReadingService;
-import com.eveningoutpost.dexdrip.Services.PlusSyncService;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.IdempotentMigrations;
-import com.eveningoutpost.dexdrip.UtilityModels.PlusAsyncExecutor;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.VersionTracker;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Reminder;
+import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
+import com.eveningoutpost.dexdrip.services.BluetoothGlucoseMeter;
+import com.eveningoutpost.dexdrip.services.MissedReadingService;
+import com.eveningoutpost.dexdrip.services.PlusSyncService;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.IdempotentMigrations;
+import com.eveningoutpost.dexdrip.utilitymodels.PlusAsyncExecutor;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.VersionTracker;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 import com.eveningoutpost.dexdrip.utils.jobs.DailyJob;
 import com.eveningoutpost.dexdrip.utils.jobs.XDripJobCreator;
diff --git a/app/src/main/res/layout/activity_btglucose_meter.xml b/app/src/main/res/layout/activity_btglucose_meter.xml
index a70170ad5a..3f6e433b15 100644
--- a/app/src/main/res/layout/activity_btglucose_meter.xml
+++ b/app/src/main/res/layout/activity_btglucose_meter.xml
@@ -11,7 +11,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.eveningoutpost.dexdrip.GlucoseMeter.BTGlucoseMeterActivity">
+    tools:context="com.eveningoutpost.dexdrip.glucosemeter.BTGlucoseMeterActivity">
 
     <TextView
         android:text="TextView"
diff --git a/app/src/main/res/layout/activity_display_qrcode.xml b/app/src/main/res/layout/activity_display_qrcode.xml
index 8cd5d39431..2ee5b3f872 100644
--- a/app/src/main/res/layout/activity_display_qrcode.xml
+++ b/app/src/main/res/layout/activity_display_qrcode.xml
@@ -4,7 +4,7 @@
     <data>
         <variable
             name="prefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsView" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsView" />
     </data>
 
 <RelativeLayout
diff --git a/app/src/main/res/layout/activity_double_calibration.xml b/app/src/main/res/layout/activity_double_calibration.xml
index cd3a5a3fd5..5ea07b002b 100644
--- a/app/src/main/res/layout/activity_double_calibration.xml
+++ b/app/src/main/res/layout/activity_double_calibration.xml
@@ -4,7 +4,7 @@
 
         <variable
             name="prefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsView" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsView" />
         <import type="android.view.View"/>
     </data>
 
diff --git a/app/src/main/res/layout/activity_emergency_assist.xml b/app/src/main/res/layout/activity_emergency_assist.xml
index a57192ab6b..fee8c0ba20 100644
--- a/app/src/main/res/layout/activity_emergency_assist.xml
+++ b/app/src/main/res/layout/activity_emergency_assist.xml
@@ -8,11 +8,11 @@
 
         <variable
             name="prefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsViewImpl" />
 
         <variable
             name="sprefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsViewString" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsViewString" />
 
         <variable
             name="model"
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 846f08c160..fd93cd1055 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -19,11 +19,11 @@
 
         <variable
             name="nano"
-            type="com.eveningoutpost.dexdrip.UtilityModels.NanoStatus" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.NanoStatus" />
 
         <variable
             name="expiry"
-            type="com.eveningoutpost.dexdrip.UtilityModels.NanoStatus" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.NanoStatus" />
 
         <import type="android.view.View" />
     </data>
diff --git a/app/src/main/res/layout/activity_mtp_configure.xml b/app/src/main/res/layout/activity_mtp_configure.xml
index ff61372480..b818fe4693 100644
--- a/app/src/main/res/layout/activity_mtp_configure.xml
+++ b/app/src/main/res/layout/activity_mtp_configure.xml
@@ -6,13 +6,13 @@
     <data>
         <variable
             name="nano"
-            type="com.eveningoutpost.dexdrip.UtilityModels.NanoStatus" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.NanoStatus" />
     </data>
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".UtilityModels.MtpConfigureActivity">
+        tools:context=".utilitymodels.MtpConfigureActivity">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_number_wall_preview.xml b/app/src/main/res/layout/activity_number_wall_preview.xml
index 722001218a..a50a695f8a 100644
--- a/app/src/main/res/layout/activity_number_wall_preview.xml
+++ b/app/src/main/res/layout/activity_number_wall_preview.xml
@@ -11,11 +11,11 @@
 
         <variable
             name="prefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsViewImpl" />
 
         <variable
             name="sprefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsViewString" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsViewString" />
 
     </data>
 
diff --git a/app/src/main/res/layout/activity_send_feed_back.xml b/app/src/main/res/layout/activity_send_feed_back.xml
index e4691eb257..edd5602d2a 100644
--- a/app/src/main/res/layout/activity_send_feed_back.xml
+++ b/app/src/main/res/layout/activity_send_feed_back.xml
@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.eveningoutpost.dexdrip.UtilityModels.SendFeedBack">
+    tools:context="com.eveningoutpost.dexdrip.utilitymodels.SendFeedBack">
 
     <EditText
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_thin_jam.xml b/app/src/main/res/layout/activity_thin_jam.xml
index 02251c8c62..395a4d1d72 100644
--- a/app/src/main/res/layout/activity_thin_jam.xml
+++ b/app/src/main/res/layout/activity_thin_jam.xml
@@ -13,7 +13,7 @@
 
         <variable
             name="prefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsViewImpl" />
 
     </data>
 
diff --git a/app/src/main/res/layout/activity_update.xml b/app/src/main/res/layout/activity_update.xml
index c766033db2..a3f84c43d3 100644
--- a/app/src/main/res/layout/activity_update.xml
+++ b/app/src/main/res/layout/activity_update.xml
@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.eveningoutpost.dexdrip.UtilityModels.UpdateActivity">
+    tools:context="com.eveningoutpost.dexdrip.utilitymodels.UpdateActivity">
 
     <ScrollView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_xdrip_dream_settings.xml b/app/src/main/res/layout/activity_xdrip_dream_settings.xml
index 5e6ed59bdc..d17e19680b 100644
--- a/app/src/main/res/layout/activity_xdrip_dream_settings.xml
+++ b/app/src/main/res/layout/activity_xdrip_dream_settings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.eveningoutpost.dexdrip.UtilityModels.XDripDreamSettingsActivity">
+    tools:context="com.eveningoutpost.dexdrip.utilitymodels.XDripDreamSettingsActivity">
 
     <data>
 
         <variable
             name="prefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsView" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsView" />
     </data>
 
 
diff --git a/app/src/main/res/layout/dialog_tree_item.xml b/app/src/main/res/layout/dialog_tree_item.xml
index 308a83a28f..f06cdabe26 100644
--- a/app/src/main/res/layout/dialog_tree_item.xml
+++ b/app/src/main/res/layout/dialog_tree_item.xml
@@ -6,7 +6,7 @@
 
         <variable
             name="item"
-            type="com.eveningoutpost.dexdrip.UtilityModels.SourceWizard.Item" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.SourceWizard.Item" />
 
         <import type="android.view.View" />
     </data>
diff --git a/app/src/main/res/layout/dialog_tree_selector.xml b/app/src/main/res/layout/dialog_tree_selector.xml
index 1dea076064..f3d579f4e1 100644
--- a/app/src/main/res/layout/dialog_tree_selector.xml
+++ b/app/src/main/res/layout/dialog_tree_selector.xml
@@ -8,7 +8,7 @@
 
         <variable
             name="viewModel"
-            type="com.eveningoutpost.dexdrip.UtilityModels.SourceWizard.ViewModel" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.SourceWizard.ViewModel" />
     </data>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_event_log.xml b/app/src/main/res/layout/item_event_log.xml
index 5a0ad436e2..63b92a7427 100644
--- a/app/src/main/res/layout/item_event_log.xml
+++ b/app/src/main/res/layout/item_event_log.xml
@@ -7,7 +7,7 @@
 
         <variable
             name="error"
-            type="com.eveningoutpost.dexdrip.Models.UserError" />
+            type="com.eveningoutpost.dexdrip.models.UserError" />
 
         <variable
             name="viewModel"
diff --git a/app/src/main/res/layout/popup_initial_status_helper.xml b/app/src/main/res/layout/popup_initial_status_helper.xml
index 359e5317c2..b4500b48e8 100644
--- a/app/src/main/res/layout/popup_initial_status_helper.xml
+++ b/app/src/main/res/layout/popup_initial_status_helper.xml
@@ -6,7 +6,7 @@
 
         <variable
             name="idq"
-            type="com.eveningoutpost.dexdrip.Models.ProcessInitialDataQuality.InitialDataQuality" />
+            type="com.eveningoutpost.dexdrip.models.ProcessInitialDataQuality.InitialDataQuality" />
 
         <variable
             name="ms"
@@ -14,7 +14,7 @@
 
         <variable
             name="prefs"
-            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsView" />
+            type="com.eveningoutpost.dexdrip.utilitymodels.PrefsView" />
     </data>
 
     <LinearLayout
diff --git a/app/src/main/res/xml/xdrip_plus_prefs.xml b/app/src/main/res/xml/xdrip_plus_prefs.xml
index 7bd85c7feb..0fcfdba194 100644
--- a/app/src/main/res/xml/xdrip_plus_prefs.xml
+++ b/app/src/main/res/xml/xdrip_plus_prefs.xml
@@ -30,14 +30,14 @@
                     android:key="xdrip_plus_display_colorset1"
                     android:title="@string/glucose_values_and_lines">
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#FFBB33"
                         android:key="color_high_values"
                         android:title="@string/high_glucose_values"
                         app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#33B5E6"
                         android:key="color_inrange_values"
                         android:title="@string/in_range_glucose_values"
@@ -45,7 +45,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#C30909"
                         android:key="color_low_values"
                         android:title="@string/low_glucose_values"
@@ -53,7 +53,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#a0a0a0"
                         android:key="color_filtered"
                         android:title="@string/filtered_values"
@@ -65,28 +65,28 @@
                 <PreferenceCategory
                     android:key="xdrip_plus_display_colorset2"
                     android:title="@string/treatments_prediction_curves">
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#77aa00"
                         android:key="color_treatment"
                         android:title="@string/treatment_color"
                         app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#334400"
                         android:key="color_treatment_dark"
                         android:title="@string/treatment_color_dark"
                         app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#AA66CC"
                         android:key="color_predictive"
                         android:title="@string/predictive_color"
                         app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#7700aa"
                         android:key="color_predictive_dark"
                         android:title="@string/predictive_color_dark"
@@ -101,21 +101,21 @@
                     android:key="xdrip_plus_display_colorset3"
                     android:title="@string/average_and_target_lines">
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#558800"
                         android:key="color_average1_line"
                         android:title="@string/eight_hour_average_line"
                         app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#c56f9d"
                         android:key="color_average2_line"
                         android:title="@string/twenty_four_hour_average_line"
                         app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#a4a409"
                         android:key="color_target_line"
                         android:title="@string/glucose_target_line"
@@ -128,7 +128,7 @@
                     android:key="xdrip_plus_display_colorset4"
                     android:title="@string/annotations_and_dots">
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#FFFFFF"
                         android:key="color_calibration_dot_background"
                         android:title="@string/blood_test_background"
@@ -136,7 +136,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#FF4444"
                         android:key="color_calibration_dot_foreground"
                         android:title="@string/blood_test_foreground"
@@ -144,7 +144,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#FFFFFF"
                         android:key="color_treatment_dot_background"
                         android:title="@string/treatment_background"
@@ -152,7 +152,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#77aa00"
                         android:key="color_treatment_dot_foreground"
                         android:title="@string/treatment_foreground"
@@ -164,7 +164,7 @@
                 <PreferenceCategory
                     android:key="xdrip_plus_display_colorset5"
                     android:title="@string/backgrounds">
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#212121"
                         android:key="color_home_chart_background"
                         android:title="@string/main_chart_background"
@@ -172,7 +172,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#00000000"
                         android:key="color_notification_chart_background"
                         android:title="@string/notification_chart_background"
@@ -180,7 +180,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#00000000"
                         android:key="color_widget_chart_background"
                         android:title="@string/widget_chart_background"
@@ -193,7 +193,7 @@
                     android:key="xdrip_plus_display_colorset8"
                     android:title="@string/title_plugins_and_features">
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#8a6b4c33"
                         android:dependency="plugin_plot_on_graph"
                         android:key="color_secondary_glucose_value"
@@ -202,7 +202,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#3e29937b"
                         android:key="color_step_counter1"
                         android:title="@string/step_counter_1st_color"
@@ -210,7 +210,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#3c72c3c0"
                         android:key="color_step_counter2"
                         android:title="@string/step_counter_2nd_color"
@@ -218,7 +218,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#2B212FDE"
                         android:key="color_heart_rate1"
                         android:title="@string/title_color_heart_rate1"
@@ -230,21 +230,21 @@
                     android:key="xdrip_plus_display_colorset12"
                     android:title="@string/title_insulin_colors">
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#D33172DE"
                         android:key="color_basal_tbr"
                         android:title="@string/title_color_basal_tbr"
                         app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="true" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#D4DED843"
                         android:key="color_smb_icon"
                         android:title="@string/title_color_smb_icon"
                         app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#D6597FCC"
                         android:key="color_smb_line"
                         android:title="@string/title_color_smb_line"
@@ -263,7 +263,7 @@
                         android:switchTextOff="@string/short_off_text_for_switches"
                         android:switchTextOn="@string/short_on_text_for_switches"
                         android:title="@string/use_flair_colors" />
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#00000000"
                         android:key="color_upper_flair_bar"
                         android:title="@string/upper_title_bar_flair"
@@ -271,7 +271,7 @@
                         app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                         app:colorpicker_showHex="false" />
 
-                    <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                    <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                         android:defaultValue="#FF000000"
                         android:key="color_lower_flair_bar"
                         android:title="@string/lower_button_bar_falir"
@@ -479,14 +479,14 @@
                     android:switchTextOff="@string/short_off_text_for_switches"
                     android:switchTextOn="@string/short_on_text_for_switches"
                     android:title="@string/title_number_wall_on_lockscreen" />
-                <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                     android:defaultValue="#FFEEEEEE"
                     android:key="color_number_wall"
                     android:title="@string/title_color_number_wall"
                     app:colorpicker_noneSelectedSummaryText="@string/default_color_selected"
                     app:colorpicker_selectNoneButtonText="@string/revert_to_default"
                     app:colorpicker_showHex="false" />
-                <com.eveningoutpost.dexdrip.UtilityModels.ColorPicker
+                <com.eveningoutpost.dexdrip.utilitymodels.ColorPicker
                     android:defaultValue="#FF000000"
                     android:key="color_number_wall_shadow"
                     android:title="@string/title_color_number_wall_shadow"
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/NSEmulatorReceiverTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/NSEmulatorReceiverTest.java
index addc2b3f87..f55954121c 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/NSEmulatorReceiverTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/NSEmulatorReceiverTest.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.BgReading;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/RobolectricTestWithConfigAndPowerMockLogRedirect.java b/app/src/test/java/com/eveningoutpost/dexdrip/RobolectricTestWithConfigAndPowerMockLogRedirect.java
index bb9aa05d50..42027b34d0 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/RobolectricTestWithConfigAndPowerMockLogRedirect.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/RobolectricTestWithConfigAndPowerMockLogRedirect.java
@@ -41,7 +41,7 @@
 // active android.
 
 @PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "android.*", "com.activeandroid.*", "com.eveningoutpost.dexdrip.Models.*"})
-@PrepareForTest({android.util.Log.class, com.eveningoutpost.dexdrip.Models.UserError.class})
+@PrepareForTest({android.util.Log.class, com.eveningoutpost.dexdrip.models.UserError.class})
 
 //@PowerMockRunnerDelegate(RobolectricTestRunner.class)
 // TODO can we make this neater using delegate or avoiding warnings about org/powermock/default.properties is found in 2 places ?
@@ -92,7 +92,7 @@ public void setupLogging() {
         });
 
         try {
-            PowerMockito.whenNew(com.eveningoutpost.dexdrip.Models.UserError.class).withAnyArguments().thenReturn(null);
+            PowerMockito.whenNew(com.eveningoutpost.dexdrip.models.UserError.class).withAnyArguments().thenReturn(null);
         } catch (Exception e) {
             System.out.println("Exception mocking usererror: " + e);
         }
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/cgm/nsfollow/utils/AnticipateTestRobolectric.java b/app/src/test/java/com/eveningoutpost/dexdrip/cgm/nsfollow/utils/AnticipateTestRobolectric.java
index 6b363cc5aa..06563596f9 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/cgm/nsfollow/utils/AnticipateTestRobolectric.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/cgm/nsfollow/utils/AnticipateTestRobolectric.java
@@ -1,8 +1,8 @@
 package com.eveningoutpost.dexdrip.cgm.nsfollow.utils;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareGlucoseRecordTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareGlucoseRecordTest.java
index cfa5599c10..8cffd36bf3 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareGlucoseRecordTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareGlucoseRecordTest.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.cgm.sharefollow;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.BgReading;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/evaluators/PersistentHighTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/evaluators/PersistentHighTest.java
index ece645a7fd..d5f0b974fd 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/evaluators/PersistentHighTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/evaluators/PersistentHighTest.java
@@ -1,10 +1,10 @@
 package com.eveningoutpost.dexdrip.evaluators;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import org.junit.Test;
 import org.robolectric.shadows.ShadowLog;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16Test.java b/app/src/test/java/com/eveningoutpost/dexdrip/g5model/FastCRC16Test.java
similarity index 98%
rename from app/src/test/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16Test.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/g5model/FastCRC16Test.java
index a8590f7841..aa66debbdc 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16Test.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/g5model/FastCRC16Test.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import com.eveningoutpost.dexdrip.HexTestTools;
 
 import org.junit.Test;
 
-import static com.eveningoutpost.dexdrip.G5Model.FastCRC16.calculate;
+import static com.eveningoutpost.dexdrip.g5model.FastCRC16.calculate;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 // jamorham
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/G5Model/RawScalingTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/g5model/RawScalingTest.java
similarity index 93%
rename from app/src/test/java/com/eveningoutpost/dexdrip/G5Model/RawScalingTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/g5model/RawScalingTest.java
index 5ad95149a8..161600cf31 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/G5Model/RawScalingTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/g5model/RawScalingTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/ContextRxTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/ContextRxTest.java
similarity index 83%
rename from app/src/test/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/ContextRxTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/ContextRxTest.java
index 93fab707a0..a84347c45f 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/ContextRxTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/ContextRxTest.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter.caresens;
+package com.eveningoutpost.dexdrip.glucosemeter.caresens;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/TimeTxTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/TimeTxTest.java
similarity index 84%
rename from app/src/test/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/TimeTxTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/TimeTxTest.java
index ec618eb30a..1fb17880a8 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/GlucoseMeter/caresens/TimeTxTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/glucosemeter/caresens/TimeTxTest.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.GlucoseMeter.caresens;
+package com.eveningoutpost.dexdrip.glucosemeter.caresens;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/BlueReaderTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/BlueReaderTest.java
similarity index 98%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/BlueReaderTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/BlueReaderTest.java
index 9deddbc6c6..05f99b1dd4 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/BlueReaderTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/BlueReaderTest.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.activeandroid.query.Delete;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import org.junit.Before;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/CalibrationTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/CalibrationTest.java
similarity index 98%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/CalibrationTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/CalibrationTest.java
index e604d92870..a5fa7a60b5 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/CalibrationTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/CalibrationTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/ForecastTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/ForecastTest.java
similarity index 99%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/ForecastTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/ForecastTest.java
index 7f81067736..686c596cd2 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/ForecastTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/ForecastTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 import com.google.common.truth.Truth;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/JoHTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/JoHTest.java
similarity index 91%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/JoHTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/JoHTest.java
index 8fd10ab911..35dda34376 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/JoHTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/JoHTest.java
@@ -1,10 +1,9 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import org.junit.Test;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.validateMacAddress;
+import static com.eveningoutpost.dexdrip.models.JoH.validateMacAddress;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.*;
 
 // jamorham
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQualityTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQualityTest.java
similarity index 97%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQualityTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQualityTest.java
index 28d6790681..2c8f11afd5 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQualityTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQualityTest.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/SensorSanityTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/SensorSanityTest.java
similarity index 98%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/SensorSanityTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/SensorSanityTest.java
index 193a3f9e9b..4896edb055 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/SensorSanityTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/SensorSanityTest.java
@@ -1,8 +1,7 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
 
 import org.junit.Test;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/TreatmentsSyncTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/TreatmentsSyncTest.java
similarity index 98%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/TreatmentsSyncTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/TreatmentsSyncTest.java
index f4ee1710b8..79d3cceb5e 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/TreatmentsSyncTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/TreatmentsSyncTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 import com.google.gson.GsonBuilder;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/TreatmentsTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/TreatmentsTest.java
similarity index 99%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/TreatmentsTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/TreatmentsTest.java
index ca0d764a00..47e369f515 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/TreatmentsTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/TreatmentsTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 import com.eveningoutpost.dexdrip.insulin.Insulin;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Models/UserNotificationTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/models/UserNotificationTest.java
similarity index 98%
rename from app/src/test/java/com/eveningoutpost/dexdrip/Models/UserNotificationTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/models/UserNotificationTest.java
index 58a949f8d7..7ae2817da9 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Models/UserNotificationTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/models/UserNotificationTest.java
@@ -1,9 +1,8 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.activeandroid.query.Delete;
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import org.junit.After;
 import org.junit.Test;
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/GraphToolsTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/GraphToolsTest.java
similarity index 88%
rename from app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/GraphToolsTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/GraphToolsTest.java
index 9d3f7e1755..73271fd6d0 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/GraphToolsTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/GraphToolsTest.java
@@ -1,13 +1,12 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.BgReading;
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 
 import org.junit.Test;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.GraphTools.interpolateCalculatedValue;
+import static com.eveningoutpost.dexdrip.utilitymodels.GraphTools.interpolateCalculatedValue;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.*;
 
 
 public class GraphToolsTest extends RobolectricTestWithConfig {
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/LibreCrcTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/LibreCrcTest.java
similarity index 95%
rename from app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/LibreCrcTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/LibreCrcTest.java
index 47388a5f20..23a436db4c 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/LibreCrcTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/LibreCrcTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/MockDataSourceTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/MockDataSourceTest.java
similarity index 91%
rename from app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/MockDataSourceTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/MockDataSourceTest.java
index 4a3500ee41..8d74c91b34 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/MockDataSourceTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/MockDataSourceTest.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * Created by jamorham on 10/10/2017.
  */
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
-import com.eveningoutpost.dexdrip.Services.TransmitterRawData;
+import com.eveningoutpost.dexdrip.services.TransmitterRawData;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/PrefTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/PrefTest.java
similarity index 94%
rename from app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/PrefTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/PrefTest.java
index e1b34dd520..3630d38062 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/PrefTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/PrefTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/RouteToolsTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/RouteToolsTest.java
similarity index 93%
rename from app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/RouteToolsTest.java
rename to app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/RouteToolsTest.java
index f6573fff54..4707ec144e 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/UtilityModels/desertsync/RouteToolsTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/desertsync/RouteToolsTest.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels.desertsync;
+package com.eveningoutpost.dexdrip.utilitymodels.desertsync;
 
 import org.junit.Test;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.desertsync.RouteTools.inSameNetwork;
-import static com.eveningoutpost.dexdrip.UtilityModels.desertsync.RouteTools.ip;
+import static com.eveningoutpost.dexdrip.utilitymodels.desertsync.RouteTools.inSameNetwork;
+import static com.eveningoutpost.dexdrip.utilitymodels.desertsync.RouteTools.ip;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 // jamorham
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/webservices/RouterFinderTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/webservices/RouterFinderTest.java
index 8024336dc1..f2c4b00b79 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/webservices/RouterFinderTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/webservices/RouterFinderTest.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.webservices;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.BgReading;
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
 
 import org.junit.Before;
diff --git a/wear/proguard-rules.pro b/wear/proguard-rules.pro
index 5e9af9dba7..b815192ac8 100644
--- a/wear/proguard-rules.pro
+++ b/wear/proguard-rules.pro
@@ -53,7 +53,7 @@
 -keep class org.slf4j.** { *; }
 -keep class rx.internal.util.** { *; }
 -keep class sun.misc.Unsafe { *; }
--keep class com.eveningoutpost.dexdrip.Models.** { *; }
+-keep class com.eveningoutpost.dexdrip.models.** { *; }
 -keep class ar.com.hjg.pngj.** { *; }
 -keep class android.support.v7.widget.SearchView { *; }
 -keep class com.ustwo.clockwise.** { *; }
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 1506e9aa00..b7360cd775 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -174,32 +174,32 @@
             </intent-filter>
         </service>
         <service
-            android:name=".Services.G5CollectionService"
+            android:name=".services.G5CollectionService"
             android:enabled="true"
             android:exported="true"></service>
         <service
-            android:name=".Services.Ob1G5CollectionService"
+            android:name=".services.Ob1G5CollectionService"
             android:enabled="true" />
         <service
-            android:name=".Services.DexCollectionService"
+            android:name=".services.DexCollectionService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".Services.DexShareCollectionService"
+            android:name=".services.DexShareCollectionService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".UtilityModels.Notifications"
+            android:name=".utilitymodels.Notifications"
             android:exported="false" />
         <service
-            android:name=".Services.SnoozeOnNotificationDismissService"
+            android:name=".services.SnoozeOnNotificationDismissService"
             android:exported="false" />
         <service
-            android:name=".Services.MissedReadingService"
+            android:name=".services.MissedReadingService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".Services.CustomComplicationProviderService"
+            android:name=".services.CustomComplicationProviderService"
             android:icon="@drawable/ic_watch_white"
             android:label="xDrip Complication Provider"
             android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
@@ -214,9 +214,9 @@
                 android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
                 android:value="60" />
         </service>
-        <service android:name=".Services.HeartRateService" />
+        <service android:name=".services.HeartRateService" />
         <service
-            android:name=".Services.HeartRateJobService"
+            android:name=".services.HeartRateJobService"
             android:permission="android.permission.BIND_JOB_SERVICE" />
         <service
             android:name=".ProcessAPKChannelDownload"
@@ -227,7 +227,7 @@
                 <action android:name="com.eveningoutpost.dexdrip.NS_EMULATOR" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".Services.ComplicationTapBroadcastReceiver" />
+        <receiver android:name=".services.ComplicationTapBroadcastReceiver" />
         <receiver android:name=".utils.DisconnectReceiver">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
@@ -307,23 +307,23 @@
             android:configChanges="orientation|screenSize"
             android:label="Menu" />
         <activity
-            android:name=".Tables.CalibrationDataTable"
+            android:name=".tables.CalibrationDataTable"
             android:configChanges="orientation|screenSize"
             android:label="@string/calibration_data_table" />
         <activity
-            android:name=".Tables.BgReadingTable"
+            android:name=".tables.BgReadingTable"
             android:configChanges="orientation|screenSize"
             android:label="@string/bg_readings_table" />
         <activity
-            android:name=".Tables.SensorDataTable"
+            android:name=".tables.SensorDataTable"
             android:configChanges="orientation|screenSize"
             android:label="@string/sensor_table" />
         <activity
-            android:name=".Tables.BloodTestTable"
+            android:name=".tables.BloodTestTable"
             android:configChanges="orientation|screenSize"
             android:label="@string/bg_readings_table" />
         <activity
-            android:name=".Tables.TreatmentsTable"
+            android:name=".tables.TreatmentsTable"
             android:configChanges="orientation|screenSize"
             android:label="@string/bg_readings_table" />
         <activity android:name=".SensorPermissionActivity" />
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/BIGChart.java b/wear/src/main/java/com/eveningoutpost/dexdrip/BIGChart.java
index 69abd98e01..f6e9612220 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/BIGChart.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/BIGChart.java
@@ -22,7 +22,6 @@
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.wearable.view.WatchViewStub;
 import android.support.wearable.watchface.WatchFaceStyle;
-import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.Display;
 import android.view.Gravity;
@@ -35,8 +34,8 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
 import com.google.android.gms.wearable.DataMap;
 import com.ustwo.clockwise.wearable.WatchFace;
 import com.ustwo.clockwise.common.WatchFaceTime;
@@ -49,7 +48,6 @@
 import java.util.Date;
 import java.util.Locale;
 
-import lecho.lib.hellocharts.util.ChartUtils;
 import lecho.lib.hellocharts.view.LineChartView;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/BaseWatchFace.java b/wear/src/main/java/com/eveningoutpost/dexdrip/BaseWatchFace.java
index 87cd93a600..cbc3d5ac25 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/BaseWatchFace.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/BaseWatchFace.java
@@ -29,11 +29,11 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.HeartRateService;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.HeartRateService;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.google.android.gms.wearable.DataMap;
 import com.ustwo.clockwise.common.WatchFaceTime;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/BestGlucose.java b/wear/src/main/java/com/eveningoutpost/dexdrip/BestGlucose.java
index 2e1414dfca..781a5a27bf 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/BestGlucose.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/BestGlucose.java
@@ -8,12 +8,12 @@
 import android.text.style.StrikethroughSpan;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/BgGraphBuilder.java b/wear/src/main/java/com/eveningoutpost/dexdrip/BgGraphBuilder.java
index 9b53423693..afc18001c3 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/BgGraphBuilder.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/BgGraphBuilder.java
@@ -16,9 +16,9 @@
 import java.util.List;
 import java.util.TimeZone;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import lecho.lib.hellocharts.formatter.LineChartValueFormatter;
 import lecho.lib.hellocharts.formatter.SimpleLineChartValueFormatter;
@@ -31,7 +31,7 @@
 import lecho.lib.hellocharts.model.ValueShape;
 import lecho.lib.hellocharts.model.Viewport;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.cloneObject;
+import static com.eveningoutpost.dexdrip.models.JoH.cloneObject;
 
 /**
  * Created by Emma Black on 11/15/14.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/CircleWatchface.java b/wear/src/main/java/com/eveningoutpost/dexdrip/CircleWatchface.java
index a5771cf369..3bcb4350d1 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/CircleWatchface.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/CircleWatchface.java
@@ -29,8 +29,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
 import com.google.android.gms.wearable.DataMap;
 import com.ustwo.clockwise.wearable.WatchFace;
 import com.ustwo.clockwise.common.WatchFaceTime;
@@ -40,8 +40,6 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.TreeSet;
 
 
 public class CircleWatchface extends WatchFace implements SharedPreferences.OnSharedPreferenceChangeListener {
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ConfigReceiver.java b/wear/src/main/java/com/eveningoutpost/dexdrip/ConfigReceiver.java
index f1fe003d46..d1560f01d2 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ConfigReceiver.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/ConfigReceiver.java
@@ -4,9 +4,9 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/DemiGod.java b/wear/src/main/java/com/eveningoutpost/dexdrip/DemiGod.java
index 656f48fffe..eee1a58d6e 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/DemiGod.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/DemiGod.java
@@ -8,8 +8,8 @@
 import android.content.pm.PackageManager;
 import android.support.v4.content.ContextCompat;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 public class DemiGod {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Home.java b/wear/src/main/java/com/eveningoutpost/dexdrip/Home.java
index 6e641d4108..707deeaa9e 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Home.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -3,7 +3,6 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
@@ -19,9 +18,9 @@
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.ustwo.clockwise.common.WatchMode;
 
@@ -365,7 +364,7 @@ public static boolean get_forced_wear() {
 
     public static double convertToMgDlIfMmol(double value) {
         if (!Pref.getString("units", "mgdl").equals("mgdl")) {
-            return value * com.eveningoutpost.dexdrip.UtilityModels.Constants.MMOLL_TO_MGDL;
+            return value * com.eveningoutpost.dexdrip.utilitymodels.Constants.MMOLL_TO_MGDL;
         } else {
             return value; // no conversion needed
         }
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/KeypadInputActivity.java b/wear/src/main/java/com/eveningoutpost/dexdrip/KeypadInputActivity.java
index 25949ede75..f3b4766e6c 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/KeypadInputActivity.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/KeypadInputActivity.java
@@ -9,19 +9,14 @@
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
-import java.nio.charset.StandardCharsets;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import static com.eveningoutpost.dexdrip.ListenerService.SendData;
-
 /**
  * Adapted from WearDialer which is:
  * <p/>
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/LargeHome.java b/wear/src/main/java/com/eveningoutpost/dexdrip/LargeHome.java
index 74fd39ebae..b306ee4f1d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/LargeHome.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/LargeHome.java
@@ -8,7 +8,7 @@
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.ustwo.clockwise.common.WatchMode;
 
 public class LargeHome extends BaseWatchFace {
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java b/wear/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java
index 28b2228d41..cee124cd29 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java
@@ -9,19 +9,19 @@
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Forecast;
-import com.eveningoutpost.dexdrip.Models.GlucoseData;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.LibreOOPAlgorithm;
-import com.eveningoutpost.dexdrip.Models.ReadingData;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Forecast;
+import com.eveningoutpost.dexdrip.models.GlucoseData;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.LibreOOPAlgorithm;
+import com.eveningoutpost.dexdrip.models.ReadingData;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.google.gson.Gson;
@@ -33,7 +33,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.LIBRE_MULTIPLIER;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.LIBRE_MULTIPLIER;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ListenerService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/ListenerService.java
index 387707b5cb..756791f68b 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ListenerService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/ListenerService.java
@@ -27,37 +27,37 @@
 import android.widget.Toast;
 
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.G5Model.CalibrationState;
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.PebbleMovement;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.CustomComplicationProviderService;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.HeartRateService;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.Blukon;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.WearSyncBooleans;
-import com.eveningoutpost.dexdrip.UtilityModels.WearSyncPersistentStrings;
+import com.eveningoutpost.dexdrip.g5model.CalibrationState;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.PebbleMovement;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.CustomComplicationProviderService;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.HeartRateService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.Blukon;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.WearSyncBooleans;
+import com.eveningoutpost.dexdrip.utilitymodels.WearSyncPersistentStrings;
 import com.eveningoutpost.dexdrip.stats.StatsResult;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
@@ -94,17 +94,17 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.PREF_QUEUE_DRAINED;
-import static com.eveningoutpost.dexdrip.Models.JoH.ts;
-import static com.eveningoutpost.dexdrip.Services.G5CollectionService.G5_BATTERY_FROM_MARKER;
-import static com.eveningoutpost.dexdrip.Services.G5CollectionService.G5_BATTERY_MARKER;
-import static com.eveningoutpost.dexdrip.Services.G5CollectionService.G5_BATTERY_WEARABLE_SEND;
-import static com.eveningoutpost.dexdrip.Services.G5CollectionService.G5_FIRMWARE_MARKER;
-import static com.eveningoutpost.dexdrip.Services.HeartRateService.getWearHeartSensorData;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue.doMgdl;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue.extraStatusLine;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue.resendData;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue.sgvLevel;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.PREF_QUEUE_DRAINED;
+import static com.eveningoutpost.dexdrip.models.JoH.ts;
+import static com.eveningoutpost.dexdrip.services.G5CollectionService.G5_BATTERY_FROM_MARKER;
+import static com.eveningoutpost.dexdrip.services.G5CollectionService.G5_BATTERY_MARKER;
+import static com.eveningoutpost.dexdrip.services.G5CollectionService.G5_BATTERY_WEARABLE_SEND;
+import static com.eveningoutpost.dexdrip.services.G5CollectionService.G5_FIRMWARE_MARKER;
+import static com.eveningoutpost.dexdrip.services.HeartRateService.getWearHeartSensorData;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue.doMgdl;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue.extraStatusLine;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue.resendData;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue.sgvLevel;
 
 /**
  * Created by Emma Black on 12/26/14.
@@ -1553,7 +1553,7 @@ private boolean resetDataToLatest(DataMap dataMap, Context context) {//KS
                 long bgTimestamp = last.timestamp;
                 Log.d(TAG, "resetDataToLatest last.timestamp=" + JoH.dateTimeText(bgTimestamp) + " last.calculated_value=" + last.calculated_value);
                 if (bgTimestamp > dmTimestamp) {
-                    dataMap(dataMap, last, mPrefs, new com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder(context));
+                    dataMap(dataMap, last, mPrefs, new com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder(context));
                     return true;
                 }
             }
@@ -1561,7 +1561,7 @@ private boolean resetDataToLatest(DataMap dataMap, Context context) {//KS
         return false;
     }
 
-    private static void dataMap(DataMap dataMap, BgReading bg, SharedPreferences sPrefs, com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder bgGraphBuilder) {//KS
+    private static void dataMap(DataMap dataMap, BgReading bg, SharedPreferences sPrefs, com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder bgGraphBuilder) {//KS
         Log.d(TAG, "dataMap bgTimestamp=" + JoH.dateTimeText(bg.timestamp) + " calculated_value=" + bg.calculated_value);
         //Double highMark = Double.parseDouble(sPrefs.getString("highValue", "140"));
         //Double lowMark = Double.parseDouble(sPrefs.getString("lowValue", "60"));
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/LocationPermissionActivity.java b/wear/src/main/java/com/eveningoutpost/dexdrip/LocationPermissionActivity.java
index 4917c3e392..15e06cb82f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/LocationPermissionActivity.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/LocationPermissionActivity.java
@@ -11,7 +11,7 @@
 
 import android.view.View;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 /**
  * Simple Activity for displaying Permission Rationale to user.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/MenuActivity.java b/wear/src/main/java/com/eveningoutpost/dexdrip/MenuActivity.java
index 0d0638ea9e..de8e7d8724 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/MenuActivity.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/MenuActivity.java
@@ -6,17 +6,15 @@
 import android.os.Bundle;
 import android.support.wearable.view.WatchViewStub;
 import android.view.View;
-import android.widget.Button;
 import android.widget.ImageButton;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Tables.BgReadingTable;
-import com.eveningoutpost.dexdrip.Tables.BloodTestTable;
-import com.eveningoutpost.dexdrip.Tables.CalibrationDataTable;
-import com.eveningoutpost.dexdrip.Tables.TreatmentsTable;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.tables.BgReadingTable;
+import com.eveningoutpost.dexdrip.tables.BloodTestTable;
+import com.eveningoutpost.dexdrip.tables.CalibrationDataTable;
+import com.eveningoutpost.dexdrip.tables.TreatmentsTable;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import java.util.HashMap;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/NFCReaderX.java b/wear/src/main/java/com/eveningoutpost/dexdrip/NFCReaderX.java
index f90e4284d6..f2e88dc234 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/NFCReaderX.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/NFCReaderX.java
@@ -20,16 +20,16 @@
 import android.os.Vibrator;
 import android.view.View;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.GlucoseData;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.LibreOOPAlgorithm;
-import com.eveningoutpost.dexdrip.Models.ReadingData;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.LibreUtils;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.GlucoseData;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.LibreOOPAlgorithm;
+import com.eveningoutpost.dexdrip.models.ReadingData;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.LibreUtils;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import java.io.IOException;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/NSEmulatorReceiver.java b/wear/src/main/java/com/eveningoutpost/dexdrip/NSEmulatorReceiver.java
index 35b7170587..ad85bc06f7 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/NSEmulatorReceiver.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/NSEmulatorReceiver.java
@@ -9,12 +9,12 @@
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreOOPAlgorithm;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreOOPAlgorithm;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import org.json.JSONArray;
@@ -23,7 +23,7 @@
 
 import java.util.UUID;
 
-import static com.eveningoutpost.dexdrip.Models.BgReading.bgReadingInsertFromJson;
+import static com.eveningoutpost.dexdrip.models.BgReading.bgReadingInsertFromJson;
 
 /**
  * Created by jamorham on 14/11/2016.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ProcessAPKChannelDownload.java b/wear/src/main/java/com/eveningoutpost/dexdrip/ProcessAPKChannelDownload.java
index 2c87257ab1..c424adf82d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ProcessAPKChannelDownload.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/ProcessAPKChannelDownload.java
@@ -5,10 +5,10 @@
 import android.support.annotation.NonNull;
 import android.support.v4.app.JobIntentService;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.utils.VersionFixer;
 import com.google.android.gms.common.api.GoogleApiClient;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/QuickSnooze.java b/wear/src/main/java/com/eveningoutpost/dexdrip/QuickSnooze.java
index 0f6066b49f..e2db25c72c 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/QuickSnooze.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/QuickSnooze.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/SensorPermissionActivity.java b/wear/src/main/java/com/eveningoutpost/dexdrip/SensorPermissionActivity.java
index c99c8fb0b1..876b5135b5 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/SensorPermissionActivity.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/SensorPermissionActivity.java
@@ -11,7 +11,7 @@
 
 import android.view.View;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 /**
  * Simple Activity for displaying Permission Rationale to user.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Simulation.java b/wear/src/main/java/com/eveningoutpost/dexdrip/Simulation.java
index 8898ab9746..86a42051fa 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Simulation.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/Simulation.java
@@ -14,7 +14,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.android.gms.wearable.DataMap;
 
 import java.nio.charset.StandardCharsets;
@@ -26,7 +26,6 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
-import java.util.Objects;
 
 import static com.eveningoutpost.dexdrip.ListenerService.SendData;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java b/wear/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java
index a7d08cdb5f..c6c8f92927 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/SnoozeActivity.java
@@ -10,8 +10,8 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import android.util.TypedValue;
 import android.view.View;
@@ -19,12 +19,12 @@
 import android.widget.NumberPicker;
 import android.widget.TextView;
 
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
 //KS import com.eveningoutpost.dexdrip.Services.MissedReadingService;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 //KS import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/CalibrationAbstract.java b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/CalibrationAbstract.java
index 0c2ba6a41d..514de804de 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/CalibrationAbstract.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/CalibrationAbstract.java
@@ -1,10 +1,10 @@
 package com.eveningoutpost.dexdrip.calibrations;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/Datricsae.java b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/Datricsae.java
index e73f6e6254..494b8df163 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/Datricsae.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/Datricsae.java
@@ -2,12 +2,11 @@
 
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.Forecast;
-import com.eveningoutpost.dexdrip.Models.Forecast.PolyTrendLine;
-import com.eveningoutpost.dexdrip.Models.Forecast.TrendLine;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.Forecast;
+import com.eveningoutpost.dexdrip.models.Forecast.PolyTrendLine;
+import com.eveningoutpost.dexdrip.models.Forecast.TrendLine;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import java.util.ArrayList;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/LastSevenUnweightedA.java b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/LastSevenUnweightedA.java
index f2d07a8626..4b3ba387d3 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/LastSevenUnweightedA.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/LastSevenUnweightedA.java
@@ -2,9 +2,9 @@
 
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.Forecast.PolyTrendLine;
-import com.eveningoutpost.dexdrip.Models.Forecast.TrendLine;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.Forecast.PolyTrendLine;
+import com.eveningoutpost.dexdrip.models.Forecast.TrendLine;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 import java.util.ArrayList;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/NativeCalibrationPipe.java b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/NativeCalibrationPipe.java
index d7880e9026..4e8e16b2d3 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/NativeCalibrationPipe.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/NativeCalibrationPipe.java
@@ -1,14 +1,14 @@
 package com.eveningoutpost.dexdrip.calibrations;
 
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.Unitized;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.Unitized;
 import com.eveningoutpost.dexdrip.cgm.medtrum.Medtrum;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
 
 /**
  *
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/PluggableCalibration.java b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/PluggableCalibration.java
index 785c08e798..bdd8f95e4f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/PluggableCalibration.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/PluggableCalibration.java
@@ -3,9 +3,9 @@
 import android.preference.ListPreference;
 import android.util.Log;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/XDripOriginal.java b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/XDripOriginal.java
index 21f683eb8c..a65a1aa0e7 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/XDripOriginal.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/calibrations/XDripOriginal.java
@@ -1,7 +1,7 @@
 package com.eveningoutpost.dexdrip.calibrations;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.List;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/evaluators/PersistentHigh.java b/wear/src/main/java/com/eveningoutpost/dexdrip/evaluators/PersistentHigh.java
index 624eae47d2..0bc4ab48e5 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/evaluators/PersistentHigh.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/evaluators/PersistentHigh.java
@@ -9,22 +9,22 @@
  */
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.Date;
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.niceTimeScalar;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.niceTimeScalar;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
 
 public class PersistentHigh {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeRxMessage.java
similarity index 73%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeRxMessage.java
index 952979352e..a23907c6a6 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeRxMessage.java
@@ -1,10 +1,9 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
-import java.nio.ByteOrder;
 import java.util.Arrays;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeTxMessage.java
similarity index 66%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeTxMessage.java
index 70eebb345b..c5e79604f7 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthChallengeTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthChallengeTxMessage.java
@@ -1,11 +1,9 @@
-package com.eveningoutpost.dexdrip.G5Model;
-import com.eveningoutpost.dexdrip.G5Model.TransmitterMessage;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+package com.eveningoutpost.dexdrip.g5model;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 /**
  * Created by joeginley on 3/16/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthRequestTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthRequestTxMessage.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthRequestTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthRequestTxMessage.java
index 338ef21819..cb0810debe 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthRequestTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthRequestTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthStatusRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthStatusRxMessage.java
similarity index 83%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthStatusRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthStatusRxMessage.java
index f8116de8b4..9c24870228 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/AuthStatusRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/AuthStatusRxMessage.java
@@ -1,8 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillRxMessage.java
similarity index 93%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillRxMessage.java
index d85b46d868..914d49f986 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillStream.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillStream.java
similarity index 93%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillStream.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillStream.java
index 1b9f9d9f4b..ba1fcfbf26 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillStream.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillStream.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // created by jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -14,7 +14,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import static com.eveningoutpost.dexdrip.G5Model.DexTimeKeeper.fromDexTimeCached;
+import static com.eveningoutpost.dexdrip.g5model.DexTimeKeeper.fromDexTimeCached;
 
 public class BackFillStream extends BaseMessage {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillTxMessage.java
similarity index 82%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillTxMessage.java
index ceee90794e..69eee55a40 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BackFillTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BackFillTxMessage.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
-import static com.eveningoutpost.dexdrip.G5Model.DexTimeKeeper.getDexTime;
+import static com.eveningoutpost.dexdrip.g5model.DexTimeKeeper.getDexTime;
 
 // created by jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseAuthChallengeTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseAuthChallengeTxMessage.java
similarity index 71%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseAuthChallengeTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseAuthChallengeTxMessage.java
index 7b7112e3d4..010745aa54 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseAuthChallengeTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseAuthChallengeTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseGlucoseRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseGlucoseRxMessage.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseGlucoseRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseGlucoseRxMessage.java
index d118096b0b..bdddecd2fb 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseGlucoseRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseGlucoseRxMessage.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import lombok.NoArgsConstructor;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseMessage.java
similarity index 93%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseMessage.java
index 2a5ba97ed0..ab52e15fbd 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BaseMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BaseMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoRxMessage.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoRxMessage.java
index d3f063bb1c..e0b2d8758d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoRxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoTxMessage.java
similarity index 64%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoTxMessage.java
index ad325c374c..1bf4be19c7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/BatteryInfoTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BatteryInfoTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 /**
  * Created by jamorham on 25/11/2016.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BluetoothServices.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BluetoothServices.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BluetoothServices.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BluetoothServices.java
index 297ddd7391..6455f1cd7f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BluetoothServices.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BluetoothServices.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import android.util.SparseArray;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BondRequestTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BondRequestTxMessage.java
similarity index 80%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BondRequestTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BondRequestTxMessage.java
index 34c735f7bd..40d004d48b 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/BondRequestTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/BondRequestTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CRC.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CRC.java
similarity index 85%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CRC.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CRC.java
index b4eadfedb0..c928ae3d30 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CRC.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CRC.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.CRC16;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.CRC16;
 
 /**
  * Created by jcostik1 on 3/24/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateRxMessage.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateRxMessage.java
index 96981546fa..fef1aa5e08 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import com.eveningoutpost.dexdrip.R;
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateTxMessage.java
similarity index 77%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateTxMessage.java
index f2abded7b9..be9a885715 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrateTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrateTxMessage.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 
 // created by jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 public class CalibrateTxMessage extends BaseMessage {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrationState.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrationState.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrationState.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrationState.java
index 19f5160dee..12e87120a1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/CalibrationState.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/CalibrationState.java
@@ -1,15 +1,15 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // created by jamorham
 
 import android.util.SparseArray;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.google.common.collect.ImmutableSet;
 
 import lombok.Getter;
 
-import static com.eveningoutpost.dexdrip.Services.G5CollectionService.TAG;
+import static com.eveningoutpost.dexdrip.services.G5CollectionService.TAG;
 
 public enum CalibrationState {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexResetHelper.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexResetHelper.java
similarity index 61%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexResetHelper.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexResetHelper.java
index 6a0e5b850e..d44392093a 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexResetHelper.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexResetHelper.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.DEX_BASE_ID;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.DEX_BASE_ID;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSessionKeeper.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSessionKeeper.java
similarity index 85%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSessionKeeper.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSessionKeeper.java
index ce30ec9dc0..a1c0554cc2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSessionKeeper.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSessionKeeper.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSyncKeeper.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSyncKeeper.java
similarity index 88%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSyncKeeper.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSyncKeeper.java
index 1c8e6d972a..4d9c56dd7f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexSyncKeeper.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexSyncKeeper.java
@@ -1,13 +1,13 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 
 public class DexSyncKeeper {
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexTimeKeeper.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexTimeKeeper.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
index 64c48bed64..5ba6cd4373 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/DexTimeKeeper.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 /**
  * Created by jamorham on 25/11/2016.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DisconnectTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DisconnectTxMessage.java
similarity index 68%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DisconnectTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DisconnectTxMessage.java
index 8847015588..38c1cc3ece 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/DisconnectTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/DisconnectTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseRxMessage.java
similarity index 93%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseRxMessage.java
index cf480f5fa1..e3f4465662 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseRxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseTxMessage.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseTxMessage.java
index 21ea09fdd3..ebb1320da4 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/EGlucoseTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/EGlucoseTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Extensions.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Extensions.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Extensions.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Extensions.java
index a5cfddca45..3fc84461f8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/Extensions.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Extensions.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 /**
  * Created by joeginley on 3/19/16.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/F2DUnknownRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/F2DUnknownRxMessage.java
similarity index 81%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/F2DUnknownRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/F2DUnknownRxMessage.java
index 3d6b6e20d9..9336d3a64d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/F2DUnknownRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/F2DUnknownRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/FastCRC16.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/FastCRC16.java
index ff5193f46d..fbd5514863 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/FastCRC16.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/FastCRC16.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/FirmwareCapability.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/FirmwareCapability.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
index 3ec2f62627..917400dccf 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/FirmwareCapability.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
 import com.google.common.collect.ImmutableSet;
 
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.getRawFirmwareVersionString;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.getRawFirmwareVersionString;
 
 public class FirmwareCapability {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/G6CalibrationParameters.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/G6CalibrationParameters.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/G6CalibrationParameters.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/G6CalibrationParameters.java
index 5bf565e25d..458bc13a25 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/G6CalibrationParameters.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/G6CalibrationParameters.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import lombok.Getter;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseRxMessage.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseRxMessage.java
index 23ee8fb4d8..d0f2800b8d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseRxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseTxMessage.java
similarity index 63%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseTxMessage.java
index 57e6eb988f..f2fc51ffae 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/GlucoseTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/GlucoseTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 /**
  * Created by jamorham on 25/11/2016.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/InvalidRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/InvalidRxMessage.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/InvalidRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/InvalidRxMessage.java
index 70de647e1f..15c4deba8a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/InvalidRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/InvalidRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/KeepAliveTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/KeepAliveTxMessage.java
similarity index 75%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/KeepAliveTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/KeepAliveTxMessage.java
index 438fe59235..c5e016da4e 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/KeepAliveTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/KeepAliveTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1G5StateMachine.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1G5StateMachine.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
index eb455fbc5e..63836d7586 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1G5StateMachine.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
@@ -1,32 +1,31 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothGatt;
 import android.os.Build;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.BestGlucose;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Prediction;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Prediction;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BroadcastGlucose;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.NotificationChannels;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BroadcastGlucose;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.NotificationChannels;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
 import com.eveningoutpost.dexdrip.utils.bt.Mimeograph;
@@ -58,26 +57,26 @@
 
 //import rx.schedulers.Schedulers;
 
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.Authentication;
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.Control;
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.ProbablyBackfill;
-import static com.eveningoutpost.dexdrip.Models.JoH.msSince;
-import static com.eveningoutpost.dexdrip.Models.JoH.pratelimit;
-import static com.eveningoutpost.dexdrip.Models.JoH.tsl;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_BATTERY_FROM_MARKER;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_BATTERY_LEVEL_MARKER;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_BATTERY_MARKER;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_BATTERY_WEARABLE_SEND;
-import static com.eveningoutpost.dexdrip.Services.G5BaseService.G5_FIRMWARE_MARKER;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.android_wear;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.getTransmitterID;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.onlyUsingNativeMode;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.wear_broadcast;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.DAY_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.MINUTE_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.SECOND_IN_MS;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.Authentication;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.Control;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.ProbablyBackfill;
+import static com.eveningoutpost.dexdrip.models.JoH.msSince;
+import static com.eveningoutpost.dexdrip.models.JoH.pratelimit;
+import static com.eveningoutpost.dexdrip.models.JoH.tsl;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_BATTERY_FROM_MARKER;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_BATTERY_LEVEL_MARKER;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_BATTERY_MARKER;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_BATTERY_WEARABLE_SEND;
+import static com.eveningoutpost.dexdrip.services.G5BaseService.G5_FIRMWARE_MARKER;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.android_wear;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.getTransmitterID;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.onlyUsingNativeMode;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.wear_broadcast;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.DAY_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.SECOND_IN_MS;
 import static com.eveningoutpost.dexdrip.utils.bt.Helper.getStatusName;
 
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1Work.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1Work.java
similarity index 89%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1Work.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1Work.java
index d202f9fe9c..53e1a1473a 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Ob1Work.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1Work.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.annotations.Expose;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/RawScaling.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/RawScaling.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/RawScaling.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/RawScaling.java
index 42cae52043..f5cea4116b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/RawScaling.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/RawScaling.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.usingG6;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.usingG6;
 
 public class RawScaling {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/ResetTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/ResetTxMessage.java
similarity index 71%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/ResetTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/ResetTxMessage.java
index 6addbf08db..3bd4f11955 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/ResetTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/ResetTxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorRxMessage.java
similarity index 81%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorRxMessage.java
index 6c6c4ec8d0..c5a674a192 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorRxMessage.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorTxMessage.java
similarity index 65%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorTxMessage.java
index 570370415d..3a83363e6d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SensorTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SensorTxMessage.java
@@ -1,11 +1,9 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 /**
  * Created by jcostik1 on 3/26/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartRxMessage.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartRxMessage.java
index 8c8eeb41f1..714f474846 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartTxMessage.java
similarity index 92%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartTxMessage.java
index 90d557b722..098721587f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStartTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStartTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopRxMessage.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopRxMessage.java
index f8ae444e12..2867be169d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopTxMessage.java
similarity index 85%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopTxMessage.java
index 9fd46c0c5c..492e0447a7 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/SessionStopTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/SessionStopTxMessage.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 // created by jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TimeTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TimeTxMessage.java
similarity index 78%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TimeTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TimeTxMessage.java
index ff6f374240..e30054546d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TimeTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TimeTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Transmitter.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Transmitter.java
similarity index 83%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Transmitter.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Transmitter.java
index f7b47c16b6..ab05035a55 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/Transmitter.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/Transmitter.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 /**
  * Created by joeginley on 3/19/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterMessage.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterMessage.java
index 211cbf2f9b..8e5f5e78d6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 import com.google.gson.annotations.Expose;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterStatus.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterStatus.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterStatus.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterStatus.java
index 0272d86a86..e2ff9b931d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterStatus.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterStatus.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 /**
  * Created by joeginley on 3/28/16.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeRxMessage.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeRxMessage.java
index ac824b2049..19ba115a58 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeRxMessage.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeTxMessage.java
similarity index 90%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeTxMessage.java
index 9f11c37ddf..72c009bbd7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/TransmitterTimeTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/TransmitterTimeTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/UnbondRequestTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/UnbondRequestTxMessage.java
similarity index 87%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/UnbondRequestTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/UnbondRequestTxMessage.java
index e7470a8c4d..15f7562352 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/UnbondRequestTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/UnbondRequestTxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest1RxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest1RxMessage.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest1RxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest1RxMessage.java
index 48c2bbf322..d70d515f7d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest1RxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest1RxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest2RxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest2RxMessage.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest2RxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest2RxMessage.java
index 20633106d5..6361e12989 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequest2RxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequest2RxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestRxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestRxMessage.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestRxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestRxMessage.java
index 30f7ecd3ca..dcbc5672db 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestRxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestRxMessage.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestTxMessage.java b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestTxMessage.java
similarity index 84%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestTxMessage.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestTxMessage.java
index a8c791ef97..14d2360721 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/G5Model/VersionRequestTxMessage.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/g5model/VersionRequestTxMessage.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.G5Model;
+package com.eveningoutpost.dexdrip.g5model;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 /**
  * Created by jamorham on 25/11/2016.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRC16.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRC16.java
similarity index 92%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRC16.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRC16.java
index ec5092c6ac..c184aab4a6 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRC16.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRC16.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 // This code and this particular library are from the NightScout android uploader
 // Check them out here: https://github.com/nightscout/android-uploader
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRCFailRuntimeException.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRCFailRuntimeException.java
similarity index 85%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRCFailRuntimeException.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRCFailRuntimeException.java
index 9f7fdb1a7b..7ceed1baaa 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/CRCFailRuntimeException.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/CRCFailRuntimeException.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 // This code and this particular library are from the NightScout android uploader
 // Check them out here: https://github.com/nightscout/android-uploader
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Constants.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Constants.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Constants.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Constants.java
index 5c81447383..0dca2ea487 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Constants.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Constants.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 // This code and this particular library are from the NightScout android uploader
 // Check them out here: https://github.com/nightscout/android-uploader
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/PacketBuilder.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/PacketBuilder.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/PacketBuilder.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/PacketBuilder.java
index 72134cfa62..2c38898ef8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/PacketBuilder.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/PacketBuilder.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadDataShare.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadDataShare.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadDataShare.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadDataShare.java
index a300e8d1a1..8e75cf602f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadDataShare.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadDataShare.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 /* KS not used
 import android.bluetooth.BluetoothGatt;
@@ -7,17 +7,17 @@
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
 */
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.GenericXMLRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.MeterRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.PageHeader;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.GenericXMLRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.MeterRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.PageHeader;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
 //KS import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.driver.UsbSerialDriver;
 //KS import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.DexShareCollectionService;
+import com.eveningoutpost.dexdrip.services.DexShareCollectionService;
 //KS import com.eveningoutpost.dexdrip.ShareTest;
 
 import org.w3c.dom.Element;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadPacket.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadPacket.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadPacket.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadPacket.java
index f84f20c61f..949aa8d8a0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/ReadPacket.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/ReadPacket.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
 import java.util.Arrays;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Utils.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Utils.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Utils.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Utils.java
index ca698538dc..81e76dca6a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/Utils.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/Utils.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.GlucoseDataSet;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.GlucoseDataSet;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
 
 import java.util.Date;
 import java.util.TimeZone;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalRecord.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalRecord.java
similarity index 94%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalRecord.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalRecord.java
index 8353cea430..bff6cd027b 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalRecord.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalSubrecord.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalSubrecord.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalSubrecord.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalSubrecord.java
index be2f954223..3b85f054e0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/CalSubrecord.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/CalSubrecord.java
@@ -1,8 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Utils;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Utils;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/EGVRecord.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/EGVRecord.java
similarity index 88%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/EGVRecord.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/EGVRecord.java
index be2d23bc1c..1dc6a5a8f8 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/EGVRecord.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/EGVRecord.java
@@ -1,16 +1,12 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Constants;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Constants;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.Arrays;
 import java.util.Date;
 
 // This code and this particular library are from the NightScout android uploader
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericTimestampRecord.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericTimestampRecord.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericTimestampRecord.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericTimestampRecord.java
index d1b09d4c42..da4fa39c43 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericTimestampRecord.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericTimestampRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Utils;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Utils;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericXMLRecord.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericXMLRecord.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericXMLRecord.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericXMLRecord.java
index 73137ac4ae..67729f72e0 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GenericXMLRecord.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GenericXMLRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -8,7 +8,7 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.Serializable;
+
 import java.io.StringReader;
 import java.util.Arrays;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GlucoseDataSet.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GlucoseDataSet.java
similarity index 92%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GlucoseDataSet.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GlucoseDataSet.java
index d62572a688..e2af5571ae 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/GlucoseDataSet.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/GlucoseDataSet.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Constants;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Constants;
 
 import java.util.Date;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/MeterRecord.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/MeterRecord.java
similarity index 92%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/MeterRecord.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/MeterRecord.java
index 3187923883..2a313808d0 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/MeterRecord.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/MeterRecord.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/PageHeader.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/PageHeader.java
similarity index 88%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/PageHeader.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/PageHeader.java
index b473150cd6..ab767fb908 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/PageHeader.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/PageHeader.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.CRC16;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.CRCFailRuntimeException;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Constants;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Utils;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.CRC16;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.CRCFailRuntimeException;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Constants;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.Utils;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/SensorRecord.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/SensorRecord.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/SensorRecord.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/SensorRecord.java
index 033ad6f53f..9750d62c31 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/dexcom/records/SensorRecord.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/dexcom/records/SensorRecord.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records;
+package com.eveningoutpost.dexdrip.importedlibraries.dexcom.records;
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/HexDump.java b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/HexDump.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/HexDump.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/HexDump.java
index dff2dad934..49e22eb253 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ImportedLibraries/usbserial/util/HexDump.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/importedlibraries/usbserial/util/HexDump.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util;
+package com.eveningoutpost.dexdrip.importedlibraries.usbserial.util;
 
 /**
  * Clone of Android's HexDump class, for use in debugging. Cosmetic changes
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBgAlert.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBgAlert.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBgAlert.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBgAlert.java
index a9ae6ef107..15eb42a68a 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBgAlert.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBgAlert.java
@@ -1,15 +1,15 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
 
 import java.text.DateFormat;
 import java.util.Date;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBluetoothDevice.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBluetoothDevice.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBluetoothDevice.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBluetoothDevice.java
index aa2e8fc56c..a3f97858bf 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/ActiveBluetoothDevice.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/ActiveBluetoothDevice.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/AlertType.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/AlertType.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/AlertType.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/AlertType.java
index 466eabf630..ff95f30aad 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/AlertType.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/AlertType.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -10,9 +10,9 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/BgReading.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/BgReading.java
index 7c328b9450..86b4f1bb36 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/BgReading.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -16,21 +16,21 @@
 import com.eveningoutpost.dexdrip.BestGlucose;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.SyncService;
-import com.eveningoutpost.dexdrip.ShareModels.ShareUploadableBg;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.services.SyncService;
+import com.eveningoutpost.dexdrip.sharemodels.ShareUploadableBg;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.messages.BgReadingMessage;
 import com.eveningoutpost.dexdrip.messages.BgReadingMultiMessage;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/BloodTest.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/BloodTest.java
index a91f9e5126..7e95b13add 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/BloodTest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 import android.util.Log;
@@ -13,13 +13,13 @@
 //KS import com.eveningoutpost.dexdrip.GlucoseMeter.GlucoseReadingRx;
 import com.eveningoutpost.dexdrip.Home;
 //KS import com.eveningoutpost.dexdrip.Services.SyncService;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 //KS import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
 //KS import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 //KS import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
 //KS import com.eveningoutpost.dexdrip.messages.BloodTestMessage;
 //KS import com.eveningoutpost.dexdrip.messages.BloodTestMultiMessage;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Bubble.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Bubble.java
similarity index 93%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/Bubble.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/Bubble.java
index 1887221d88..104ceb5488 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Bubble.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Bubble.java
@@ -1,13 +1,13 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.NFCReaderX;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BridgeResponse;
-import com.eveningoutpost.dexdrip.UtilityModels.LibreUtils;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.BridgeResponse;
+import com.eveningoutpost.dexdrip.utilitymodels.LibreUtils;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.nio.ByteBuffer;
 import java.text.SimpleDateFormat;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Calibration.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/Calibration.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java
index 30d8fec2d8..e719782c4e 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Calibration.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Context;
 import android.content.Intent;
@@ -17,17 +17,17 @@
 //KS import com.eveningoutpost.dexdrip.GcmActivity;
 import com.activeandroid.util.SQLiteUtils;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalSubrecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalSubrecord;
 import com.eveningoutpost.dexdrip.ListenerService;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.BgSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.CalibrationSendQueue;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.BgSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.CalibrationSendQueue;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
 //KS import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/CalibrationRequest.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/CalibrationRequest.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/CalibrationRequest.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/CalibrationRequest.java
index f4952ba9cd..352ed5febb 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/CalibrationRequest.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/CalibrationRequest.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/DateUtil.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/DateUtil.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/DateUtil.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/DateUtil.java
index 8d2e05bf37..97efe9cd4a 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/DateUtil.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/DateUtil.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Forecast.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Forecast.java
similarity index 99%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Forecast.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/Forecast.java
index 1ea072c722..415f3a0c10 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Forecast.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Forecast.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/GlucoseData.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/GlucoseData.java
similarity index 95%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/GlucoseData.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/GlucoseData.java
index 3500cf177b..19b918e2d0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/GlucoseData.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/GlucoseData.java
@@ -1,5 +1,5 @@
 
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import java.text.DecimalFormat;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/HeartRate.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/HeartRate.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/HeartRate.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/HeartRate.java
index 82d2633e58..7485df2e0f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/HeartRate.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/HeartRate.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/JoH.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/JoH.java
index da8070e7fe..8efe2b3e65 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/JoH.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -58,8 +58,8 @@
 import com.activeandroid.ActiveAndroid;
 import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.eveningoutpost.dexdrip.utils.BestGZIPOutputStream;
 //KS import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.xdrip;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreBlock.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreBlock.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreBlock.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreBlock.java
index 1ffbcf60f7..cfb42ba8e4 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreBlock.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreBlock.java
@@ -1,16 +1,15 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.UploaderQueue;
 import com.google.gson.annotations.Expose;
 
-import java.text.DecimalFormat;
 import java.util.List;
 import java.util.UUID;
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreData.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreData.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreData.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreData.java
index 46ee1f8622..1e0c0867ba 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreData.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreData.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreOOPAlgorithm.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreOOPAlgorithm.java
similarity index 92%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreOOPAlgorithm.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreOOPAlgorithm.java
index 88f38ac85d..92c2d279cb 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/LibreOOPAlgorithm.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreOOPAlgorithm.java
@@ -1,16 +1,16 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
 import com.eveningoutpost.dexdrip.LibreAlarmReceiver;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.CompatibleApps;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Intents;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.CompatibleApps;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Intents;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Noise.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Noise.java
similarity index 83%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/Noise.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/Noise.java
index 38338fd442..9c09b3fd7d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/Noise.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Noise.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 /**
  * Created by jamorham on 04/03/2018.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/OOPResultsContainer.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/OOPResultsContainer.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/OOPResultsContainer.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/OOPResultsContainer.java
index 62547279e7..8157ce0685 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/OOPResultsContainer.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/OOPResultsContainer.java
@@ -1,11 +1,9 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.util.List;
-
 class HistoricBg {
 
     public int quality;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/PebbleMovement.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/PebbleMovement.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/PebbleMovement.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/PebbleMovement.java
index f53ec76e5d..71cfd79451 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/PebbleMovement.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/PebbleMovement.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
@@ -8,7 +8,6 @@
 import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/PlusModel.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/PlusModel.java
similarity index 92%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/PlusModel.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/PlusModel.java
index 8c782d7abf..ba21ad60d6 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/PlusModel.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/PlusModel.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.activeandroid.Model;
 import com.activeandroid.util.SQLiteUtils;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Prediction.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Prediction.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/Prediction.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/Prediction.java
index 5bb639af2d..6023187e55 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Prediction.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Prediction.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/PredictionData.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/PredictionData.java
similarity index 88%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/PredictionData.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/PredictionData.java
index 048f5461f3..d1727bffba 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/PredictionData.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/PredictionData.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 // class from LibreAlarm
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQuality.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQuality.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQuality.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQuality.java
index dae6a1844f..a03e19e0aa 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/ProcessInitialDataQuality.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/ProcessInitialDataQuality.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.databinding.BaseObservable;
 
@@ -7,8 +7,8 @@
 
 import java.util.List;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.STALE_CALIBRATION_CUT_OFF;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.STALE_CALIBRATION_CUT_OFF;
 
 /**
  * Created by jamorham on 01/10/2017.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/ReadingData.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/ReadingData.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/ReadingData.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/ReadingData.java
index 95bf23ed60..9ee8046c8a 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/ReadingData.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/ReadingData.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 // class from LibreAlarm
 
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Sensor.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Sensor.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/Sensor.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/Sensor.java
index 41bc5b68f3..f80f7717ae 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Sensor.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Sensor.java
@@ -1,9 +1,6 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteException;
-import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 
 import com.activeandroid.ActiveAndroid;
@@ -14,13 +11,12 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
 import android.database.sqlite.SQLiteDatabase;//KS
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.SensorSendQueue;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.SensorSendQueue;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.internal.bind.DateTypeAdapter;
 
-import java.sql.SQLException;
 import java.util.Date;
 import java.util.UUID;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/SensorSanity.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/SensorSanity.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/SensorSanity.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/SensorSanity.java
index 4ac8aaa338..5e3ae105ff 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/SensorSanity.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/SensorSanity.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Tomato.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Tomato.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/Tomato.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/Tomato.java
index 8039504d5b..98594a5b64 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Tomato.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Tomato.java
@@ -1,14 +1,13 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.NFCReaderX;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Blukon;
-import com.eveningoutpost.dexdrip.UtilityModels.BridgeResponse;
-import com.eveningoutpost.dexdrip.UtilityModels.LibreUtils;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.BridgeResponse;
+import com.eveningoutpost.dexdrip.utilitymodels.LibreUtils;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/TransmitterData.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/TransmitterData.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/TransmitterData.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/TransmitterData.java
index 1d48963845..93faea9c5a 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/TransmitterData.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/TransmitterData.java
@@ -1,19 +1,18 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.os.AsyncTask;
 import android.provider.BaseColumns;
 
-import com.eveningoutpost.dexdrip.G5Model.Transmitter;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.google.gson.Gson;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Treatments.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Treatments.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/Treatments.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/Treatments.java
index fd57c958df..d6298c8e17 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/Treatments.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/Treatments.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 /**
  * Created by jamorham on 31/12/15.
@@ -16,8 +16,7 @@
 import com.activeandroid.util.SQLiteUtils;
 //KS import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.R;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 //KS import com.eveningoutpost.dexdrip.Services.SyncService;
 //KS import com.eveningoutpost.dexdrip.UtilityModels.UndoRedo;
 //KS import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
@@ -29,13 +28,8 @@
 import org.json.JSONObject;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
 import java.util.UUID;
 
 // TODO Switchable Carb models
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/UserError.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/UserError.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/UserError.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/UserError.java
index 84199e90a2..1a47d7957b 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/UserError.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/UserError.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.os.AsyncTask;
 import android.provider.BaseColumns;
@@ -6,8 +6,7 @@
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/UserNotification.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/UserNotification.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Models/UserNotification.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/UserNotification.java
index e00f26c10c..4288ea39ae 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Models/UserNotification.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/UserNotification.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.provider.BaseColumns;
 
@@ -7,14 +7,13 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
 import com.activeandroid.util.SQLiteUtils;
-import com.eveningoutpost.dexdrip.Home;
 
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 /**
  * Created by Emma Black on 11/29/14.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/blueReader.java b/wear/src/main/java/com/eveningoutpost/dexdrip/models/blueReader.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Models/blueReader.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/models/blueReader.java
index d82c078531..83f5313b86 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/blueReader.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/models/blueReader.java
@@ -1,14 +1,14 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import android.text.format.DateFormat;
 import com.eveningoutpost.dexdrip.Home;
 import java.nio.ByteBuffer;
 import java.util.Date;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.eveningoutpost.dexdrip.R;
 import java.io.BufferedWriter;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/ComplicationTapBroadcastReceiver.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/ComplicationTapBroadcastReceiver.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/ComplicationTapBroadcastReceiver.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/ComplicationTapBroadcastReceiver.java
index 3288b72c4d..b578bac132 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/ComplicationTapBroadcastReceiver.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/ComplicationTapBroadcastReceiver.java
@@ -16,7 +16,7 @@
 
 // provided by lurosys
 
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -27,8 +27,8 @@
 import android.support.wearable.complications.ProviderUpdateRequester;
 
 import com.eveningoutpost.dexdrip.KeypadInputActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.eveningoutpost.dexdrip.xdrip;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/CustomComplicationProviderService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/CustomComplicationProviderService.java
similarity index 94%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/CustomComplicationProviderService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/CustomComplicationProviderService.java
index 0f6d2f04b1..47065b43c8 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/CustomComplicationProviderService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/CustomComplicationProviderService.java
@@ -16,7 +16,7 @@
 
 // provided by lurosys
 
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -29,16 +29,16 @@
 
 import com.activeandroid.ActiveAndroid;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.unitizedDeltaString;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.unitizedDeltaString;
 
 /**
  * Example watch face complication data provider provides a number that can be incremented on tap.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DexCollectionService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/DexCollectionService.java
similarity index 98%
rename from app/src/main/java/com/eveningoutpost/dexdrip/Services/DexCollectionService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/DexCollectionService.java
index 73fcd039ac..3d5b857e71 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DexCollectionService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/DexCollectionService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -42,29 +42,29 @@
 
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Bubble;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.Tomato;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.blueReader;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Bubble;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.Tomato;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.blueReader;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.Blukon;
-import com.eveningoutpost.dexdrip.UtilityModels.BridgeResponse;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.HM10Attributes;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.XbridgePlus;
+import com.eveningoutpost.dexdrip.utilitymodels.Blukon;
+import com.eveningoutpost.dexdrip.utilitymodels.BridgeResponse;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.HM10Attributes;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.XbridgePlus;
 import com.eveningoutpost.dexdrip.utils.BtCallBack;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
@@ -84,8 +84,8 @@
 import java.util.UUID;
 
 import static android.bluetooth.BluetoothDevice.TRANSPORT_LE;
-import static com.eveningoutpost.dexdrip.Models.JoH.convertPinToBytes;
-import static com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder.DEXCOM_PERIOD;
+import static com.eveningoutpost.dexdrip.models.JoH.convertPinToBytes;
+import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 import static com.eveningoutpost.dexdrip.utils.bt.Helper.getStatusName;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/DexShareCollectionService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/DexShareCollectionService.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/DexShareCollectionService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/DexShareCollectionService.java
index 96c22a6862..ee3baa5135 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/DexShareCollectionService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/DexShareCollectionService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.TargetApi;
 import android.app.AlarmManager;
@@ -23,22 +23,22 @@
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.ReadDataShare;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.CalRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.EGVRecord;
-import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.records.SensorRecord;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.DexShareAttributes;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.ReadDataShare;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.CalRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.EGVRecord;
+import com.eveningoutpost.dexdrip.importedlibraries.dexcom.records.SensorRecord;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.DexShareAttributes;
 //KS import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.HM10Attributes;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.HM10Attributes;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 //KS import com.eveningoutpost.dexdrip.utils.BgToSpeech;
 
 import java.nio.charset.StandardCharsets;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/DoNothingService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/DoNothingService.java
similarity index 63%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/DoNothingService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/DoNothingService.java
index 17106a5a9f..c457c7c7e2 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/DoNothingService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/DoNothingService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/G5BaseService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/G5BaseService.java
similarity index 94%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/G5BaseService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/G5BaseService.java
index 71261b63a6..0b9971d9d9 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/G5BaseService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/G5BaseService.java
@@ -1,16 +1,16 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
 import android.content.SharedPreferences;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.google.android.gms.wearable.DataMap;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/G5CollectionService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/G5CollectionService.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/G5CollectionService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/G5CollectionService.java
index ca4f260f3b..ab7eab8872 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/G5CollectionService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/G5CollectionService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 /**
  * Created by jcostik1 on 3/15/16.
@@ -35,37 +35,37 @@
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.G5Model.AuthChallengeRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.AuthChallengeTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.AuthRequestTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.AuthStatusRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.BatteryInfoRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.BatteryInfoTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.BluetoothServices;
-import com.eveningoutpost.dexdrip.G5Model.BondRequestTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.DisconnectTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.Extensions;
-import com.eveningoutpost.dexdrip.G5Model.GlucoseRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.GlucoseTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.KeepAliveTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.SensorRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.SensorTxMessage;
-import com.eveningoutpost.dexdrip.G5Model.Transmitter;
-import com.eveningoutpost.dexdrip.G5Model.TransmitterStatus;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequestRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequestTxMessage;
+import com.eveningoutpost.dexdrip.g5model.AuthChallengeRxMessage;
+import com.eveningoutpost.dexdrip.g5model.AuthChallengeTxMessage;
+import com.eveningoutpost.dexdrip.g5model.AuthRequestTxMessage;
+import com.eveningoutpost.dexdrip.g5model.AuthStatusRxMessage;
+import com.eveningoutpost.dexdrip.g5model.BatteryInfoRxMessage;
+import com.eveningoutpost.dexdrip.g5model.BatteryInfoTxMessage;
+import com.eveningoutpost.dexdrip.g5model.BluetoothServices;
+import com.eveningoutpost.dexdrip.g5model.BondRequestTxMessage;
+import com.eveningoutpost.dexdrip.g5model.DisconnectTxMessage;
+import com.eveningoutpost.dexdrip.g5model.Extensions;
+import com.eveningoutpost.dexdrip.g5model.GlucoseRxMessage;
+import com.eveningoutpost.dexdrip.g5model.GlucoseTxMessage;
+import com.eveningoutpost.dexdrip.g5model.KeepAliveTxMessage;
+import com.eveningoutpost.dexdrip.g5model.SensorRxMessage;
+import com.eveningoutpost.dexdrip.g5model.SensorTxMessage;
+import com.eveningoutpost.dexdrip.g5model.Transmitter;
+import com.eveningoutpost.dexdrip.g5model.TransmitterStatus;
+import com.eveningoutpost.dexdrip.g5model.VersionRequestRxMessage;
+import com.eveningoutpost.dexdrip.g5model.VersionRequestTxMessage;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
 //KS import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
 //KS import com.eveningoutpost.dexdrip.utils.BgToSpeech;
 import com.eveningoutpost.dexdrip.xdrip;
 
@@ -91,8 +91,8 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
 
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.getStatusName;
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.getUUIDName;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.getStatusName;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.getUUIDName;
 
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class G5CollectionService extends G5BaseService {
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/HeartRateJobService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/HeartRateJobService.java
similarity index 90%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/HeartRateJobService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/HeartRateJobService.java
index 0ba9dbcb49..ce2161491e 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/HeartRateJobService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/HeartRateJobService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 // jamorham
 
@@ -6,8 +6,8 @@
 import android.support.annotation.NonNull;
 import android.support.v4.app.JobIntentService;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.xdrip;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/HeartRateService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/HeartRateService.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/HeartRateService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/HeartRateService.java
index a0e880d129..f08d7f466f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/HeartRateService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/HeartRateService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.Manifest;
 import android.app.IntentService;
@@ -13,14 +13,14 @@
 import android.support.v4.app.ActivityCompat;
 
 import com.eveningoutpost.dexdrip.ListenerService;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.SensorPermissionActivity;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.android.gms.wearable.DataMap;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/MissedReadingService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/MissedReadingService.java
similarity index 93%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/MissedReadingService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/MissedReadingService.java
index d49a79d47b..0233bea533 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/MissedReadingService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/MissedReadingService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.IntentService;
 import android.app.PendingIntent;
@@ -8,18 +8,18 @@
 import android.preference.PreferenceManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
 //import com.eveningoutpost.dexdrip.Models.Reminder;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.UserNotification;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Notifications;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserNotification;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Notifications;
 //import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleUtil;
 //import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleWatchSync;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 //import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/MongoWrapper.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/MongoWrapper.java
similarity index 100%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/MongoWrapper.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/MongoWrapper.java
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/Ob1G5CollectionService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/Ob1G5CollectionService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java
index 6120d8c355..490be1da2d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/Ob1G5CollectionService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.annotation.TargetApi;
 import android.app.PendingIntent;
@@ -23,33 +23,33 @@
 
 import com.eveningoutpost.dexdrip.AddCalibration;
 import com.eveningoutpost.dexdrip.DoubleCalibrationActivity;
-import com.eveningoutpost.dexdrip.G5Model.BatteryInfoRxMessage;
-import com.eveningoutpost.dexdrip.G5Model.BluetoothServices;
-import com.eveningoutpost.dexdrip.G5Model.CalibrationState;
-import com.eveningoutpost.dexdrip.G5Model.DexSyncKeeper;
-import com.eveningoutpost.dexdrip.G5Model.DexTimeKeeper;
-import com.eveningoutpost.dexdrip.G5Model.FirmwareCapability;
-import com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine;
-import com.eveningoutpost.dexdrip.G5Model.TransmitterStatus;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequest1RxMessage;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequest2RxMessage;
-import com.eveningoutpost.dexdrip.G5Model.VersionRequestRxMessage;
+import com.eveningoutpost.dexdrip.g5model.BatteryInfoRxMessage;
+import com.eveningoutpost.dexdrip.g5model.BluetoothServices;
+import com.eveningoutpost.dexdrip.g5model.CalibrationState;
+import com.eveningoutpost.dexdrip.g5model.DexSyncKeeper;
+import com.eveningoutpost.dexdrip.g5model.DexTimeKeeper;
+import com.eveningoutpost.dexdrip.g5model.FirmwareCapability;
+import com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine;
+import com.eveningoutpost.dexdrip.g5model.TransmitterStatus;
+import com.eveningoutpost.dexdrip.g5model.VersionRequest1RxMessage;
+import com.eveningoutpost.dexdrip.g5model.VersionRequest2RxMessage;
+import com.eveningoutpost.dexdrip.g5model.VersionRequestRxMessage;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BroadcastGlucose;
-import com.eveningoutpost.dexdrip.UtilityModels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.eveningoutpost.dexdrip.UtilityModels.RxBleProvider;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem;
-import com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.utilitymodels.BroadcastGlucose;
+import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.RxBleProvider;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem;
+import com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.ui.helpers.Span;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.bt.Subscription;
@@ -83,36 +83,36 @@
 import io.reactivex.schedulers.Schedulers;
 import lombok.Setter;
 
-import static com.eveningoutpost.dexdrip.G5Model.BluetoothServices.getUUIDName;
-import static com.eveningoutpost.dexdrip.G5Model.CalibrationState.Ok;
-import static com.eveningoutpost.dexdrip.G5Model.CalibrationState.Unknown;
-import static com.eveningoutpost.dexdrip.G5Model.G6CalibrationParameters.getCurrentSensorCode;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.CLOSED_OK_TEXT;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.evaluateG6Settings;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.pendingCalibration;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.pendingStart;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.pendingStop;
-import static com.eveningoutpost.dexdrip.G5Model.Ob1G5StateMachine.usingAlt;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.BOND;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CLOSE;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CLOSED;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CONNECT;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.CONNECT_NOW;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.DISCOVER;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.GET_DATA;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.INIT;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.PREBOND;
-import static com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService.STATE.SCAN;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.G5_CALIBRATION_REQUEST;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.G5_SENSOR_FAILED;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.G5_SENSOR_RESTARTED;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.G5_SENSOR_STARTED;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.HOUR_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.SECOND_IN_MS;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.CRITICAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NORMAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NOTICE;
+import static com.eveningoutpost.dexdrip.g5model.BluetoothServices.getUUIDName;
+import static com.eveningoutpost.dexdrip.g5model.CalibrationState.Ok;
+import static com.eveningoutpost.dexdrip.g5model.CalibrationState.Unknown;
+import static com.eveningoutpost.dexdrip.g5model.G6CalibrationParameters.getCurrentSensorCode;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.CLOSED_OK_TEXT;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.evaluateG6Settings;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.pendingCalibration;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.pendingStart;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.pendingStop;
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.usingAlt;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.BOND;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.CLOSE;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.CLOSED;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.CONNECT;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.CONNECT_NOW;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.DISCOVER;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.GET_DATA;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.INIT;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.PREBOND;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.STATE.SCAN;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.G5_CALIBRATION_REQUEST;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.G5_SENSOR_FAILED;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.G5_SENSOR_RESTARTED;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.G5_SENSOR_STARTED;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.SECOND_IN_MS;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.BAD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.CRITICAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NORMAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NOTICE;
 import static com.eveningoutpost.dexdrip.utils.DexCollectionType.DexcomG5;
 import static com.eveningoutpost.dexdrip.utils.bt.Subscription.addErrorHandler;
 import static com.eveningoutpost.dexdrip.xdrip.gs;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/SnoozeOnNotificationDismissService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/SnoozeOnNotificationDismissService.java
similarity index 88%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/SnoozeOnNotificationDismissService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/SnoozeOnNotificationDismissService.java
index 2149acaf66..e23eefbf2c 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/SnoozeOnNotificationDismissService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/SnoozeOnNotificationDismissService.java
@@ -1,18 +1,15 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 import android.app.IntentService;
 import android.content.Intent;
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
-import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.SnoozeActivity;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.UserNotification;
-import com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
 
 /**
  * An {@link IntentService} subclass for handling asynchronous task requests in
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/SyncService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/SyncService.java
similarity index 73%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/SyncService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/SyncService.java
index 8e5649c1aa..a829d986c3 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/SyncService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/SyncService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 // stub placeholder
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/TransmitterRawData.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/TransmitterRawData.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/TransmitterRawData.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/TransmitterRawData.java
index e3d41fd85e..7b6cda058e 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/TransmitterRawData.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/TransmitterRawData.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 import java.util.Date;
 //import com.mongodb.BasicDBObject;
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/WifiCollectionService.java b/wear/src/main/java/com/eveningoutpost/dexdrip/services/WifiCollectionService.java
similarity index 76%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Services/WifiCollectionService.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/services/WifiCollectionService.java
index b8be93c4dd..a7b5f051aa 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Services/WifiCollectionService.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/services/WifiCollectionService.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Services;
+package com.eveningoutpost.dexdrip.services;
 
 /**
  * Created by jamorham on 10/10/2017.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareUploadableBg.java b/wear/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareUploadableBg.java
similarity index 89%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareUploadableBg.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareUploadableBg.java
index 222f742b35..489432cace 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareUploadableBg.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/sharemodels/ShareUploadableBg.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.ShareModels;
+package com.eveningoutpost.dexdrip.sharemodels;
 
 /**
  * Created by Emma Black on 8/10/15.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/stats/StatsResult.java b/wear/src/main/java/com/eveningoutpost/dexdrip/stats/StatsResult.java
index c8630f4f9a..43b59d5664 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/stats/StatsResult.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/stats/StatsResult.java
@@ -1,13 +1,11 @@
 package com.eveningoutpost.dexdrip.stats;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.preference.PreferenceManager;
 
 import com.activeandroid.Cache;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 
 import java.text.DecimalFormat;
 import java.util.Calendar;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/BgReadingTable.java b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/BgReadingTable.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Tables/BgReadingTable.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/tables/BgReadingTable.java
index 7c1743da8d..77edde7a9d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/BgReadingTable.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/BgReadingTable.java
@@ -1,12 +1,9 @@
-package com.eveningoutpost.dexdrip.Tables;
+package com.eveningoutpost.dexdrip.tables;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.app.ListActivity;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.widget.DrawerLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,10 +12,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.BgReading;
 //import com.eveningoutpost.dexdrip.NavigationDrawerFragment;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/BloodTestTable.java b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/BloodTestTable.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Tables/BloodTestTable.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/tables/BloodTestTable.java
index 641f8c62b3..83e38f8612 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/BloodTestTable.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/BloodTestTable.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Tables;
+package com.eveningoutpost.dexdrip.tables;
 
 import android.app.ListActivity;
 import android.content.Context;
@@ -12,9 +12,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.BloodTest;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BloodTest;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/CalibrationDataTable.java b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/CalibrationDataTable.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Tables/CalibrationDataTable.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/tables/CalibrationDataTable.java
index 73958fc31d..85ec4dd5ba 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/CalibrationDataTable.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/CalibrationDataTable.java
@@ -1,9 +1,7 @@
-package com.eveningoutpost.dexdrip.Tables;
+package com.eveningoutpost.dexdrip.tables;
 
-import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -13,10 +11,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.UtilityModels.BgGraphBuilder;
+import com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.ArrayList;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/SensorDataTable.java b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/SensorDataTable.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Tables/SensorDataTable.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/tables/SensorDataTable.java
index 85512b5fd7..77d5615e12 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/SensorDataTable.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/SensorDataTable.java
@@ -1,9 +1,8 @@
-package com.eveningoutpost.dexdrip.Tables;
+package com.eveningoutpost.dexdrip.tables;
 
 import android.app.ListActivity;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.v4.widget.DrawerLayout;
 import android.view.View;
 import android.widget.SimpleCursorAdapter;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/TreatmentsTable.java b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/TreatmentsTable.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/Tables/TreatmentsTable.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/tables/TreatmentsTable.java
index b31b80f5a5..b40d644b6c 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/Tables/TreatmentsTable.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/tables/TreatmentsTable.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.Tables;
+package com.eveningoutpost.dexdrip.tables;
 
 import android.app.ListActivity;
 import android.content.Context;
@@ -12,9 +12,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Treatments;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Treatments;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/AlertPlayer.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/AlertPlayer.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
index 58db6b96c2..2cc8f5b75f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/AlertPlayer.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -16,13 +16,13 @@
 
 import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.ListenerService;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.SnoozeOnNotificationDismissService;
+import com.eveningoutpost.dexdrip.services.SnoozeOnNotificationDismissService;
 import com.eveningoutpost.dexdrip.SnoozeActivity;
 
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import java.util.Date;
 
 import static com.eveningoutpost.dexdrip.ListenerService.SendData;
-import static com.eveningoutpost.dexdrip.UtilityModels.AlertPlayer.getAlertPlayerStreamType;
+import static com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer.getAlertPlayerStreamType;
 
 //KS import com.eveningoutpost.dexdrip.EditAlertActivity;
 //KS import com.eveningoutpost.dexdrip.GcmActivity;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
similarity index 99%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
index 1627d3f510..496937989b 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -10,9 +10,9 @@
 import android.widget.Toast;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -34,7 +34,7 @@
 import lecho.lib.hellocharts.model.Viewport;
 import lecho.lib.hellocharts.util.ChartUtils;
 import lecho.lib.hellocharts.view.Chart;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.xdrip;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSendQueue.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSendQueue.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSendQueue.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSendQueue.java
index 53d92fa34d..f9cc066ece 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSendQueue.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSendQueue.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 import android.content.Intent;
@@ -17,13 +17,13 @@
 import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.ListenerService;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.HeartRate;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.PebbleMovement;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Services.CustomComplicationProviderService;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.HeartRate;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.PebbleMovement;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.services.CustomComplicationProviderService;
 import com.eveningoutpost.dexdrip.stats.StatsResult;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.android.gms.wearable.DataMap;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSparklineBuilder.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSparklineBuilder.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSparklineBuilder.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSparklineBuilder.java
index ac922564ac..02c20a4f4f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgSparklineBuilder.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgSparklineBuilder.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -8,8 +8,8 @@
 import android.util.DisplayMetrics;
 import android.view.View;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Blukon.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Blukon.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Blukon.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Blukon.java
index 03466488af..42c328c665 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Blukon.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Blukon.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -7,19 +7,19 @@
 import android.view.WindowManager;
 import android.widget.EditText;
 
-import com.eveningoutpost.dexdrip.ImportedLibraries.usbserial.util.HexDump;
-import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
-import com.eveningoutpost.dexdrip.Models.TransmitterData;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.importedlibraries.usbserial.util.HexDump;
+import com.eveningoutpost.dexdrip.models.ActiveBluetoothDevice;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.TransmitterData;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.NFCReaderX;
 import com.eveningoutpost.dexdrip.R;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
 import com.eveningoutpost.dexdrip.utils.CheckBridgeBattery;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.xdrip;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeResponse.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeResponse.java
similarity index 91%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeResponse.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeResponse.java
index b2ef1a13e8..41694a0a67 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BridgeResponse.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BridgeResponse.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastGlucose.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastGlucose.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
index bf688d2af1..33d5fc729d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BroadcastGlucose.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
@@ -1,14 +1,14 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Intent;
 import android.os.Bundle;
 
 import com.eveningoutpost.dexdrip.BestGlucose;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Noise;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Noise;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CalibrationSendQueue.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CalibrationSendQueue.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CalibrationSendQueue.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CalibrationSendQueue.java
index 6b961b0fdc..3a4319dd6c 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CalibrationSendQueue.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CalibrationSendQueue.java
@@ -1,8 +1,6 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 
 import com.activeandroid.Model;
@@ -10,7 +8,7 @@
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Models.Calibration;
+import com.eveningoutpost.dexdrip.models.Calibration;
 
 import java.util.List;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CollectionServiceStarter.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CollectionServiceStarter.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CollectionServiceStarter.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CollectionServiceStarter.java
index 729a35269e..01b60f0cf9 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CollectionServiceStarter.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CollectionServiceStarter.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 //KS import android.app.AlarmManager;
 //KS import android.app.PendingIntent;
@@ -8,18 +8,17 @@
 import android.os.Environment;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 //KS import com.eveningoutpost.dexdrip.Services.DailyIntentService;
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.DexShareCollectionService;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.DexShareCollectionService;
 //KS import com.eveningoutpost.dexdrip.Services.DoNothingService;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
 //KS import com.eveningoutpost.dexdrip.Services.SyncService;
 //KS import com.eveningoutpost.dexdrip.Services.WifiCollectionService;
 //KS import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleUtil;
 //KS import com.eveningoutpost.dexdrip.UtilityModels.pebble.PebbleWatchSync;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 //KS import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
 import com.eveningoutpost.dexdrip.xdrip;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CompatibleApps.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CompatibleApps.java
similarity index 72%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CompatibleApps.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CompatibleApps.java
index 15a7fc747d..b1c802f05b 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/CompatibleApps.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/CompatibleApps.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 public class CompatibleApps {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Constants.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Constants.java
index 9a3fc07507..0fdd43e8f2 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Constants.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * Various constants
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/DexShareAttributes.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/DexShareAttributes.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/DexShareAttributes.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/DexShareAttributes.java
index 643e6742fe..237187ceb7 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/DexShareAttributes.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/DexShareAttributes.java
@@ -1,6 +1,5 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import java.math.BigInteger;
 import java.util.UUID;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ForegroundServiceStarter.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ForegroundServiceStarter.java
similarity index 91%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ForegroundServiceStarter.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ForegroundServiceStarter.java
index f03ab6b376..89240fe602 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/ForegroundServiceStarter.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/ForegroundServiceStarter.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/HM10Attributes.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/HM10Attributes.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/HM10Attributes.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/HM10Attributes.java
index 2d49769263..e248484eea 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/HM10Attributes.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/HM10Attributes.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * Created by Emma Black on 10/26/14.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Inevitable.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Inevitable.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Inevitable.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Inevitable.java
index 686ef62949..a6d983487f 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Inevitable.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Inevitable.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Intents.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Intents.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Intents.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Intents.java
index cc352c9ec2..b427ef0df6 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Intents.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Intents.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * For integration.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LibreUtils.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LibreUtils.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LibreUtils.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LibreUtils.java
index 1c2eb87bc8..0f0a1532ff 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LibreUtils.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LibreUtils.java
@@ -1,7 +1,7 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.SensorSanity;
+import com.eveningoutpost.dexdrip.models.SensorSanity;
 
 import android.util.Log;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LowPriorityThread.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LowPriorityThread.java
similarity index 85%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LowPriorityThread.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LowPriorityThread.java
index 27dfb7649e..7cccf61e87 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/LowPriorityThread.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/LowPriorityThread.java
@@ -1,8 +1,8 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 // jamorham
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigure.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigure.java
similarity index 76%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigure.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigure.java
index 862dbbe2bd..0170a9823c 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/MtpConfigure.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/MtpConfigure.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.Build;
 import android.support.annotation.RequiresApi;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NanoStatus.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NanoStatus.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NanoStatus.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NanoStatus.java
index 074eea412e..963138738e 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NanoStatus.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NanoStatus.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 /**
  * NanoStatus allows access to a static class based status interface
@@ -19,7 +19,7 @@
 import com.eveningoutpost.dexdrip.BuildConfig;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NotificationChannels.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NotificationChannels.java
similarity index 79%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NotificationChannels.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NotificationChannels.java
index 54369b91f0..6e80763efd 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NotificationChannels.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NotificationChannels.java
@@ -1,7 +1,7 @@
 
 // stub class just to satisfy unified source trees while wear is not on sdk 26+
 
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 public class NotificationChannels {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Notifications.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java
similarity index 98%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Notifications.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java
index 962754a0be..530f280ebf 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Notifications.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.annotation.TargetApi;
 import android.app.AlarmManager;
@@ -27,19 +27,19 @@
 //KS import com.eveningoutpost.dexdrip.DoubleCalibrationActivity;
 //KS import com.eveningoutpost.dexdrip.EditAlertActivity;
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.ActiveBgAlert;
-import com.eveningoutpost.dexdrip.Models.AlertType;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.Calibration;
-import com.eveningoutpost.dexdrip.Models.CalibrationRequest;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
-import com.eveningoutpost.dexdrip.Models.UserNotification;
+import com.eveningoutpost.dexdrip.models.ActiveBgAlert;
+import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.Calibration;
+import com.eveningoutpost.dexdrip.models.CalibrationRequest;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.UserNotification;
 import com.eveningoutpost.dexdrip.R;
 //KS import com.eveningoutpost.dexdrip.Services.ActivityRecognizedService;
-import com.eveningoutpost.dexdrip.Services.MissedReadingService;
-import com.eveningoutpost.dexdrip.Services.SnoozeOnNotificationDismissService;
+import com.eveningoutpost.dexdrip.services.MissedReadingService;
+import com.eveningoutpost.dexdrip.services.SnoozeOnNotificationDismissService;
 import com.eveningoutpost.dexdrip.evaluators.PersistentHigh;
 import com.eveningoutpost.dexdrip.utils.PowerStateReceiver;
 import com.eveningoutpost.dexdrip.xdrip;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PersistentStore.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PersistentStore.java
similarity index 97%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PersistentStore.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PersistentStore.java
index 93dfc15cb1..8535e0758c 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PersistentStore.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PersistentStore.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.google.common.primitives.Bytes;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PlusAsyncExecutor.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PlusAsyncExecutor.java
similarity index 96%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PlusAsyncExecutor.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PlusAsyncExecutor.java
index 97b8a09e1c..cd1616e6c1 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/PlusAsyncExecutor.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PlusAsyncExecutor.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.os.PowerManager;
 import android.support.annotation.NonNull;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError.Log;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import java.util.ArrayDeque;
 import java.util.HashMap;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Pref.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Pref.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Pref.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Pref.java
index 9046233904..16bf22212f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Pref.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Pref.java
@@ -1,10 +1,10 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
 /**
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RxBleProvider.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RxBleProvider.java
similarity index 89%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RxBleProvider.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RxBleProvider.java
index df188ebb7b..b2facbfedf 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/RxBleProvider.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/RxBleProvider.java
@@ -1,10 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
 // TODO check this reference handling
 
-import com.eveningoutpost.dexdrip.Models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.polidea.rxandroidble2.RxBleClient;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendXdripBroadcast.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendXdripBroadcast.java
similarity index 95%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendXdripBroadcast.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendXdripBroadcast.java
index eb3fa355c3..b9abf43d64 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SendXdripBroadcast.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SendXdripBroadcast.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorSendQueue.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorSendQueue.java
similarity index 92%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorSendQueue.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorSendQueue.java
index d855d6d1eb..a6a6aa333d 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/SensorSendQueue.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SensorSendQueue.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.provider.BaseColumns;
 
@@ -6,7 +6,7 @@
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
 import com.activeandroid.query.Select;
-import com.eveningoutpost.dexdrip.Models.Sensor;
+import com.eveningoutpost.dexdrip.models.Sensor;
 
 import java.util.List;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusItem.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusItem.java
similarity index 86%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusItem.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusItem.java
index 745b0ae6e4..8441ea9796 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusItem.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/StatusItem.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import android.graphics.Color;
 import android.support.annotation.ColorInt;
@@ -7,11 +7,11 @@
 
 import java.util.HashMap;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.BAD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.CRITICAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.GOOD;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NORMAL;
-import static com.eveningoutpost.dexdrip.UtilityModels.StatusItem.Highlight.NOTICE;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.BAD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.CRITICAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.GOOD;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NORMAL;
+import static com.eveningoutpost.dexdrip.utilitymodels.StatusItem.Highlight.NOTICE;
 
 /**
  * Created by jamorham on 14/01/2017.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Unitized.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Unitized.java
similarity index 97%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Unitized.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Unitized.java
index 84e1bfabd9..4276fc7345 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Unitized.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Unitized.java
@@ -1,9 +1,8 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
-import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.BgReading;
+import com.eveningoutpost.dexdrip.models.BgReading;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderQueue.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderQueue.java
similarity index 63%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderQueue.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderQueue.java
index 603a3c3af2..6d67edbb55 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/UploaderQueue.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UploaderQueue.java
@@ -1,9 +1,9 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // stub placeholder
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
 
 public class UploaderQueue {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VersionTracker.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VersionTracker.java
similarity index 93%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VersionTracker.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VersionTracker.java
index bfe03b0e8f..5174abcfc2 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VersionTracker.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/VersionTracker.java
@@ -1,11 +1,11 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.dateTimeText;
+import static com.eveningoutpost.dexdrip.models.JoH.dateTimeText;
 
 /**
  * jamorham
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncBooleans.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncBooleans.java
similarity index 96%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncBooleans.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncBooleans.java
index bffba51a08..10b84b0855 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncBooleans.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncBooleans.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncPersistentStrings.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncPersistentStrings.java
similarity index 77%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncPersistentStrings.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncPersistentStrings.java
index f8534adf35..72f0be8ef1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WearSyncPersistentStrings.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WearSyncPersistentStrings.java
@@ -1,6 +1,6 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
-import com.eveningoutpost.dexdrip.G5Model.G6CalibrationParameters;
+import com.eveningoutpost.dexdrip.g5model.G6CalibrationParameters;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WholeHouse.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WholeHouse.java
similarity index 84%
rename from wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WholeHouse.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WholeHouse.java
index e298f6d062..856320f8c5 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/WholeHouse.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/WholeHouse.java
@@ -1,4 +1,4 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 // jamorham
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XbridgePlus.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XbridgePlus.java
similarity index 94%
rename from app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XbridgePlus.java
rename to wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XbridgePlus.java
index a3febb5183..dc039fbbfb 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/XbridgePlus.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/XbridgePlus.java
@@ -1,12 +1,12 @@
-package com.eveningoutpost.dexdrip.UtilityModels;
+package com.eveningoutpost.dexdrip.utilitymodels;
 
 
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.UtilityModels.Constants.LIBRE_MULTIPLIER;
+import static com.eveningoutpost.dexdrip.utilitymodels.Constants.LIBRE_MULTIPLIER;
 
 /**
  * Created by jamorham on 27/03/2017.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/CheckBridgeBattery.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/CheckBridgeBattery.java
index 3636003b63..28f97d2c2b 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/CheckBridgeBattery.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/CheckBridgeBattery.java
@@ -7,13 +7,13 @@
 import android.os.BatteryManager;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.xdrip;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.cancelNotification;
-import static com.eveningoutpost.dexdrip.Models.JoH.showNotification;
+import static com.eveningoutpost.dexdrip.models.JoH.cancelNotification;
+import static com.eveningoutpost.dexdrip.models.JoH.showNotification;
 
 /**
  * Created by jamorham on 26/01/2017.
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/CipherUtils.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/CipherUtils.java
index d8e0f88418..f1b3b17c43 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/CipherUtils.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/CipherUtils.java
@@ -8,7 +8,7 @@
 import android.util.Log;
 
 //KS import com.eveningoutpost.dexdrip.GoogleDriveInterface;
-import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.models.JoH;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
index 4164737318..bfe55e5f2b 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
@@ -1,12 +1,12 @@
 package com.eveningoutpost.dexdrip.utils;
 
-import com.eveningoutpost.dexdrip.Services.DexCollectionService;
-import com.eveningoutpost.dexdrip.Services.DexShareCollectionService;
-import com.eveningoutpost.dexdrip.Services.DoNothingService;
-import com.eveningoutpost.dexdrip.Services.G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.Services.WifiCollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.services.DexCollectionService;
+import com.eveningoutpost.dexdrip.services.DexShareCollectionService;
+import com.eveningoutpost.dexdrip.services.DoNothingService;
+import com.eveningoutpost.dexdrip.services.G5CollectionService;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.services.WifiCollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.cgm.medtrum.MedtrumCollectionService;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.NightscoutFollowService;
 import com.eveningoutpost.dexdrip.cgm.sharefollow.ShareFollowService;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/DisconnectReceiver.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/DisconnectReceiver.java
index bb1766db0e..2fa4ebb677 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/DisconnectReceiver.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/DisconnectReceiver.java
@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/FileUtils.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/FileUtils.java
index e534070ee0..42bbc35c33 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/FileUtils.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/FileUtils.java
@@ -10,7 +10,7 @@
 import java.util.Date;
 
 import com.eveningoutpost.dexdrip.xdrip;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 public class FileUtils {
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/SqliteRejigger.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/SqliteRejigger.java
index 68452d7ab7..a816399acb 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/SqliteRejigger.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/SqliteRejigger.java
@@ -7,7 +7,7 @@
 import android.database.sqlite.SQLiteDatabase;
 
 import com.activeandroid.Cache;
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import lombok.NonNull;
 
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/VersionFixer.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/VersionFixer.java
index 3e350e3d8f..99b492d367 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/VersionFixer.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/VersionFixer.java
@@ -14,10 +14,10 @@
 import com.eveningoutpost.dexdrip.BuildConfig;
 import com.eveningoutpost.dexdrip.DemiGod;
 import com.eveningoutpost.dexdrip.ListenerService;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.io.File;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/HandleBleScanException.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/HandleBleScanException.java
index 990988c084..756c939927 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/HandleBleScanException.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/HandleBleScanException.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.utils.bt;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import java.util.Date;
 import java.util.Locale;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Mimeograph.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Mimeograph.java
index 085173fdba..fba2b77ab2 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Mimeograph.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Mimeograph.java
@@ -1,11 +1,11 @@
 package com.eveningoutpost.dexdrip.utils.bt;
 
 import com.eveningoutpost.dexdrip.GcmActivity;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.WholeHouse;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.WholeHouse;
 import com.eveningoutpost.dexdrip.utils.CipherUtils;
 import com.eveningoutpost.dexdrip.utils.Root;
 import com.eveningoutpost.dexdrip.xdrip;
@@ -22,7 +22,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 import static com.eveningoutpost.dexdrip.utils.bt.Mimeograph.SearchState.COPY_COLLISION_KEY;
 import static com.eveningoutpost.dexdrip.utils.bt.Mimeograph.SearchState.COPY_DEVICE_KEY;
 import static com.eveningoutpost.dexdrip.utils.bt.Mimeograph.SearchState.COPY_SCAN;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ScanMeister.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ScanMeister.java
index 4efaa7f51a..489fb7d7dd 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ScanMeister.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/ScanMeister.java
@@ -5,11 +5,11 @@
 import android.os.ParcelUuid;
 import android.os.PowerManager;
 
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.Constants;
-import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
-import com.eveningoutpost.dexdrip.UtilityModels.RxBleProvider;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.Constants;
+import com.eveningoutpost.dexdrip.utilitymodels.Inevitable;
+import com.eveningoutpost.dexdrip.utilitymodels.RxBleProvider;
 import com.eveningoutpost.dexdrip.utils.BtCallBack;
 import com.eveningoutpost.dexdrip.xdrip;
 import com.polidea.rxandroidble2.RxBleClient;
@@ -28,7 +28,7 @@
 import io.reactivex.schedulers.Schedulers;
 import lombok.NoArgsConstructor;
 
-import static com.eveningoutpost.dexdrip.Models.JoH.ratelimit;
+import static com.eveningoutpost.dexdrip.models.JoH.ratelimit;
 
 
 // jamorham
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Subscription.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Subscription.java
index 467ce8effd..fc25411132 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Subscription.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/bt/Subscription.java
@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.utils.bt;
 
-import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.models.UserError;
 
 import io.reactivex.disposables.Disposable;
 import io.reactivex.plugins.RxJavaPlugins;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/framework/WakeLockTrampoline.java b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/framework/WakeLockTrampoline.java
index 3dd5565233..fea5f5e366 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/utils/framework/WakeLockTrampoline.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/utils/framework/WakeLockTrampoline.java
@@ -9,9 +9,9 @@
 import android.util.SparseArray;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.eveningoutpost.dexdrip.UtilityModels.ForegroundServiceStarter;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.utilitymodels.ForegroundServiceStarter;
 import com.eveningoutpost.dexdrip.xdrip;
 
 import java.util.HashMap;
diff --git a/wear/src/main/java/com/eveningoutpost/dexdrip/xdrip.java b/wear/src/main/java/com/eveningoutpost/dexdrip/xdrip.java
index 89a9847eac..0e3fdcef6e 100644
--- a/wear/src/main/java/com/eveningoutpost/dexdrip/xdrip.java
+++ b/wear/src/main/java/com/eveningoutpost/dexdrip/xdrip.java
@@ -11,13 +11,13 @@
 import com.activeandroid.ActiveAndroid;
 import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.core.CrashlyticsCore;
-import com.eveningoutpost.dexdrip.Models.BgReading;
-import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.LibreBlock;
-import com.eveningoutpost.dexdrip.Models.LibreData;
-import com.eveningoutpost.dexdrip.Models.Sensor;
-import com.eveningoutpost.dexdrip.UtilityModels.PlusAsyncExecutor;
-import com.eveningoutpost.dexdrip.UtilityModels.VersionTracker;
+import com.eveningoutpost.dexdrip.models.BgReading;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.LibreBlock;
+import com.eveningoutpost.dexdrip.models.LibreData;
+import com.eveningoutpost.dexdrip.models.Sensor;
+import com.eveningoutpost.dexdrip.utilitymodels.PlusAsyncExecutor;
+import com.eveningoutpost.dexdrip.utilitymodels.VersionTracker;
 
 import io.fabric.sdk.android.Fabric;
 
diff --git a/wear/src/test/java/com/eveningoutpost/dexdrip/Models/UserNotificationTest.java b/wear/src/test/java/com/eveningoutpost/dexdrip/models/UserNotificationTest.java
similarity index 98%
rename from wear/src/test/java/com/eveningoutpost/dexdrip/Models/UserNotificationTest.java
rename to wear/src/test/java/com/eveningoutpost/dexdrip/models/UserNotificationTest.java
index ef2a1970b6..3f7893bdef 100644
--- a/wear/src/test/java/com/eveningoutpost/dexdrip/Models/UserNotificationTest.java
+++ b/wear/src/test/java/com/eveningoutpost/dexdrip/models/UserNotificationTest.java
@@ -1,9 +1,8 @@
-package com.eveningoutpost.dexdrip.Models;
+package com.eveningoutpost.dexdrip.models;
 
 import com.activeandroid.query.Delete;
 import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
-import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
-import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
 
 import org.junit.After;
 import org.junit.Test;