diff --git a/Steampunk_graphics_source_link.md b/_docs/Steampunk_graphics_source_link.md similarity index 100% rename from Steampunk_graphics_source_link.md rename to _docs/Steampunk_graphics_source_link.md diff --git a/demo_keystore.jks b/_docs/demo_keystore.jks similarity index 100% rename from demo_keystore.jks rename to _docs/demo_keystore.jks diff --git a/gource/sample.bat b/_docs/gource/sample.bat similarity index 100% rename from gource/sample.bat rename to _docs/gource/sample.bat diff --git a/icons/action_add.svg b/_docs/icons/action_add.svg similarity index 100% rename from icons/action_add.svg rename to _docs/icons/action_add.svg diff --git a/icons/action_minus.svg b/_docs/icons/action_minus.svg similarity index 100% rename from icons/action_minus.svg rename to _docs/icons/action_minus.svg diff --git a/icons/actions_cancelextbolus.svg b/_docs/icons/actions_cancelextbolus.svg similarity index 100% rename from icons/actions_cancelextbolus.svg rename to _docs/icons/actions_cancelextbolus.svg diff --git a/icons/actions_refill.svg b/_docs/icons/actions_refill.svg similarity index 100% rename from icons/actions_refill.svg rename to _docs/icons/actions_refill.svg diff --git a/icons/actions_startextbolus.svg b/_docs/icons/actions_startextbolus.svg similarity index 100% rename from icons/actions_startextbolus.svg rename to _docs/icons/actions_startextbolus.svg diff --git a/icons/actions_temptarget.svg b/_docs/icons/actions_temptarget.svg similarity index 100% rename from icons/actions_temptarget.svg rename to _docs/icons/actions_temptarget.svg diff --git a/icons/add.svg b/_docs/icons/add.svg similarity index 100% rename from icons/add.svg rename to _docs/icons/add.svg diff --git a/icons/as.svg b/_docs/icons/as.svg similarity index 100% rename from icons/as.svg rename to _docs/icons/as.svg diff --git a/icons/auto_delta.svg b/_docs/icons/auto_delta.svg similarity index 100% rename from icons/auto_delta.svg rename to _docs/icons/auto_delta.svg diff --git a/icons/autotune.svg b/_docs/icons/autotune.svg similarity index 100% rename from icons/autotune.svg rename to _docs/icons/autotune.svg diff --git a/icons/battery-burnin/battery-charging-wireless-10-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-10-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-10-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-10-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-20-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-20-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-20-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-20-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-30-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-30-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-30-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-30-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-40-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-40-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-40-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-40-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-50-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-50-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-50-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-50-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-60-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-60-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-60-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-60-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-70-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-70-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-70-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-70-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-80-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-80-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-80-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-80-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-90-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-90-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-90-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-90-burnin.svg diff --git a/icons/battery-burnin/battery-charging-wireless-burnin.svg b/_docs/icons/battery-burnin/battery-charging-wireless-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-charging-wireless-burnin.svg rename to _docs/icons/battery-burnin/battery-charging-wireless-burnin.svg diff --git a/icons/battery-burnin/battery-unknown-burnin.svg b/_docs/icons/battery-burnin/battery-unknown-burnin.svg similarity index 100% rename from icons/battery-burnin/battery-unknown-burnin.svg rename to _docs/icons/battery-burnin/battery-unknown-burnin.svg diff --git a/icons/battery-source/mask-burnin-battery-raw.svg b/_docs/icons/battery-source/mask-burnin-battery-raw.svg similarity index 100% rename from icons/battery-source/mask-burnin-battery-raw.svg rename to _docs/icons/battery-source/mask-burnin-battery-raw.svg diff --git a/icons/battery-source/mask-burnin-battery.svg b/_docs/icons/battery-source/mask-burnin-battery.svg similarity index 100% rename from icons/battery-source/mask-burnin-battery.svg rename to _docs/icons/battery-source/mask-burnin-battery.svg diff --git a/icons/battery/battery-charging-wireless-10.svg b/_docs/icons/battery/battery-charging-wireless-10.svg similarity index 100% rename from icons/battery/battery-charging-wireless-10.svg rename to _docs/icons/battery/battery-charging-wireless-10.svg diff --git a/icons/battery/battery-charging-wireless-20.svg b/_docs/icons/battery/battery-charging-wireless-20.svg similarity index 100% rename from icons/battery/battery-charging-wireless-20.svg rename to _docs/icons/battery/battery-charging-wireless-20.svg diff --git a/icons/battery/battery-charging-wireless-30.svg b/_docs/icons/battery/battery-charging-wireless-30.svg similarity index 100% rename from icons/battery/battery-charging-wireless-30.svg rename to _docs/icons/battery/battery-charging-wireless-30.svg diff --git a/icons/battery/battery-charging-wireless-40.svg b/_docs/icons/battery/battery-charging-wireless-40.svg similarity index 100% rename from icons/battery/battery-charging-wireless-40.svg rename to _docs/icons/battery/battery-charging-wireless-40.svg diff --git a/icons/battery/battery-charging-wireless-50.svg b/_docs/icons/battery/battery-charging-wireless-50.svg similarity index 100% rename from icons/battery/battery-charging-wireless-50.svg rename to _docs/icons/battery/battery-charging-wireless-50.svg diff --git a/icons/battery/battery-charging-wireless-60.svg b/_docs/icons/battery/battery-charging-wireless-60.svg similarity index 100% rename from icons/battery/battery-charging-wireless-60.svg rename to _docs/icons/battery/battery-charging-wireless-60.svg diff --git a/icons/battery/battery-charging-wireless-70.svg b/_docs/icons/battery/battery-charging-wireless-70.svg similarity index 100% rename from icons/battery/battery-charging-wireless-70.svg rename to _docs/icons/battery/battery-charging-wireless-70.svg diff --git a/icons/battery/battery-charging-wireless-80.svg b/_docs/icons/battery/battery-charging-wireless-80.svg similarity index 100% rename from icons/battery/battery-charging-wireless-80.svg rename to _docs/icons/battery/battery-charging-wireless-80.svg diff --git a/icons/battery/battery-charging-wireless-90.svg b/_docs/icons/battery/battery-charging-wireless-90.svg similarity index 100% rename from icons/battery/battery-charging-wireless-90.svg rename to _docs/icons/battery/battery-charging-wireless-90.svg diff --git a/icons/battery/battery-charging-wireless.svg b/_docs/icons/battery/battery-charging-wireless.svg similarity index 100% rename from icons/battery/battery-charging-wireless.svg rename to _docs/icons/battery/battery-charging-wireless.svg diff --git a/icons/battery/battery-outline.svg b/_docs/icons/battery/battery-outline.svg similarity index 100% rename from icons/battery/battery-outline.svg rename to _docs/icons/battery/battery-outline.svg diff --git a/icons/battery/battery-unknown.svg b/_docs/icons/battery/battery-unknown.svg similarity index 100% rename from icons/battery/battery-unknown.svg rename to _docs/icons/battery/battery-unknown.svg diff --git a/icons/bolus.svg b/_docs/icons/bolus.svg similarity index 100% rename from icons/bolus.svg rename to _docs/icons/bolus.svg diff --git a/icons/byoda.svg b/_docs/icons/byoda.svg similarity index 100% rename from icons/byoda.svg rename to _docs/icons/byoda.svg diff --git a/icons/calculator.svg b/_docs/icons/calculator.svg similarity index 100% rename from icons/calculator.svg rename to _docs/icons/calculator.svg diff --git a/icons/calibration.svg b/_docs/icons/calibration.svg similarity index 100% rename from icons/calibration.svg rename to _docs/icons/calibration.svg diff --git a/icons/cancel.svg b/_docs/icons/cancel.svg similarity index 100% rename from icons/cancel.svg rename to _docs/icons/cancel.svg diff --git a/icons/clone.svg b/_docs/icons/clone.svg similarity index 100% rename from icons/clone.svg rename to _docs/icons/clone.svg diff --git a/icons/clone_48.svg b/_docs/icons/clone_48.svg similarity index 100% rename from icons/clone_48.svg rename to _docs/icons/clone_48.svg diff --git a/icons/combo.svg b/_docs/icons/combo.svg similarity index 100% rename from icons/combo.svg rename to _docs/icons/combo.svg diff --git a/icons/compare_profiles.svg b/_docs/icons/compare_profiles.svg similarity index 100% rename from icons/compare_profiles.svg rename to _docs/icons/compare_profiles.svg diff --git a/icons/complications-source/ic_br_cob_iob_orig.svg b/_docs/icons/complications-source/ic_br_cob_iob_orig.svg similarity index 100% rename from icons/complications-source/ic_br_cob_iob_orig.svg rename to _docs/icons/complications-source/ic_br_cob_iob_orig.svg diff --git a/icons/complications-source/ic_cob_detailed_orig.svg b/_docs/icons/complications-source/ic_cob_detailed_orig.svg similarity index 100% rename from icons/complications-source/ic_cob_detailed_orig.svg rename to _docs/icons/complications-source/ic_cob_detailed_orig.svg diff --git a/icons/complications-source/ic_cob_iob_orig.svg b/_docs/icons/complications-source/ic_cob_iob_orig.svg similarity index 100% rename from icons/complications-source/ic_cob_iob_orig.svg rename to _docs/icons/complications-source/ic_cob_iob_orig.svg diff --git a/icons/complications-source/ic_ins_burnin_orig.svg b/_docs/icons/complications-source/ic_ins_burnin_orig.svg similarity index 100% rename from icons/complications-source/ic_ins_burnin_orig.svg rename to _docs/icons/complications-source/ic_ins_burnin_orig.svg diff --git a/icons/complications-source/ic_ins_orig.svg b/_docs/icons/complications-source/ic_ins_orig.svg similarity index 100% rename from icons/complications-source/ic_ins_orig.svg rename to _docs/icons/complications-source/ic_ins_orig.svg diff --git a/icons/complications-source/ic_iob_detailed_orig.svg b/_docs/icons/complications-source/ic_iob_detailed_orig.svg similarity index 100% rename from icons/complications-source/ic_iob_detailed_orig.svg rename to _docs/icons/complications-source/ic_iob_detailed_orig.svg diff --git a/icons/complications/ic_aaps_full.svg b/_docs/icons/complications/ic_aaps_full.svg similarity index 100% rename from icons/complications/ic_aaps_full.svg rename to _docs/icons/complications/ic_aaps_full.svg diff --git a/icons/complications/ic_basal.svg b/_docs/icons/complications/ic_basal.svg similarity index 100% rename from icons/complications/ic_basal.svg rename to _docs/icons/complications/ic_basal.svg diff --git a/icons/complications/ic_br_cob_iob.svg b/_docs/icons/complications/ic_br_cob_iob.svg similarity index 100% rename from icons/complications/ic_br_cob_iob.svg rename to _docs/icons/complications/ic_br_cob_iob.svg diff --git a/icons/complications/ic_carbs.svg b/_docs/icons/complications/ic_carbs.svg similarity index 100% rename from icons/complications/ic_carbs.svg rename to _docs/icons/complications/ic_carbs.svg diff --git a/icons/complications/ic_cob_detailed.svg b/_docs/icons/complications/ic_cob_detailed.svg similarity index 100% rename from icons/complications/ic_cob_detailed.svg rename to _docs/icons/complications/ic_cob_detailed.svg diff --git a/icons/complications/ic_cob_iob.svg b/_docs/icons/complications/ic_cob_iob.svg similarity index 100% rename from icons/complications/ic_cob_iob.svg rename to _docs/icons/complications/ic_cob_iob.svg diff --git a/icons/complications/ic_ins.svg b/_docs/icons/complications/ic_ins.svg similarity index 100% rename from icons/complications/ic_ins.svg rename to _docs/icons/complications/ic_ins.svg diff --git a/icons/complications/ic_ins_burnin.svg b/_docs/icons/complications/ic_ins_burnin.svg similarity index 100% rename from icons/complications/ic_ins_burnin.svg rename to _docs/icons/complications/ic_ins_burnin.svg diff --git a/icons/complications/ic_iob_detailed.svg b/_docs/icons/complications/ic_iob_detailed.svg similarity index 100% rename from icons/complications/ic_iob_detailed.svg rename to _docs/icons/complications/ic_iob_detailed.svg diff --git a/icons/complications/ic_sgv.svg b/_docs/icons/complications/ic_sgv.svg similarity index 100% rename from icons/complications/ic_sgv.svg rename to _docs/icons/complications/ic_sgv.svg diff --git a/icons/confirm.svg b/_docs/icons/confirm.svg similarity index 100% rename from icons/confirm.svg rename to _docs/icons/confirm.svg diff --git a/icons/cp_aaps_offline.svg b/_docs/icons/cp_aaps_offline.svg similarity index 100% rename from icons/cp_aaps_offline.svg rename to _docs/icons/cp_aaps_offline.svg diff --git a/icons/cp_age_batterie.svg b/_docs/icons/cp_age_batterie.svg similarity index 100% rename from icons/cp_age_batterie.svg rename to _docs/icons/cp_age_batterie.svg diff --git a/icons/cp_age_canula.svg b/_docs/icons/cp_age_canula.svg similarity index 100% rename from icons/cp_age_canula.svg rename to _docs/icons/cp_age_canula.svg diff --git a/icons/cp_age_insulin.svg b/_docs/icons/cp_age_insulin.svg similarity index 100% rename from icons/cp_age_insulin.svg rename to _docs/icons/cp_age_insulin.svg diff --git a/icons/cp_age_sensor.svg b/_docs/icons/cp_age_sensor.svg similarity index 100% rename from icons/cp_age_sensor.svg rename to _docs/icons/cp_age_sensor.svg diff --git a/icons/cp_announcement.svg b/_docs/icons/cp_announcement.svg similarity index 100% rename from icons/cp_announcement.svg rename to _docs/icons/cp_announcement.svg diff --git a/icons/cp_basal_end.svg b/_docs/icons/cp_basal_end.svg similarity index 100% rename from icons/cp_basal_end.svg rename to _docs/icons/cp_basal_end.svg diff --git a/icons/cp_basal_no_tbr.svg b/_docs/icons/cp_basal_no_tbr.svg similarity index 100% rename from icons/cp_basal_no_tbr.svg rename to _docs/icons/cp_basal_no_tbr.svg diff --git a/icons/cp_basal_tbr_high.svg b/_docs/icons/cp_basal_tbr_high.svg similarity index 100% rename from icons/cp_basal_tbr_high.svg rename to _docs/icons/cp_basal_tbr_high.svg diff --git a/icons/cp_basal_tbr_low.svg b/_docs/icons/cp_basal_tbr_low.svg similarity index 100% rename from icons/cp_basal_tbr_low.svg rename to _docs/icons/cp_basal_tbr_low.svg diff --git a/icons/cp_bgcheck.svg b/_docs/icons/cp_bgcheck.svg similarity index 100% rename from icons/cp_bgcheck.svg rename to _docs/icons/cp_bgcheck.svg diff --git a/icons/cp_bgcheck2.svg b/_docs/icons/cp_bgcheck2.svg similarity index 100% rename from icons/cp_bgcheck2.svg rename to _docs/icons/cp_bgcheck2.svg diff --git a/icons/cp_bolus_carbs.svg b/_docs/icons/cp_bolus_carbs.svg similarity index 100% rename from icons/cp_bolus_carbs.svg rename to _docs/icons/cp_bolus_carbs.svg diff --git a/icons/cp_bolus_combo.svg b/_docs/icons/cp_bolus_combo.svg similarity index 100% rename from icons/cp_bolus_combo.svg rename to _docs/icons/cp_bolus_combo.svg diff --git a/icons/cp_bolus_correction.svg b/_docs/icons/cp_bolus_correction.svg similarity index 100% rename from icons/cp_bolus_correction.svg rename to _docs/icons/cp_bolus_correction.svg diff --git a/icons/cp_bolus_meal.svg b/_docs/icons/cp_bolus_meal.svg similarity index 100% rename from icons/cp_bolus_meal.svg rename to _docs/icons/cp_bolus_meal.svg diff --git a/icons/cp_bolus_snack.svg b/_docs/icons/cp_bolus_snack.svg similarity index 100% rename from icons/cp_bolus_snack.svg rename to _docs/icons/cp_bolus_snack.svg diff --git a/icons/cp_cgm_insert.svg b/_docs/icons/cp_cgm_insert.svg similarity index 100% rename from icons/cp_cgm_insert.svg rename to _docs/icons/cp_cgm_insert.svg diff --git a/icons/cp_cgm_profile.svg b/_docs/icons/cp_cgm_profile.svg similarity index 100% rename from icons/cp_cgm_profile.svg rename to _docs/icons/cp_cgm_profile.svg diff --git a/icons/cp_cgm_start.svg b/_docs/icons/cp_cgm_start.svg similarity index 100% rename from icons/cp_cgm_start.svg rename to _docs/icons/cp_cgm_start.svg diff --git a/icons/cp_cgm_target.svg b/_docs/icons/cp_cgm_target.svg similarity index 100% rename from icons/cp_cgm_target.svg rename to _docs/icons/cp_cgm_target.svg diff --git a/icons/cp_exercise.svg b/_docs/icons/cp_exercise.svg similarity index 100% rename from icons/cp_exercise.svg rename to _docs/icons/cp_exercise.svg diff --git a/icons/cp_note.svg b/_docs/icons/cp_note.svg similarity index 100% rename from icons/cp_note.svg rename to _docs/icons/cp_note.svg diff --git a/icons/cp_pump_battery.svg b/_docs/icons/cp_pump_battery.svg similarity index 100% rename from icons/cp_pump_battery.svg rename to _docs/icons/cp_pump_battery.svg diff --git a/icons/cp_pump_canula.svg b/_docs/icons/cp_pump_canula.svg similarity index 100% rename from icons/cp_pump_canula.svg rename to _docs/icons/cp_pump_canula.svg diff --git a/icons/cp_pump_cartridge.svg b/_docs/icons/cp_pump_cartridge.svg similarity index 100% rename from icons/cp_pump_cartridge.svg rename to _docs/icons/cp_pump_cartridge.svg diff --git a/icons/cp_question.svg b/_docs/icons/cp_question.svg similarity index 100% rename from icons/cp_question.svg rename to _docs/icons/cp_question.svg diff --git a/icons/danar_useropt.svg b/_docs/icons/danar_useropt.svg similarity index 100% rename from icons/danar_useropt.svg rename to _docs/icons/danar_useropt.svg diff --git a/icons/danarhistory.svg b/_docs/icons/danarhistory.svg similarity index 100% rename from icons/danarhistory.svg rename to _docs/icons/danarhistory.svg diff --git a/icons/danarprofile.svg b/_docs/icons/danarprofile.svg similarity index 100% rename from icons/danarprofile.svg rename to _docs/icons/danarprofile.svg diff --git a/icons/danars.svg b/_docs/icons/danars.svg similarity index 100% rename from icons/danars.svg rename to _docs/icons/danars.svg diff --git a/icons/danarstat.svg b/_docs/icons/danarstat.svg similarity index 100% rename from icons/danarstat.svg rename to _docs/icons/danarstat.svg diff --git a/icons/excel.svg b/_docs/icons/excel.svg similarity index 100% rename from icons/excel.svg rename to _docs/icons/excel.svg diff --git a/icons/export_settings.svg b/_docs/icons/export_settings.svg similarity index 100% rename from icons/export_settings.svg rename to _docs/icons/export_settings.svg diff --git a/icons/ic_DoubleDown.svg b/_docs/icons/ic_DoubleDown.svg similarity index 100% rename from icons/ic_DoubleDown.svg rename to _docs/icons/ic_DoubleDown.svg diff --git a/icons/ic_DoubleUp.svg b/_docs/icons/ic_DoubleUp.svg similarity index 100% rename from icons/ic_DoubleUp.svg rename to _docs/icons/ic_DoubleUp.svg diff --git a/icons/ic_Flat.svg b/_docs/icons/ic_Flat.svg similarity index 100% rename from icons/ic_Flat.svg rename to _docs/icons/ic_Flat.svg diff --git a/icons/ic_FortyFiveDown.svg b/_docs/icons/ic_FortyFiveDown.svg similarity index 100% rename from icons/ic_FortyFiveDown.svg rename to _docs/icons/ic_FortyFiveDown.svg diff --git a/icons/ic_FortyFiveUp.svg b/_docs/icons/ic_FortyFiveUp.svg similarity index 100% rename from icons/ic_FortyFiveUp.svg rename to _docs/icons/ic_FortyFiveUp.svg diff --git a/icons/ic_Invalid.svg b/_docs/icons/ic_Invalid.svg similarity index 100% rename from icons/ic_Invalid.svg rename to _docs/icons/ic_Invalid.svg diff --git a/icons/ic_SingleDown.svg b/_docs/icons/ic_SingleDown.svg similarity index 100% rename from icons/ic_SingleDown.svg rename to _docs/icons/ic_SingleDown.svg diff --git a/icons/ic_SingleUp.svg b/_docs/icons/ic_SingleUp.svg similarity index 100% rename from icons/ic_SingleUp.svg rename to _docs/icons/ic_SingleUp.svg diff --git a/icons/ic_error.svg b/_docs/icons/ic_error.svg similarity index 100% rename from icons/ic_error.svg rename to _docs/icons/ic_error.svg diff --git a/icons/ic_exit_to_app.svg b/_docs/icons/ic_exit_to_app.svg similarity index 100% rename from icons/ic_exit_to_app.svg rename to _docs/icons/ic_exit_to_app.svg diff --git a/icons/ic_home_loop.svg b/_docs/icons/ic_home_loop.svg similarity index 100% rename from icons/ic_home_loop.svg rename to _docs/icons/ic_home_loop.svg diff --git a/icons/ic_maintenance.svg b/_docs/icons/ic_maintenance.svg similarity index 100% rename from icons/ic_maintenance.svg rename to _docs/icons/ic_maintenance.svg diff --git a/icons/ic_notif_aaps.svg b/_docs/icons/ic_notif_aaps.svg similarity index 100% rename from icons/ic_notif_aaps.svg rename to _docs/icons/ic_notif_aaps.svg diff --git a/icons/ic_notif_nsclient.svg b/_docs/icons/ic_notif_nsclient.svg similarity index 100% rename from icons/ic_notif_nsclient.svg rename to _docs/icons/ic_notif_nsclient.svg diff --git a/icons/ic_notif_pumpcontrol.svg b/_docs/icons/ic_notif_pumpcontrol.svg similarity index 100% rename from icons/ic_notif_pumpcontrol.svg rename to _docs/icons/ic_notif_pumpcontrol.svg diff --git a/icons/ic_warning.svg b/_docs/icons/ic_warning.svg similarity index 100% rename from icons/ic_warning.svg rename to _docs/icons/ic_warning.svg diff --git a/icons/icon_snooze.svg b/_docs/icons/icon_snooze.svg similarity index 100% rename from icons/icon_snooze.svg rename to _docs/icons/icon_snooze.svg diff --git a/icons/import_settings.svg b/_docs/icons/import_settings.svg similarity index 100% rename from icons/import_settings.svg rename to _docs/icons/import_settings.svg diff --git a/icons/insight.svg b/_docs/icons/insight.svg similarity index 100% rename from icons/insight.svg rename to _docs/icons/insight.svg diff --git a/icons/insight_128.svg b/_docs/icons/insight_128.svg similarity index 100% rename from icons/insight_128.svg rename to _docs/icons/insight_128.svg diff --git a/icons/local_activate.svg b/_docs/icons/local_activate.svg similarity index 100% rename from icons/local_activate.svg rename to _docs/icons/local_activate.svg diff --git a/icons/local_reset.svg b/_docs/icons/local_reset.svg similarity index 100% rename from icons/local_reset.svg rename to _docs/icons/local_reset.svg diff --git a/icons/local_save.svg b/_docs/icons/local_save.svg similarity index 100% rename from icons/local_save.svg rename to _docs/icons/local_save.svg diff --git a/icons/log_delete.svg b/_docs/icons/log_delete.svg similarity index 100% rename from icons/log_delete.svg rename to _docs/icons/log_delete.svg diff --git a/icons/log_settings.svg b/_docs/icons/log_settings.svg similarity index 100% rename from icons/log_settings.svg rename to _docs/icons/log_settings.svg diff --git a/icons/loop.svg b/_docs/icons/loop.svg similarity index 100% rename from icons/loop.svg rename to _docs/icons/loop.svg diff --git a/icons/loop_closed.svg b/_docs/icons/loop_closed.svg similarity index 100% rename from icons/loop_closed.svg rename to _docs/icons/loop_closed.svg diff --git a/icons/loop_disabled.svg b/_docs/icons/loop_disabled.svg similarity index 100% rename from icons/loop_disabled.svg rename to _docs/icons/loop_disabled.svg diff --git a/icons/loop_disconnected.svg b/_docs/icons/loop_disconnected.svg similarity index 100% rename from icons/loop_disconnected.svg rename to _docs/icons/loop_disconnected.svg diff --git a/icons/loop_lgs.svg b/_docs/icons/loop_lgs.svg similarity index 100% rename from icons/loop_lgs.svg rename to _docs/icons/loop_lgs.svg diff --git a/icons/loop_off.svg b/_docs/icons/loop_off.svg similarity index 100% rename from icons/loop_off.svg rename to _docs/icons/loop_off.svg diff --git a/icons/loop_open.svg b/_docs/icons/loop_open.svg similarity index 100% rename from icons/loop_open.svg rename to _docs/icons/loop_open.svg diff --git a/icons/loop_paused.svg b/_docs/icons/loop_paused.svg similarity index 100% rename from icons/loop_paused.svg rename to _docs/icons/loop_paused.svg diff --git a/icons/loop_reconnect.svg b/_docs/icons/loop_reconnect.svg similarity index 100% rename from icons/loop_reconnect.svg rename to _docs/icons/loop_reconnect.svg diff --git a/icons/loop_resume.svg b/_docs/icons/loop_resume.svg similarity index 100% rename from icons/loop_resume.svg rename to _docs/icons/loop_resume.svg diff --git a/icons/loop_superbolus.svg b/_docs/icons/loop_superbolus.svg similarity index 100% rename from icons/loop_superbolus.svg rename to _docs/icons/loop_superbolus.svg diff --git a/icons/pod.svg b/_docs/icons/pod.svg similarity index 100% rename from icons/pod.svg rename to _docs/icons/pod.svg diff --git a/icons/quickwizard.svg b/_docs/icons/quickwizard.svg similarity index 100% rename from icons/quickwizard.svg rename to _docs/icons/quickwizard.svg diff --git a/icons/remove.svg b/_docs/icons/remove.svg similarity index 100% rename from icons/remove.svg rename to _docs/icons/remove.svg diff --git a/icons/reset_database.svg b/_docs/icons/reset_database.svg similarity index 100% rename from icons/reset_database.svg rename to _docs/icons/reset_database.svg diff --git a/icons/send_log.svg b/_docs/icons/send_log.svg similarity index 100% rename from icons/send_log.svg rename to _docs/icons/send_log.svg diff --git a/icons/setting_off.svg b/_docs/icons/setting_off.svg similarity index 100% rename from icons/setting_off.svg rename to _docs/icons/setting_off.svg diff --git a/icons/setting_on.svg b/_docs/icons/setting_on.svg similarity index 100% rename from icons/setting_on.svg rename to _docs/icons/setting_on.svg diff --git a/icons/target_activity.svg b/_docs/icons/target_activity.svg similarity index 100% rename from icons/target_activity.svg rename to _docs/icons/target_activity.svg diff --git a/icons/target_cancel.svg b/_docs/icons/target_cancel.svg similarity index 100% rename from icons/target_cancel.svg rename to _docs/icons/target_cancel.svg diff --git a/icons/target_eatingsoon.svg b/_docs/icons/target_eatingsoon.svg similarity index 100% rename from icons/target_eatingsoon.svg rename to _docs/icons/target_eatingsoon.svg diff --git a/icons/target_hypo.svg b/_docs/icons/target_hypo.svg similarity index 100% rename from icons/target_hypo.svg rename to _docs/icons/target_hypo.svg diff --git a/icons/target_manual.svg b/_docs/icons/target_manual.svg similarity index 100% rename from icons/target_manual.svg rename to _docs/icons/target_manual.svg diff --git a/icons/temp-basal/icon_cp_basal_100px.psd b/_docs/icons/temp-basal/icon_cp_basal_100px.psd similarity index 100% rename from icons/temp-basal/icon_cp_basal_100px.psd rename to _docs/icons/temp-basal/icon_cp_basal_100px.psd diff --git a/icons/temp-basal/icon_cp_basal_150px.psd b/_docs/icons/temp-basal/icon_cp_basal_150px.psd similarity index 100% rename from icons/temp-basal/icon_cp_basal_150px.psd rename to _docs/icons/temp-basal/icon_cp_basal_150px.psd diff --git a/icons/temp-basal/icon_cp_basal_200px.psd b/_docs/icons/temp-basal/icon_cp_basal_200px.psd similarity index 100% rename from icons/temp-basal/icon_cp_basal_200px.psd rename to _docs/icons/temp-basal/icon_cp_basal_200px.psd diff --git a/icons/temp-basal/icon_cp_basal_50px.psd b/_docs/icons/temp-basal/icon_cp_basal_50px.psd similarity index 100% rename from icons/temp-basal/icon_cp_basal_50px.psd rename to _docs/icons/temp-basal/icon_cp_basal_50px.psd diff --git a/icons/temp-basal/icon_cp_basal_75px.psd b/_docs/icons/temp-basal/icon_cp_basal_75px.psd similarity index 100% rename from icons/temp-basal/icon_cp_basal_75px.psd rename to _docs/icons/temp-basal/icon_cp_basal_75px.psd diff --git a/icons/temptarget_flat.svg b/_docs/icons/temptarget_flat.svg similarity index 100% rename from icons/temptarget_flat.svg rename to _docs/icons/temptarget_flat.svg diff --git a/icons/temptarget_high.svg b/_docs/icons/temptarget_high.svg similarity index 100% rename from icons/temptarget_high.svg rename to _docs/icons/temptarget_high.svg diff --git a/icons/temptarget_low.svg b/_docs/icons/temptarget_low.svg similarity index 100% rename from icons/temptarget_low.svg rename to _docs/icons/temptarget_low.svg diff --git a/icons/veo.svg b/_docs/icons/veo.svg similarity index 100% rename from icons/veo.svg rename to _docs/icons/veo.svg diff --git a/icons/visibility.svg b/_docs/icons/visibility.svg similarity index 100% rename from icons/visibility.svg rename to _docs/icons/visibility.svg diff --git a/icons/x_swap_vert.svg b/_docs/icons/x_swap_vert.svg similarity index 100% rename from icons/x_swap_vert.svg rename to _docs/icons/x_swap_vert.svg diff --git a/icons/xdrip.svg b/_docs/icons/xdrip.svg similarity index 100% rename from icons/xdrip.svg rename to _docs/icons/xdrip.svg diff --git a/logo/androiaps.eps b/_docs/logo/androiaps.eps similarity index 100% rename from logo/androiaps.eps rename to _docs/logo/androiaps.eps diff --git a/logo/androiaps_tshirt.pdf b/_docs/logo/androiaps_tshirt.pdf similarity index 100% rename from logo/androiaps_tshirt.pdf rename to _docs/logo/androiaps_tshirt.pdf diff --git a/logo/androidaps.ai b/_docs/logo/androidaps.ai similarity index 100% rename from logo/androidaps.ai rename to _docs/logo/androidaps.ai diff --git a/logo/androidaps.pdf b/_docs/logo/androidaps.pdf similarity index 100% rename from logo/androidaps.pdf rename to _docs/logo/androidaps.pdf diff --git a/logo/androidaps2.ai b/_docs/logo/androidaps2.ai similarity index 100% rename from logo/androidaps2.ai rename to _docs/logo/androidaps2.ai diff --git a/logo/androidaps2.pdf b/_docs/logo/androidaps2.pdf similarity index 100% rename from logo/androidaps2.pdf rename to _docs/logo/androidaps2.pdf diff --git a/logo/background-01.svg b/_docs/logo/background-01.svg similarity index 100% rename from logo/background-01.svg rename to _docs/logo/background-01.svg diff --git a/logo/background.ai b/_docs/logo/background.ai similarity index 100% rename from logo/background.ai rename to _docs/logo/background.ai diff --git a/logo/background.pdf b/_docs/logo/background.pdf similarity index 100% rename from logo/background.pdf rename to _docs/logo/background.pdf diff --git a/logo/blueowl-web.png b/_docs/logo/blueowl-web.png similarity index 100% rename from logo/blueowl-web.png rename to _docs/logo/blueowl-web.png diff --git a/logo/drawing.png b/_docs/logo/drawing.png similarity index 100% rename from logo/drawing.png rename to _docs/logo/drawing.png diff --git a/logo/drawing.svg b/_docs/logo/drawing.svg similarity index 100% rename from logo/drawing.svg rename to _docs/logo/drawing.svg diff --git a/logo/ic_launcher-web.png b/_docs/logo/ic_launcher-web.png similarity index 100% rename from logo/ic_launcher-web.png rename to _docs/logo/ic_launcher-web.png diff --git a/logo/ic_launcher_round-web.png b/_docs/logo/ic_launcher_round-web.png similarity index 100% rename from logo/ic_launcher_round-web.png rename to _docs/logo/ic_launcher_round-web.png diff --git a/logo/icons.ai b/_docs/logo/icons.ai similarity index 100% rename from logo/icons.ai rename to _docs/logo/icons.ai diff --git a/logo/icons.pdf b/_docs/logo/icons.pdf similarity index 100% rename from logo/icons.pdf rename to _docs/logo/icons.pdf diff --git a/logo/icons.svg b/_docs/logo/icons.svg similarity index 100% rename from logo/icons.svg rename to _docs/logo/icons.svg diff --git a/logo/logo.md b/_docs/logo/logo.md similarity index 100% rename from logo/logo.md rename to _docs/logo/logo.md diff --git a/logo/logo_androidaps.ai b/_docs/logo/logo_androidaps.ai similarity index 100% rename from logo/logo_androidaps.ai rename to _docs/logo/logo_androidaps.ai diff --git a/logo/logo_androidaps.pdf b/_docs/logo/logo_androidaps.pdf similarity index 100% rename from logo/logo_androidaps.pdf rename to _docs/logo/logo_androidaps.pdf diff --git a/logo/logo_androidaps.svg b/_docs/logo/logo_androidaps.svg similarity index 100% rename from logo/logo_androidaps.svg rename to _docs/logo/logo_androidaps.svg diff --git a/logo/logoanaps.png b/_docs/logo/logoanaps.png similarity index 100% rename from logo/logoanaps.png rename to _docs/logo/logoanaps.png diff --git a/logo/notif_icon.png b/_docs/logo/notif_icon.png similarity index 100% rename from logo/notif_icon.png rename to _docs/logo/notif_icon.png diff --git a/logo/notificationdot.png b/_docs/logo/notificationdot.png similarity index 100% rename from logo/notificationdot.png rename to _docs/logo/notificationdot.png diff --git a/logo/notificationdot2.png b/_docs/logo/notificationdot2.png similarity index 100% rename from logo/notificationdot2.png rename to _docs/logo/notificationdot2.png diff --git a/logo/nsclient/white.png b/_docs/logo/nsclient/white.png similarity index 100% rename from logo/nsclient/white.png rename to _docs/logo/nsclient/white.png diff --git a/logo/old/AndroidAPS Icon.ai b/_docs/logo/old/AndroidAPS Icon.ai similarity index 100% rename from logo/old/AndroidAPS Icon.ai rename to _docs/logo/old/AndroidAPS Icon.ai diff --git a/logo/old/AndroidAPS Icon.png b/_docs/logo/old/AndroidAPS Icon.png similarity index 100% rename from logo/old/AndroidAPS Icon.png rename to _docs/logo/old/AndroidAPS Icon.png diff --git a/logo/pattern.ai b/_docs/logo/pattern.ai similarity index 100% rename from logo/pattern.ai rename to _docs/logo/pattern.ai diff --git a/logo/pattern.pdf b/_docs/logo/pattern.pdf similarity index 100% rename from logo/pattern.pdf rename to _docs/logo/pattern.pdf diff --git a/logo/pattern.svg b/_docs/logo/pattern.svg similarity index 100% rename from logo/pattern.svg rename to _docs/logo/pattern.svg diff --git a/logo/screenshot.png b/_docs/logo/screenshot.png similarity index 100% rename from logo/screenshot.png rename to _docs/logo/screenshot.png diff --git a/logo/tshirt.png b/_docs/logo/tshirt.png similarity index 100% rename from logo/tshirt.png rename to _docs/logo/tshirt.png diff --git a/revoking_leaked_apks.md b/_docs/revoking_leaked_apks.md similarity index 100% rename from revoking_leaked_apks.md rename to _docs/revoking_leaked_apks.md diff --git a/app/build.gradle b/app/build.gradle index 572f6c08a8..cb0f5ceac0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -179,20 +179,20 @@ dependencies { implementation project(':ui') implementation project(':plugins') implementation project(':implementation') - implementation project(':automation') - implementation project(':combo') implementation project(':database') - implementation project(':dana') - implementation project(':danars') - implementation project(':danar') + implementation project(':pump:combo') + implementation project(':pump:dana') + implementation project(':pump:danars') + implementation project(':pump:danar') + implementation project(':pump:diaconn') implementation project(':insight') - implementation project(':pump-common') - implementation project(':rileylink') - implementation project(':medtronic') - implementation project(':omnipod-common') - implementation project(':omnipod-eros') - implementation project(':omnipod-dash') - implementation project(':diaconn') + implementation project(':pump:medtronic') + implementation project(':pump:pump-common') + implementation project(':pump:rileylink') + implementation project(':pump:omnipod-common') + implementation project(':pump:omnipod-eros') + implementation project(':pump:omnipod-dash') + implementation project(':automation') implementation project(':openhumans') implementation fileTree(include: ['*.jar'], dir: 'libs') diff --git a/crowdin.yml b/crowdin.yml index 684c1c27fc..8badd8004e 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -15,22 +15,22 @@ files: translation: /core/src/main/res/values-%android_code%/strings.xml - source: /shared/src/main/res/values/strings.xml translation: /shared/src/main/res/values-%android_code%/strings.xml - - source: /combo/src/main/res/values/strings.xml - translation: /combo/src/main/res/values-%android_code%/strings.xml - - source: /dana/src/main/res/values/strings.xml - translation: /dana/src/main/res/values-%android_code%/strings.xml - - source: /danar/src/main/res/values/strings.xml - translation: /danar/src/main/res/values-%android_code%/strings.xml - - source: /medtronic/src/main/res/values/strings.xml - translation: /medtronic/src/main/res/values-%android_code%/strings.xml - - source: /omnipod-common/src/main/res/values/strings.xml - translation: /omnipod-common/src/main/res/values-%android_code%/strings.xml - - source: /omnipod-dash/src/main/res/values/strings.xml - translation: /omnipod-dash/src/main/res/values-%android_code%/strings.xml - - source: /omnipod-eros/src/main/res/values/strings.xml - translation: /omnipod-eros/src/main/res/values-%android_code%/strings.xml - - source: /rileylink/src/main/res/values/strings.xml - translation: /rileylink/src/main/res/values-%android_code%/strings.xml + - source: /pump/combo/src/main/res/values/strings.xml + translation: /pump//combo/src/main/res/values-%android_code%/strings.xml + - source: /pump/dana/src/main/res/values/strings.xml + translation: /pump/dana/src/main/res/values-%android_code%/strings.xml + - source: /pump/danar/src/main/res/values/strings.xml + translation: /pump/danar/src/main/res/values-%android_code%/strings.xml + - source: /pump/medtronic/src/main/res/values/strings.xml + translation: /pump/medtronic/src/main/res/values-%android_code%/strings.xml + - source: /pump/omnipod-common/src/main/res/values/strings.xml + translation: /pump/omnipod-common/src/main/res/values-%android_code%/strings.xml + - source: /pump/omnipod-dash/src/main/res/values/strings.xml + translation: /pump/omnipod-dash/src/main/res/values-%android_code%/strings.xml + - source: /pump/omnipod-eros/src/main/res/values/strings.xml + translation: /pump/omnipod-eros/src/main/res/values-%android_code%/strings.xml + - source: /pump/rileylink/src/main/res/values/strings.xml + translation: /pump/rileylink/src/main/res/values-%android_code%/strings.xml - source: /insight/src/main/res/values/strings.xml translation: /insight/src/main/res/values-%android_code%/strings.xml - source: /insight/src/main/res/values/alert_codes.xml @@ -43,10 +43,10 @@ files: translation: /insight/src/main/res/values-%android_code%/exceptions.xml - source: /automation/src/main/res/values/strings.xml translation: /automation/src/main/res/values-%android_code%/strings.xml - - source: /diaconn/src/main/res/values/strings.xml - translation: /diaconn/src/main/res/values-%android_code%/strings.xml - - source: /pump-common/src/main/res/values/strings.xml - translation: /pump-common/src/main/res/values-%android_code%/strings.xml + - source: /pump/diaconn/src/main/res/values/strings.xml + translation: /pump/diaconn/src/main/res/values-%android_code%/strings.xml + - source: /pump/pump-common/src/main/res/values/strings.xml + translation: /pump/pump-common/src/main/res/values-%android_code%/strings.xml - source: /openhumans/src/main/res/values/strings.xml translation: /openhumans/src/main/res/values-%android_code%/strings.xml - source: /implementation/src/main/res/values/strings.xml diff --git a/insight/build.gradle b/insight/build.gradle index 5e69a77ba6..e81e5f65b8 100644 --- a/insight/build.gradle +++ b/insight/build.gradle @@ -23,9 +23,10 @@ android { } dependencies { + implementation project(':core') implementation project(':shared') - implementation project(':pump-common') + implementation project(':pump:pump-common') api "androidx.room:room-ktx:$room_version" api "androidx.room:room-runtime:$room_version" diff --git a/combo/.gitignore b/pump/combo/.gitignore similarity index 100% rename from combo/.gitignore rename to pump/combo/.gitignore diff --git a/combo/build.gradle b/pump/combo/build.gradle similarity index 100% rename from combo/build.gradle rename to pump/combo/build.gradle diff --git a/combo/consumer-rules.pro b/pump/combo/consumer-rules.pro similarity index 100% rename from combo/consumer-rules.pro rename to pump/combo/consumer-rules.pro diff --git a/combo/proguard-rules.pro b/pump/combo/proguard-rules.pro similarity index 100% rename from combo/proguard-rules.pro rename to pump/combo/proguard-rules.pro diff --git a/combo/src/main/AndroidManifest.xml b/pump/combo/src/main/AndroidManifest.xml similarity index 100% rename from combo/src/main/AndroidManifest.xml rename to pump/combo/src/main/AndroidManifest.xml diff --git a/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl b/pump/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl similarity index 100% rename from combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl rename to pump/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl diff --git a/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl b/pump/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl similarity index 100% rename from combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl rename to pump/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl diff --git a/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl b/pump/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl similarity index 100% rename from combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl rename to pump/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl diff --git a/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java b/pump/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java similarity index 100% rename from combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java rename to pump/combo/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java diff --git a/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboActivitiesModule.kt b/pump/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboActivitiesModule.kt similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/combo/di/ComboActivitiesModule.kt rename to pump/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboActivitiesModule.kt diff --git a/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboModule.kt b/pump/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboModule.kt similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/combo/di/ComboModule.kt rename to pump/combo/src/main/java/info/nightscout/androidaps/combo/di/ComboModule.kt diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.kt b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.kt similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.kt rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.kt diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/data/ComboErrorUtil.kt b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/data/ComboErrorUtil.kt similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/data/ComboErrorUtil.kt rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/data/ComboErrorUtil.kt diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.kt b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.kt similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.kt rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/events/EventComboPumpUpdateGUI.kt diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BasalProfile.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/BolusProgressReporter.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpErrorCodes.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpState.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/PumpWarningCodes.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyCommands.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/Command.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CommandException.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ConfirmAlertCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadPumpStateCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Bolus.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/HistoryRecord.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpAlert.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistory.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/PumpHistoryRequest.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tbr.java diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java b/pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java similarity index 100% rename from combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java rename to pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/history/Tdd.java diff --git a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java b/pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java similarity index 100% rename from combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java rename to pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java diff --git a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java b/pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java similarity index 100% rename from combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java rename to pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java diff --git a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java b/pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java similarity index 100% rename from combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java rename to pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java diff --git a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java b/pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java similarity index 100% rename from combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java rename to pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java diff --git a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java b/pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java similarity index 100% rename from combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java rename to pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java diff --git a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java b/pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java similarity index 100% rename from combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java rename to pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java diff --git a/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java b/pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java similarity index 100% rename from combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java rename to pump/combo/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java diff --git a/combo/src/main/res/drawable/ic_combo.xml b/pump/combo/src/main/res/drawable/ic_combo.xml similarity index 100% rename from combo/src/main/res/drawable/ic_combo.xml rename to pump/combo/src/main/res/drawable/ic_combo.xml diff --git a/combo/src/main/res/layout/combopump_fragment.xml b/pump/combo/src/main/res/layout/combopump_fragment.xml similarity index 100% rename from combo/src/main/res/layout/combopump_fragment.xml rename to pump/combo/src/main/res/layout/combopump_fragment.xml diff --git a/combo/src/main/res/values-af-rZA/strings.xml b/pump/combo/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from combo/src/main/res/values-af-rZA/strings.xml rename to pump/combo/src/main/res/values-af-rZA/strings.xml diff --git a/combo/src/main/res/values-bg-rBG/strings.xml b/pump/combo/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from combo/src/main/res/values-bg-rBG/strings.xml rename to pump/combo/src/main/res/values-bg-rBG/strings.xml diff --git a/combo/src/main/res/values-ca-rES/strings.xml b/pump/combo/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from combo/src/main/res/values-ca-rES/strings.xml rename to pump/combo/src/main/res/values-ca-rES/strings.xml diff --git a/combo/src/main/res/values-cs-rCZ/strings.xml b/pump/combo/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from combo/src/main/res/values-cs-rCZ/strings.xml rename to pump/combo/src/main/res/values-cs-rCZ/strings.xml diff --git a/combo/src/main/res/values-da-rDK/strings.xml b/pump/combo/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from combo/src/main/res/values-da-rDK/strings.xml rename to pump/combo/src/main/res/values-da-rDK/strings.xml diff --git a/combo/src/main/res/values-de-rDE/strings.xml b/pump/combo/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from combo/src/main/res/values-de-rDE/strings.xml rename to pump/combo/src/main/res/values-de-rDE/strings.xml diff --git a/combo/src/main/res/values-el-rGR/strings.xml b/pump/combo/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from combo/src/main/res/values-el-rGR/strings.xml rename to pump/combo/src/main/res/values-el-rGR/strings.xml diff --git a/combo/src/main/res/values-es-rES/strings.xml b/pump/combo/src/main/res/values-es-rES/strings.xml similarity index 100% rename from combo/src/main/res/values-es-rES/strings.xml rename to pump/combo/src/main/res/values-es-rES/strings.xml diff --git a/combo/src/main/res/values-fr-rFR/strings.xml b/pump/combo/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from combo/src/main/res/values-fr-rFR/strings.xml rename to pump/combo/src/main/res/values-fr-rFR/strings.xml diff --git a/combo/src/main/res/values-ga-rIE/strings.xml b/pump/combo/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from combo/src/main/res/values-ga-rIE/strings.xml rename to pump/combo/src/main/res/values-ga-rIE/strings.xml diff --git a/combo/src/main/res/values-hr-rHR/strings.xml b/pump/combo/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from combo/src/main/res/values-hr-rHR/strings.xml rename to pump/combo/src/main/res/values-hr-rHR/strings.xml diff --git a/combo/src/main/res/values-hu-rHU/strings.xml b/pump/combo/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from combo/src/main/res/values-hu-rHU/strings.xml rename to pump/combo/src/main/res/values-hu-rHU/strings.xml diff --git a/combo/src/main/res/values-it-rIT/strings.xml b/pump/combo/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from combo/src/main/res/values-it-rIT/strings.xml rename to pump/combo/src/main/res/values-it-rIT/strings.xml diff --git a/combo/src/main/res/values-iw-rIL/strings.xml b/pump/combo/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from combo/src/main/res/values-iw-rIL/strings.xml rename to pump/combo/src/main/res/values-iw-rIL/strings.xml diff --git a/combo/src/main/res/values-ko-rKR/strings.xml b/pump/combo/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from combo/src/main/res/values-ko-rKR/strings.xml rename to pump/combo/src/main/res/values-ko-rKR/strings.xml diff --git a/combo/src/main/res/values-lt-rLT/strings.xml b/pump/combo/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from combo/src/main/res/values-lt-rLT/strings.xml rename to pump/combo/src/main/res/values-lt-rLT/strings.xml diff --git a/combo/src/main/res/values-nl-rNL/strings.xml b/pump/combo/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from combo/src/main/res/values-nl-rNL/strings.xml rename to pump/combo/src/main/res/values-nl-rNL/strings.xml diff --git a/combo/src/main/res/values-no-rNO/strings.xml b/pump/combo/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from combo/src/main/res/values-no-rNO/strings.xml rename to pump/combo/src/main/res/values-no-rNO/strings.xml diff --git a/combo/src/main/res/values-pl-rPL/strings.xml b/pump/combo/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from combo/src/main/res/values-pl-rPL/strings.xml rename to pump/combo/src/main/res/values-pl-rPL/strings.xml diff --git a/combo/src/main/res/values-pt-rBR/strings.xml b/pump/combo/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from combo/src/main/res/values-pt-rBR/strings.xml rename to pump/combo/src/main/res/values-pt-rBR/strings.xml diff --git a/combo/src/main/res/values-pt-rPT/strings.xml b/pump/combo/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from combo/src/main/res/values-pt-rPT/strings.xml rename to pump/combo/src/main/res/values-pt-rPT/strings.xml diff --git a/combo/src/main/res/values-ro-rRO/strings.xml b/pump/combo/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from combo/src/main/res/values-ro-rRO/strings.xml rename to pump/combo/src/main/res/values-ro-rRO/strings.xml diff --git a/combo/src/main/res/values-ru-rRU/strings.xml b/pump/combo/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from combo/src/main/res/values-ru-rRU/strings.xml rename to pump/combo/src/main/res/values-ru-rRU/strings.xml diff --git a/combo/src/main/res/values-sk-rSK/strings.xml b/pump/combo/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from combo/src/main/res/values-sk-rSK/strings.xml rename to pump/combo/src/main/res/values-sk-rSK/strings.xml diff --git a/combo/src/main/res/values-sl-rSI/strings.xml b/pump/combo/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from combo/src/main/res/values-sl-rSI/strings.xml rename to pump/combo/src/main/res/values-sl-rSI/strings.xml diff --git a/combo/src/main/res/values-sr-rCS/strings.xml b/pump/combo/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from combo/src/main/res/values-sr-rCS/strings.xml rename to pump/combo/src/main/res/values-sr-rCS/strings.xml diff --git a/combo/src/main/res/values-sv-rSE/strings.xml b/pump/combo/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from combo/src/main/res/values-sv-rSE/strings.xml rename to pump/combo/src/main/res/values-sv-rSE/strings.xml diff --git a/combo/src/main/res/values-ta-rIN/strings.xml b/pump/combo/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from combo/src/main/res/values-ta-rIN/strings.xml rename to pump/combo/src/main/res/values-ta-rIN/strings.xml diff --git a/combo/src/main/res/values-tr-rTR/strings.xml b/pump/combo/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from combo/src/main/res/values-tr-rTR/strings.xml rename to pump/combo/src/main/res/values-tr-rTR/strings.xml diff --git a/combo/src/main/res/values-zh-rCN/strings.xml b/pump/combo/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from combo/src/main/res/values-zh-rCN/strings.xml rename to pump/combo/src/main/res/values-zh-rCN/strings.xml diff --git a/combo/src/main/res/values/arrays.xml b/pump/combo/src/main/res/values/arrays.xml old mode 100755 new mode 100644 similarity index 100% rename from combo/src/main/res/values/arrays.xml rename to pump/combo/src/main/res/values/arrays.xml diff --git a/combo/src/main/res/values/strings.xml b/pump/combo/src/main/res/values/strings.xml similarity index 100% rename from combo/src/main/res/values/strings.xml rename to pump/combo/src/main/res/values/strings.xml diff --git a/combo/src/main/res/xml/pref_combo.xml b/pump/combo/src/main/res/xml/pref_combo.xml old mode 100755 new mode 100644 similarity index 100% rename from combo/src/main/res/xml/pref_combo.xml rename to pump/combo/src/main/res/xml/pref_combo.xml diff --git a/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt b/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt similarity index 100% rename from combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt rename to pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt diff --git a/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/TestBase.kt b/pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/TestBase.kt similarity index 100% rename from combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/TestBase.kt rename to pump/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/TestBase.kt diff --git a/dana/.gitignore b/pump/dana/.gitignore similarity index 100% rename from dana/.gitignore rename to pump/dana/.gitignore diff --git a/dana/build.gradle b/pump/dana/build.gradle similarity index 100% rename from dana/build.gradle rename to pump/dana/build.gradle diff --git a/dana/consumer-rules.pro b/pump/dana/consumer-rules.pro similarity index 100% rename from dana/consumer-rules.pro rename to pump/dana/consumer-rules.pro diff --git a/dana/proguard-rules.pro b/pump/dana/proguard-rules.pro similarity index 100% rename from dana/proguard-rules.pro rename to pump/dana/proguard-rules.pro diff --git a/dana/schemas/info.nightscout.androidaps.dana.database.DanaHistoryDatabase/1.json b/pump/dana/schemas/info.nightscout.androidaps.dana.database.DanaHistoryDatabase/1.json similarity index 100% rename from dana/schemas/info.nightscout.androidaps.dana.database.DanaHistoryDatabase/1.json rename to pump/dana/schemas/info.nightscout.androidaps.dana.database.DanaHistoryDatabase/1.json diff --git a/dana/src/main/AndroidManifest.xml b/pump/dana/src/main/AndroidManifest.xml similarity index 100% rename from dana/src/main/AndroidManifest.xml rename to pump/dana/src/main/AndroidManifest.xml diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/comm/RecordTypes.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/comm/RecordTypes.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/comm/RecordTypes.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/comm/RecordTypes.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryDatabase.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryDatabase.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryDatabase.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryDatabase.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryRecord.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryRecord.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryRecord.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryRecord.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryRecordDao.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryRecordDao.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryRecordDao.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/database/DanaHistoryRecordDao.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaHistoryModule.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaHistoryModule.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/di/DanaHistoryModule.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaHistoryModule.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaModule.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaModule.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/di/DanaModule.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaModule.kt diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/events/EventDanaRNewStatus.kt b/pump/dana/src/main/java/info/nightscout/androidaps/dana/events/EventDanaRNewStatus.kt similarity index 100% rename from dana/src/main/java/info/nightscout/androidaps/dana/events/EventDanaRNewStatus.kt rename to pump/dana/src/main/java/info/nightscout/androidaps/dana/events/EventDanaRNewStatus.kt diff --git a/dana/src/main/res/drawable/ic_dana_i.xml b/pump/dana/src/main/res/drawable/ic_dana_i.xml similarity index 100% rename from dana/src/main/res/drawable/ic_dana_i.xml rename to pump/dana/src/main/res/drawable/ic_dana_i.xml diff --git a/dana/src/main/res/drawable/ic_dana_rs.xml b/pump/dana/src/main/res/drawable/ic_dana_rs.xml similarity index 100% rename from dana/src/main/res/drawable/ic_dana_rs.xml rename to pump/dana/src/main/res/drawable/ic_dana_rs.xml diff --git a/dana/src/main/res/layout/danar_fragment.xml b/pump/dana/src/main/res/layout/danar_fragment.xml similarity index 100% rename from dana/src/main/res/layout/danar_fragment.xml rename to pump/dana/src/main/res/layout/danar_fragment.xml diff --git a/dana/src/main/res/layout/danar_history_activity.xml b/pump/dana/src/main/res/layout/danar_history_activity.xml similarity index 100% rename from dana/src/main/res/layout/danar_history_activity.xml rename to pump/dana/src/main/res/layout/danar_history_activity.xml diff --git a/dana/src/main/res/layout/danar_history_item.xml b/pump/dana/src/main/res/layout/danar_history_item.xml similarity index 100% rename from dana/src/main/res/layout/danar_history_item.xml rename to pump/dana/src/main/res/layout/danar_history_item.xml diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/pump/dana/src/main/res/layout/danar_user_options_activity.xml similarity index 100% rename from dana/src/main/res/layout/danar_user_options_activity.xml rename to pump/dana/src/main/res/layout/danar_user_options_activity.xml diff --git a/dana/src/main/res/values-af-rZA/strings.xml b/pump/dana/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from dana/src/main/res/values-af-rZA/strings.xml rename to pump/dana/src/main/res/values-af-rZA/strings.xml diff --git a/dana/src/main/res/values-ar-rSA/strings.xml b/pump/dana/src/main/res/values-ar-rSA/strings.xml similarity index 100% rename from dana/src/main/res/values-ar-rSA/strings.xml rename to pump/dana/src/main/res/values-ar-rSA/strings.xml diff --git a/dana/src/main/res/values-bg-rBG/strings.xml b/pump/dana/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from dana/src/main/res/values-bg-rBG/strings.xml rename to pump/dana/src/main/res/values-bg-rBG/strings.xml diff --git a/dana/src/main/res/values-ca-rES/strings.xml b/pump/dana/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from dana/src/main/res/values-ca-rES/strings.xml rename to pump/dana/src/main/res/values-ca-rES/strings.xml diff --git a/dana/src/main/res/values-cs-rCZ/strings.xml b/pump/dana/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from dana/src/main/res/values-cs-rCZ/strings.xml rename to pump/dana/src/main/res/values-cs-rCZ/strings.xml diff --git a/dana/src/main/res/values-cy-rGB/strings.xml b/pump/dana/src/main/res/values-cy-rGB/strings.xml similarity index 100% rename from dana/src/main/res/values-cy-rGB/strings.xml rename to pump/dana/src/main/res/values-cy-rGB/strings.xml diff --git a/dana/src/main/res/values-da-rDK/strings.xml b/pump/dana/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from dana/src/main/res/values-da-rDK/strings.xml rename to pump/dana/src/main/res/values-da-rDK/strings.xml diff --git a/dana/src/main/res/values-de-rDE/strings.xml b/pump/dana/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from dana/src/main/res/values-de-rDE/strings.xml rename to pump/dana/src/main/res/values-de-rDE/strings.xml diff --git a/dana/src/main/res/values-el-rGR/strings.xml b/pump/dana/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from dana/src/main/res/values-el-rGR/strings.xml rename to pump/dana/src/main/res/values-el-rGR/strings.xml diff --git a/dana/src/main/res/values-es-rES/strings.xml b/pump/dana/src/main/res/values-es-rES/strings.xml similarity index 100% rename from dana/src/main/res/values-es-rES/strings.xml rename to pump/dana/src/main/res/values-es-rES/strings.xml diff --git a/dana/src/main/res/values-fi-rFI/strings.xml b/pump/dana/src/main/res/values-fi-rFI/strings.xml similarity index 100% rename from dana/src/main/res/values-fi-rFI/strings.xml rename to pump/dana/src/main/res/values-fi-rFI/strings.xml diff --git a/dana/src/main/res/values-fr-rFR/strings.xml b/pump/dana/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from dana/src/main/res/values-fr-rFR/strings.xml rename to pump/dana/src/main/res/values-fr-rFR/strings.xml diff --git a/dana/src/main/res/values-ga-rIE/strings.xml b/pump/dana/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from dana/src/main/res/values-ga-rIE/strings.xml rename to pump/dana/src/main/res/values-ga-rIE/strings.xml diff --git a/dana/src/main/res/values-hr-rHR/strings.xml b/pump/dana/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from dana/src/main/res/values-hr-rHR/strings.xml rename to pump/dana/src/main/res/values-hr-rHR/strings.xml diff --git a/dana/src/main/res/values-hu-rHU/strings.xml b/pump/dana/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from dana/src/main/res/values-hu-rHU/strings.xml rename to pump/dana/src/main/res/values-hu-rHU/strings.xml diff --git a/dana/src/main/res/values-it-rIT/strings.xml b/pump/dana/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from dana/src/main/res/values-it-rIT/strings.xml rename to pump/dana/src/main/res/values-it-rIT/strings.xml diff --git a/dana/src/main/res/values-iw-rIL/strings.xml b/pump/dana/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from dana/src/main/res/values-iw-rIL/strings.xml rename to pump/dana/src/main/res/values-iw-rIL/strings.xml diff --git a/dana/src/main/res/values-ja-rJP/strings.xml b/pump/dana/src/main/res/values-ja-rJP/strings.xml similarity index 100% rename from dana/src/main/res/values-ja-rJP/strings.xml rename to pump/dana/src/main/res/values-ja-rJP/strings.xml diff --git a/dana/src/main/res/values-ko-rKR/strings.xml b/pump/dana/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from dana/src/main/res/values-ko-rKR/strings.xml rename to pump/dana/src/main/res/values-ko-rKR/strings.xml diff --git a/dana/src/main/res/values-lt-rLT/strings.xml b/pump/dana/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from dana/src/main/res/values-lt-rLT/strings.xml rename to pump/dana/src/main/res/values-lt-rLT/strings.xml diff --git a/dana/src/main/res/values-nl-rNL/strings.xml b/pump/dana/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from dana/src/main/res/values-nl-rNL/strings.xml rename to pump/dana/src/main/res/values-nl-rNL/strings.xml diff --git a/dana/src/main/res/values-no-rNO/strings.xml b/pump/dana/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from dana/src/main/res/values-no-rNO/strings.xml rename to pump/dana/src/main/res/values-no-rNO/strings.xml diff --git a/dana/src/main/res/values-pl-rPL/strings.xml b/pump/dana/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from dana/src/main/res/values-pl-rPL/strings.xml rename to pump/dana/src/main/res/values-pl-rPL/strings.xml diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/pump/dana/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from dana/src/main/res/values-pt-rBR/strings.xml rename to pump/dana/src/main/res/values-pt-rBR/strings.xml diff --git a/dana/src/main/res/values-pt-rPT/strings.xml b/pump/dana/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from dana/src/main/res/values-pt-rPT/strings.xml rename to pump/dana/src/main/res/values-pt-rPT/strings.xml diff --git a/dana/src/main/res/values-ro-rRO/strings.xml b/pump/dana/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from dana/src/main/res/values-ro-rRO/strings.xml rename to pump/dana/src/main/res/values-ro-rRO/strings.xml diff --git a/dana/src/main/res/values-ru-rRU/strings.xml b/pump/dana/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from dana/src/main/res/values-ru-rRU/strings.xml rename to pump/dana/src/main/res/values-ru-rRU/strings.xml diff --git a/dana/src/main/res/values-sk-rSK/strings.xml b/pump/dana/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from dana/src/main/res/values-sk-rSK/strings.xml rename to pump/dana/src/main/res/values-sk-rSK/strings.xml diff --git a/dana/src/main/res/values-sl-rSI/strings.xml b/pump/dana/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from dana/src/main/res/values-sl-rSI/strings.xml rename to pump/dana/src/main/res/values-sl-rSI/strings.xml diff --git a/dana/src/main/res/values-sr-rCS/strings.xml b/pump/dana/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from dana/src/main/res/values-sr-rCS/strings.xml rename to pump/dana/src/main/res/values-sr-rCS/strings.xml diff --git a/dana/src/main/res/values-sv-rSE/strings.xml b/pump/dana/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from dana/src/main/res/values-sv-rSE/strings.xml rename to pump/dana/src/main/res/values-sv-rSE/strings.xml diff --git a/dana/src/main/res/values-ta-rIN/strings.xml b/pump/dana/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from dana/src/main/res/values-ta-rIN/strings.xml rename to pump/dana/src/main/res/values-ta-rIN/strings.xml diff --git a/dana/src/main/res/values-tr-rTR/strings.xml b/pump/dana/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from dana/src/main/res/values-tr-rTR/strings.xml rename to pump/dana/src/main/res/values-tr-rTR/strings.xml diff --git a/dana/src/main/res/values-zh-rCN/strings.xml b/pump/dana/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from dana/src/main/res/values-zh-rCN/strings.xml rename to pump/dana/src/main/res/values-zh-rCN/strings.xml diff --git a/dana/src/main/res/values/arrays.xml b/pump/dana/src/main/res/values/arrays.xml similarity index 100% rename from dana/src/main/res/values/arrays.xml rename to pump/dana/src/main/res/values/arrays.xml diff --git a/dana/src/main/res/values/strings.xml b/pump/dana/src/main/res/values/strings.xml similarity index 100% rename from dana/src/main/res/values/strings.xml rename to pump/dana/src/main/res/values/strings.xml diff --git a/dana/src/test/java/info/nightscout/androidaps/TestBase.kt b/pump/dana/src/test/java/info/nightscout/androidaps/TestBase.kt similarity index 100% rename from dana/src/test/java/info/nightscout/androidaps/TestBase.kt rename to pump/dana/src/test/java/info/nightscout/androidaps/TestBase.kt diff --git a/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/pump/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt similarity index 100% rename from dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt rename to pump/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt diff --git a/dana/src/test/java/info/nightscout/androidaps/dana/DanaPumpTest.kt b/pump/dana/src/test/java/info/nightscout/androidaps/dana/DanaPumpTest.kt similarity index 100% rename from dana/src/test/java/info/nightscout/androidaps/dana/DanaPumpTest.kt rename to pump/dana/src/test/java/info/nightscout/androidaps/dana/DanaPumpTest.kt diff --git a/danar/.gitignore b/pump/danar/.gitignore similarity index 100% rename from danar/.gitignore rename to pump/danar/.gitignore diff --git a/danar/build.gradle b/pump/danar/build.gradle similarity index 93% rename from danar/build.gradle rename to pump/danar/build.gradle index 7fe1ba8c55..9e4191877d 100644 --- a/danar/build.gradle +++ b/pump/danar/build.gradle @@ -13,7 +13,7 @@ android { } dependencies { - implementation project(':core') - implementation project(':dana') implementation project(':shared') + implementation project(':core') + implementation project(':pump:dana') } \ No newline at end of file diff --git a/danar/consumer-rules.pro b/pump/danar/consumer-rules.pro similarity index 100% rename from danar/consumer-rules.pro rename to pump/danar/consumer-rules.pro diff --git a/danar/proguard-rules.pro b/pump/danar/proguard-rules.pro similarity index 100% rename from danar/proguard-rules.pro rename to pump/danar/proguard-rules.pro diff --git a/danar/src/main/AndroidManifest.xml b/pump/danar/src/main/AndroidManifest.xml similarity index 100% rename from danar/src/main/AndroidManifest.xml rename to pump/danar/src/main/AndroidManifest.xml diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java rename to pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableBase.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableBase.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableBase.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableBase.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageOriginalNames.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageOriginalNames.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageOriginalNames.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageOriginalNames.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRServicesModule.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRServicesModule.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRServicesModule.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRServicesModule.kt diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java rename to pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java diff --git a/danar/src/main/java/info/nightscout/androidaps/utils/CRC.kt b/pump/danar/src/main/java/info/nightscout/androidaps/utils/CRC.kt similarity index 100% rename from danar/src/main/java/info/nightscout/androidaps/utils/CRC.kt rename to pump/danar/src/main/java/info/nightscout/androidaps/utils/CRC.kt diff --git a/danar/src/main/res/values-af-rZA/strings.xml b/pump/danar/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from danar/src/main/res/values-af-rZA/strings.xml rename to pump/danar/src/main/res/values-af-rZA/strings.xml diff --git a/danar/src/main/res/values-bg-rBG/strings.xml b/pump/danar/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from danar/src/main/res/values-bg-rBG/strings.xml rename to pump/danar/src/main/res/values-bg-rBG/strings.xml diff --git a/danar/src/main/res/values-ca-rES/strings.xml b/pump/danar/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from danar/src/main/res/values-ca-rES/strings.xml rename to pump/danar/src/main/res/values-ca-rES/strings.xml diff --git a/danar/src/main/res/values-cs-rCZ/strings.xml b/pump/danar/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from danar/src/main/res/values-cs-rCZ/strings.xml rename to pump/danar/src/main/res/values-cs-rCZ/strings.xml diff --git a/danar/src/main/res/values-da-rDK/strings.xml b/pump/danar/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from danar/src/main/res/values-da-rDK/strings.xml rename to pump/danar/src/main/res/values-da-rDK/strings.xml diff --git a/danar/src/main/res/values-de-rDE/strings.xml b/pump/danar/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from danar/src/main/res/values-de-rDE/strings.xml rename to pump/danar/src/main/res/values-de-rDE/strings.xml diff --git a/danar/src/main/res/values-el-rGR/strings.xml b/pump/danar/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from danar/src/main/res/values-el-rGR/strings.xml rename to pump/danar/src/main/res/values-el-rGR/strings.xml diff --git a/danar/src/main/res/values-es-rES/strings.xml b/pump/danar/src/main/res/values-es-rES/strings.xml similarity index 100% rename from danar/src/main/res/values-es-rES/strings.xml rename to pump/danar/src/main/res/values-es-rES/strings.xml diff --git a/danar/src/main/res/values-fr-rFR/strings.xml b/pump/danar/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from danar/src/main/res/values-fr-rFR/strings.xml rename to pump/danar/src/main/res/values-fr-rFR/strings.xml diff --git a/danar/src/main/res/values-ga-rIE/strings.xml b/pump/danar/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from danar/src/main/res/values-ga-rIE/strings.xml rename to pump/danar/src/main/res/values-ga-rIE/strings.xml diff --git a/danar/src/main/res/values-hr-rHR/strings.xml b/pump/danar/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from danar/src/main/res/values-hr-rHR/strings.xml rename to pump/danar/src/main/res/values-hr-rHR/strings.xml diff --git a/danar/src/main/res/values-hu-rHU/strings.xml b/pump/danar/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from danar/src/main/res/values-hu-rHU/strings.xml rename to pump/danar/src/main/res/values-hu-rHU/strings.xml diff --git a/danar/src/main/res/values-it-rIT/strings.xml b/pump/danar/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from danar/src/main/res/values-it-rIT/strings.xml rename to pump/danar/src/main/res/values-it-rIT/strings.xml diff --git a/danar/src/main/res/values-iw-rIL/strings.xml b/pump/danar/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from danar/src/main/res/values-iw-rIL/strings.xml rename to pump/danar/src/main/res/values-iw-rIL/strings.xml diff --git a/danar/src/main/res/values-ko-rKR/strings.xml b/pump/danar/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from danar/src/main/res/values-ko-rKR/strings.xml rename to pump/danar/src/main/res/values-ko-rKR/strings.xml diff --git a/danar/src/main/res/values-lt-rLT/strings.xml b/pump/danar/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from danar/src/main/res/values-lt-rLT/strings.xml rename to pump/danar/src/main/res/values-lt-rLT/strings.xml diff --git a/danar/src/main/res/values-nl-rNL/strings.xml b/pump/danar/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from danar/src/main/res/values-nl-rNL/strings.xml rename to pump/danar/src/main/res/values-nl-rNL/strings.xml diff --git a/danar/src/main/res/values-no-rNO/strings.xml b/pump/danar/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from danar/src/main/res/values-no-rNO/strings.xml rename to pump/danar/src/main/res/values-no-rNO/strings.xml diff --git a/danar/src/main/res/values-pl-rPL/strings.xml b/pump/danar/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from danar/src/main/res/values-pl-rPL/strings.xml rename to pump/danar/src/main/res/values-pl-rPL/strings.xml diff --git a/danar/src/main/res/values-pt-rBR/strings.xml b/pump/danar/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from danar/src/main/res/values-pt-rBR/strings.xml rename to pump/danar/src/main/res/values-pt-rBR/strings.xml diff --git a/danar/src/main/res/values-pt-rPT/strings.xml b/pump/danar/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from danar/src/main/res/values-pt-rPT/strings.xml rename to pump/danar/src/main/res/values-pt-rPT/strings.xml diff --git a/danar/src/main/res/values-ro-rRO/strings.xml b/pump/danar/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from danar/src/main/res/values-ro-rRO/strings.xml rename to pump/danar/src/main/res/values-ro-rRO/strings.xml diff --git a/danar/src/main/res/values-ru-rRU/strings.xml b/pump/danar/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from danar/src/main/res/values-ru-rRU/strings.xml rename to pump/danar/src/main/res/values-ru-rRU/strings.xml diff --git a/danar/src/main/res/values-sk-rSK/strings.xml b/pump/danar/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from danar/src/main/res/values-sk-rSK/strings.xml rename to pump/danar/src/main/res/values-sk-rSK/strings.xml diff --git a/danar/src/main/res/values-sr-rCS/strings.xml b/pump/danar/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from danar/src/main/res/values-sr-rCS/strings.xml rename to pump/danar/src/main/res/values-sr-rCS/strings.xml diff --git a/danar/src/main/res/values-sv-rSE/strings.xml b/pump/danar/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from danar/src/main/res/values-sv-rSE/strings.xml rename to pump/danar/src/main/res/values-sv-rSE/strings.xml diff --git a/danar/src/main/res/values-tr-rTR/strings.xml b/pump/danar/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from danar/src/main/res/values-tr-rTR/strings.xml rename to pump/danar/src/main/res/values-tr-rTR/strings.xml diff --git a/danar/src/main/res/values-zh-rCN/strings.xml b/pump/danar/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from danar/src/main/res/values-zh-rCN/strings.xml rename to pump/danar/src/main/res/values-zh-rCN/strings.xml diff --git a/danar/src/main/res/values/strings.xml b/pump/danar/src/main/res/values/strings.xml similarity index 100% rename from danar/src/main/res/values/strings.xml rename to pump/danar/src/main/res/values/strings.xml diff --git a/danar/src/main/res/xml/pref_danar.xml b/pump/danar/src/main/res/xml/pref_danar.xml similarity index 100% rename from danar/src/main/res/xml/pref_danar.xml rename to pump/danar/src/main/res/xml/pref_danar.xml diff --git a/danar/src/main/res/xml/pref_danarkorean.xml b/pump/danar/src/main/res/xml/pref_danarkorean.xml similarity index 100% rename from danar/src/main/res/xml/pref_danarkorean.xml rename to pump/danar/src/main/res/xml/pref_danarkorean.xml diff --git a/danar/src/main/res/xml/pref_danarv2.xml b/pump/danar/src/main/res/xml/pref_danarv2.xml similarity index 100% rename from danar/src/main/res/xml/pref_danarv2.xml rename to pump/danar/src/main/res/xml/pref_danarv2.xml diff --git a/danar/src/test/java/info/nightscout/androidaps/TestBase.kt b/pump/danar/src/test/java/info/nightscout/androidaps/TestBase.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/TestBase.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/TestBase.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt b/pump/danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValueRv2Test.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValueRv2Test.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValueRv2Test.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValueRv2Test.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStartRv2Test.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStartRv2Test.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStartRv2Test.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStartRv2Test.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntryRv2Test.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntryRv2Test.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntryRv2Test.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntryRv2Test.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPSRv2Test.kt b/pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPSRv2Test.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPSRv2Test.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPSRv2Test.kt diff --git a/danar/src/test/java/info/nightscout/androidaps/utils/CRCTest.kt b/pump/danar/src/test/java/info/nightscout/androidaps/utils/CRCTest.kt similarity index 100% rename from danar/src/test/java/info/nightscout/androidaps/utils/CRCTest.kt rename to pump/danar/src/test/java/info/nightscout/androidaps/utils/CRCTest.kt diff --git a/danars/.gitignore b/pump/danars/.gitignore similarity index 100% rename from danars/.gitignore rename to pump/danars/.gitignore diff --git a/danars/build.gradle b/pump/danars/build.gradle similarity index 94% rename from danars/build.gradle rename to pump/danars/build.gradle index 2f0b2a46a4..58e9e39714 100644 --- a/danars/build.gradle +++ b/pump/danars/build.gradle @@ -23,6 +23,6 @@ android { dependencies { implementation project(':core') - implementation project(':dana') + implementation project(':pump:dana') implementation project(':shared') } \ No newline at end of file diff --git a/danars/consumer-rules.pro b/pump/danars/consumer-rules.pro similarity index 100% rename from danars/consumer-rules.pro rename to pump/danars/consumer-rules.pro diff --git a/danars/proguard-rules.pro b/pump/danars/proguard-rules.pro similarity index 100% rename from danars/proguard-rules.pro rename to pump/danars/proguard-rules.pro diff --git a/danars/src/main/AndroidManifest.xml b/pump/danars/src/main/AndroidManifest.xml similarity index 100% rename from danars/src/main/AndroidManifest.xml rename to pump/danars/src/main/AndroidManifest.xml diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java b/pump/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java b/pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/encryption/EncryptionType.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/EncryptionType.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/encryption/EncryptionType.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/encryption/EncryptionType.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt similarity index 100% rename from danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt rename to pump/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt diff --git a/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so b/pump/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so similarity index 100% rename from danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so rename to pump/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so diff --git a/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so b/pump/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so similarity index 100% rename from danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so rename to pump/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so diff --git a/danars/src/main/jniLibs/x86/libBleEncryption.so b/pump/danars/src/main/jniLibs/x86/libBleEncryption.so similarity index 100% rename from danars/src/main/jniLibs/x86/libBleEncryption.so rename to pump/danars/src/main/jniLibs/x86/libBleEncryption.so diff --git a/danars/src/main/jniLibs/x86_64/libBleEncryption.so b/pump/danars/src/main/jniLibs/x86_64/libBleEncryption.so similarity index 100% rename from danars/src/main/jniLibs/x86_64/libBleEncryption.so rename to pump/danars/src/main/jniLibs/x86_64/libBleEncryption.so diff --git a/danars/src/main/res/layout/danars_blescanner_activity.xml b/pump/danars/src/main/res/layout/danars_blescanner_activity.xml similarity index 100% rename from danars/src/main/res/layout/danars_blescanner_activity.xml rename to pump/danars/src/main/res/layout/danars_blescanner_activity.xml diff --git a/danars/src/main/res/layout/danars_blescanner_item.xml b/pump/danars/src/main/res/layout/danars_blescanner_item.xml similarity index 100% rename from danars/src/main/res/layout/danars_blescanner_item.xml rename to pump/danars/src/main/res/layout/danars_blescanner_item.xml diff --git a/danars/src/main/res/layout/danars_enter_pin_activity.xml b/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml similarity index 100% rename from danars/src/main/res/layout/danars_enter_pin_activity.xml rename to pump/danars/src/main/res/layout/danars_enter_pin_activity.xml diff --git a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml b/pump/danars/src/main/res/layout/danars_pairing_progress_dialog.xml similarity index 100% rename from danars/src/main/res/layout/danars_pairing_progress_dialog.xml rename to pump/danars/src/main/res/layout/danars_pairing_progress_dialog.xml diff --git a/danars/src/main/res/xml/pref_danars.xml b/pump/danars/src/main/res/xml/pref_danars.xml similarity index 100% rename from danars/src/main/res/xml/pref_danars.xml rename to pump/danars/src/main/res/xml/pref_danars.xml diff --git a/danars/src/test/java/info/nightscout/androidaps/TestBase.kt b/pump/danars/src/test/java/info/nightscout/androidaps/TestBase.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/TestBase.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/TestBase.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasalTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasalTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasalTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasalTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarmTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarmTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarmTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarmTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOptionTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOptionTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOptionTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOptionTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsBasalSetTemporaryBasalTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsBasalSetTemporaryBasalTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsBasalSetTemporaryBasalTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsBasalSetTemporaryBasalTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileNumberTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileNumberTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileNumberTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileNumberTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetCancelTemporaryBasalTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetCancelTemporaryBasalTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetCancelTemporaryBasalTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetCancelTemporaryBasalTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileBasalRateTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileBasalRateTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileBasalRateTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileBasalRateTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileNumberTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileNumberTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileNumberTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileNumberTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOffTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOffTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOffTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOffTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOnTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOnTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOnTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOnTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCalculationInformationTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCalculationInformationTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCalculationInformationTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCalculationInformationTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCirCfArrayTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCirCfArrayTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCirCfArrayTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCirCfArrayTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetStepBolusInformationTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetStepBolusInformationTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetStepBolusInformationTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetStepBolusInformationTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetBolusOptionTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetBolusOptionTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetBolusOptionTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetBolusOptionTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusCancelTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusCancelTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusCancelTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusCancelTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcKeepConnectionTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcKeepConnectionTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcKeepConnectionTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcKeepConnectionTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcSetHistorySaveTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcSetHistorySaveTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcSetHistorySaveTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcSetHistorySaveTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingInformationTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingInformationTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingInformationTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingInformationTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingVerisonTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingVerisonTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingVerisonTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingVerisonTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetUserTimeChangeFlagTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetUserTimeChangeFlagTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetUserTimeChangeFlagTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetUserTimeChangeFlagTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralInitialScreenInformationTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralInitialScreenInformationTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralInitialScreenInformationTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralInitialScreenInformationTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetHistoryUploadModeTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetHistoryUploadModeTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetHistoryUploadModeTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetHistoryUploadModeTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetUserTimeChangeFlagClearTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetUserTimeChangeFlagClearTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetUserTimeChangeFlagClearTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetUserTimeChangeFlagClearTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryAllHistoryTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryAllHistoryTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryAllHistoryTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryAllHistoryTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBasalTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBasalTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBasalTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBasalTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBloodGlucoseTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBloodGlucoseTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBloodGlucoseTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBloodGlucoseTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBolusTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBolusTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBolusTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBolusTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryCarbohydrateTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryCarbohydrateTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryCarbohydrateTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryCarbohydrateTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryDailyTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryDailyTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryDailyTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryDailyTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryPrimeTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryPrimeTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryPrimeTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryPrimeTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryRefillTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryRefillTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryRefillTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryRefillTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistorySuspendTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistorySuspendTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistorySuspendTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistorySuspendTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryTemporaryTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryTemporaryTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryTemporaryTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryTemporaryTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyMissedBolusAlarmTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyMissedBolusAlarmTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyMissedBolusAlarmTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyMissedBolusAlarmTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetPumpTimeTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetPumpTimeTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetPumpTimeTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetPumpTimeTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetUserOptionTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetUserOptionTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetUserOptionTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetUserOptionTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionSetPumpTimeTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionSetPumpTimeTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionSetPumpTimeTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionSetPumpTimeTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewBolusAvgTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewBolusAvgTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewBolusAvgTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewBolusAvgTest.kt diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewGetPumpDecRatioTest.kt b/pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewGetPumpDecRatioTest.kt similarity index 100% rename from danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewGetPumpDecRatioTest.kt rename to pump/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewGetPumpDecRatioTest.kt diff --git a/diaconn/build.gradle b/pump/diaconn/build.gradle similarity index 100% rename from diaconn/build.gradle rename to pump/diaconn/build.gradle diff --git a/diaconn/consumer-rules.pro b/pump/diaconn/consumer-rules.pro similarity index 100% rename from diaconn/consumer-rules.pro rename to pump/diaconn/consumer-rules.pro diff --git a/diaconn/proguard-rules.pro b/pump/diaconn/proguard-rules.pro similarity index 100% rename from diaconn/proguard-rules.pro rename to pump/diaconn/proguard-rules.pro diff --git a/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json b/pump/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json similarity index 100% rename from diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json rename to pump/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json diff --git a/diaconn/src/main/AndroidManifest.xml b/pump/diaconn/src/main/AndroidManifest.xml similarity index 100% rename from diaconn/src/main/AndroidManifest.xml rename to pump/diaconn/src/main/AndroidManifest.xml diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiResponse.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiResponse.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiResponse.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiResponse.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiService.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiService.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiService.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnApiService.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnLogUploader.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnLogUploader.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnLogUploader.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/api/DiaconnLogUploader.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnLogUploaderModule.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnLogUploaderModule.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnLogUploaderModule.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnLogUploaderModule.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8PumpLogReset.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8PumpLogReset.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8PumpLogReset.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8PumpLogReset.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SerialNumInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt b/pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt similarity index 100% rename from diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt rename to pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml b/pump/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml similarity index 100% rename from diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml rename to pump/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml b/pump/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml similarity index 100% rename from diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml rename to pump/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml diff --git a/diaconn/src/main/res/layout/diaconn_g8_fragment.xml b/pump/diaconn/src/main/res/layout/diaconn_g8_fragment.xml similarity index 100% rename from diaconn/src/main/res/layout/diaconn_g8_fragment.xml rename to pump/diaconn/src/main/res/layout/diaconn_g8_fragment.xml diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml b/pump/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml similarity index 100% rename from diaconn/src/main/res/layout/diaconn_g8_history_activity.xml rename to pump/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml b/pump/diaconn/src/main/res/layout/diaconn_g8_history_item.xml similarity index 100% rename from diaconn/src/main/res/layout/diaconn_g8_history_item.xml rename to pump/diaconn/src/main/res/layout/diaconn_g8_history_item.xml diff --git a/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml b/pump/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml similarity index 100% rename from diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml rename to pump/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml diff --git a/diaconn/src/main/res/values-af-rZA/strings.xml b/pump/diaconn/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from diaconn/src/main/res/values-af-rZA/strings.xml rename to pump/diaconn/src/main/res/values-af-rZA/strings.xml diff --git a/diaconn/src/main/res/values-bg-rBG/strings.xml b/pump/diaconn/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from diaconn/src/main/res/values-bg-rBG/strings.xml rename to pump/diaconn/src/main/res/values-bg-rBG/strings.xml diff --git a/diaconn/src/main/res/values-ca-rES/strings.xml b/pump/diaconn/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from diaconn/src/main/res/values-ca-rES/strings.xml rename to pump/diaconn/src/main/res/values-ca-rES/strings.xml diff --git a/diaconn/src/main/res/values-cs-rCZ/strings.xml b/pump/diaconn/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from diaconn/src/main/res/values-cs-rCZ/strings.xml rename to pump/diaconn/src/main/res/values-cs-rCZ/strings.xml diff --git a/diaconn/src/main/res/values-da-rDK/strings.xml b/pump/diaconn/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from diaconn/src/main/res/values-da-rDK/strings.xml rename to pump/diaconn/src/main/res/values-da-rDK/strings.xml diff --git a/diaconn/src/main/res/values-de-rDE/strings.xml b/pump/diaconn/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from diaconn/src/main/res/values-de-rDE/strings.xml rename to pump/diaconn/src/main/res/values-de-rDE/strings.xml diff --git a/diaconn/src/main/res/values-el-rGR/strings.xml b/pump/diaconn/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from diaconn/src/main/res/values-el-rGR/strings.xml rename to pump/diaconn/src/main/res/values-el-rGR/strings.xml diff --git a/diaconn/src/main/res/values-es-rES/strings.xml b/pump/diaconn/src/main/res/values-es-rES/strings.xml similarity index 100% rename from diaconn/src/main/res/values-es-rES/strings.xml rename to pump/diaconn/src/main/res/values-es-rES/strings.xml diff --git a/diaconn/src/main/res/values-fr-rFR/strings.xml b/pump/diaconn/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from diaconn/src/main/res/values-fr-rFR/strings.xml rename to pump/diaconn/src/main/res/values-fr-rFR/strings.xml diff --git a/diaconn/src/main/res/values-ga-rIE/strings.xml b/pump/diaconn/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from diaconn/src/main/res/values-ga-rIE/strings.xml rename to pump/diaconn/src/main/res/values-ga-rIE/strings.xml diff --git a/diaconn/src/main/res/values-hr-rHR/strings.xml b/pump/diaconn/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from diaconn/src/main/res/values-hr-rHR/strings.xml rename to pump/diaconn/src/main/res/values-hr-rHR/strings.xml diff --git a/diaconn/src/main/res/values-hu-rHU/strings.xml b/pump/diaconn/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from diaconn/src/main/res/values-hu-rHU/strings.xml rename to pump/diaconn/src/main/res/values-hu-rHU/strings.xml diff --git a/diaconn/src/main/res/values-it-rIT/strings.xml b/pump/diaconn/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from diaconn/src/main/res/values-it-rIT/strings.xml rename to pump/diaconn/src/main/res/values-it-rIT/strings.xml diff --git a/diaconn/src/main/res/values-iw-rIL/strings.xml b/pump/diaconn/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from diaconn/src/main/res/values-iw-rIL/strings.xml rename to pump/diaconn/src/main/res/values-iw-rIL/strings.xml diff --git a/diaconn/src/main/res/values-ko-rKR/strings.xml b/pump/diaconn/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from diaconn/src/main/res/values-ko-rKR/strings.xml rename to pump/diaconn/src/main/res/values-ko-rKR/strings.xml diff --git a/diaconn/src/main/res/values-lt-rLT/strings.xml b/pump/diaconn/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from diaconn/src/main/res/values-lt-rLT/strings.xml rename to pump/diaconn/src/main/res/values-lt-rLT/strings.xml diff --git a/diaconn/src/main/res/values-nl-rNL/strings.xml b/pump/diaconn/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from diaconn/src/main/res/values-nl-rNL/strings.xml rename to pump/diaconn/src/main/res/values-nl-rNL/strings.xml diff --git a/diaconn/src/main/res/values-no-rNO/strings.xml b/pump/diaconn/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from diaconn/src/main/res/values-no-rNO/strings.xml rename to pump/diaconn/src/main/res/values-no-rNO/strings.xml diff --git a/diaconn/src/main/res/values-pl-rPL/strings.xml b/pump/diaconn/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from diaconn/src/main/res/values-pl-rPL/strings.xml rename to pump/diaconn/src/main/res/values-pl-rPL/strings.xml diff --git a/diaconn/src/main/res/values-pt-rBR/strings.xml b/pump/diaconn/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from diaconn/src/main/res/values-pt-rBR/strings.xml rename to pump/diaconn/src/main/res/values-pt-rBR/strings.xml diff --git a/diaconn/src/main/res/values-pt-rPT/strings.xml b/pump/diaconn/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from diaconn/src/main/res/values-pt-rPT/strings.xml rename to pump/diaconn/src/main/res/values-pt-rPT/strings.xml diff --git a/diaconn/src/main/res/values-ro-rRO/strings.xml b/pump/diaconn/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from diaconn/src/main/res/values-ro-rRO/strings.xml rename to pump/diaconn/src/main/res/values-ro-rRO/strings.xml diff --git a/diaconn/src/main/res/values-ru-rRU/strings.xml b/pump/diaconn/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from diaconn/src/main/res/values-ru-rRU/strings.xml rename to pump/diaconn/src/main/res/values-ru-rRU/strings.xml diff --git a/diaconn/src/main/res/values-sk-rSK/strings.xml b/pump/diaconn/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from diaconn/src/main/res/values-sk-rSK/strings.xml rename to pump/diaconn/src/main/res/values-sk-rSK/strings.xml diff --git a/diaconn/src/main/res/values-sl-rSI/strings.xml b/pump/diaconn/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from diaconn/src/main/res/values-sl-rSI/strings.xml rename to pump/diaconn/src/main/res/values-sl-rSI/strings.xml diff --git a/diaconn/src/main/res/values-sr-rCS/strings.xml b/pump/diaconn/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from diaconn/src/main/res/values-sr-rCS/strings.xml rename to pump/diaconn/src/main/res/values-sr-rCS/strings.xml diff --git a/diaconn/src/main/res/values-sv-rSE/strings.xml b/pump/diaconn/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from diaconn/src/main/res/values-sv-rSE/strings.xml rename to pump/diaconn/src/main/res/values-sv-rSE/strings.xml diff --git a/diaconn/src/main/res/values-ta-rIN/strings.xml b/pump/diaconn/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from diaconn/src/main/res/values-ta-rIN/strings.xml rename to pump/diaconn/src/main/res/values-ta-rIN/strings.xml diff --git a/diaconn/src/main/res/values-tr-rTR/strings.xml b/pump/diaconn/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from diaconn/src/main/res/values-tr-rTR/strings.xml rename to pump/diaconn/src/main/res/values-tr-rTR/strings.xml diff --git a/diaconn/src/main/res/values-zh-rCN/strings.xml b/pump/diaconn/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from diaconn/src/main/res/values-zh-rCN/strings.xml rename to pump/diaconn/src/main/res/values-zh-rCN/strings.xml diff --git a/diaconn/src/main/res/values/arrays.xml b/pump/diaconn/src/main/res/values/arrays.xml similarity index 100% rename from diaconn/src/main/res/values/arrays.xml rename to pump/diaconn/src/main/res/values/arrays.xml diff --git a/diaconn/src/main/res/values/colors.xml b/pump/diaconn/src/main/res/values/colors.xml similarity index 100% rename from diaconn/src/main/res/values/colors.xml rename to pump/diaconn/src/main/res/values/colors.xml diff --git a/diaconn/src/main/res/values/ids.xml b/pump/diaconn/src/main/res/values/ids.xml similarity index 100% rename from diaconn/src/main/res/values/ids.xml rename to pump/diaconn/src/main/res/values/ids.xml diff --git a/diaconn/src/main/res/values/strings.xml b/pump/diaconn/src/main/res/values/strings.xml similarity index 100% rename from diaconn/src/main/res/values/strings.xml rename to pump/diaconn/src/main/res/values/strings.xml diff --git a/diaconn/src/main/res/xml/pref_diaconn.xml b/pump/diaconn/src/main/res/xml/pref_diaconn.xml similarity index 100% rename from diaconn/src/main/res/xml/pref_diaconn.xml rename to pump/diaconn/src/main/res/xml/pref_diaconn.xml diff --git a/medtronic/.gitignore b/pump/medtronic/.gitignore similarity index 100% rename from medtronic/.gitignore rename to pump/medtronic/.gitignore diff --git a/medtronic/Changelog.txt b/pump/medtronic/Changelog.txt similarity index 100% rename from medtronic/Changelog.txt rename to pump/medtronic/Changelog.txt diff --git a/medtronic/build.gradle b/pump/medtronic/build.gradle similarity index 87% rename from medtronic/build.gradle rename to pump/medtronic/build.gradle index 525dd93b52..9d8ba7a41d 100644 --- a/medtronic/build.gradle +++ b/pump/medtronic/build.gradle @@ -14,8 +14,8 @@ android { dependencies { implementation project(':libraries') - implementation project(':core') - implementation project(':pump-common') - implementation project(':rileylink') implementation project(':shared') + implementation project(':core') + implementation project(':pump:pump-common') + implementation project(':pump:rileylink') } diff --git a/medtronic/consumer-rules.pro b/pump/medtronic/consumer-rules.pro similarity index 100% rename from medtronic/consumer-rules.pro rename to pump/medtronic/consumer-rules.pro diff --git a/medtronic/proguard-rules.pro b/pump/medtronic/proguard-rules.pro similarity index 100% rename from medtronic/proguard-rules.pro rename to pump/medtronic/proguard-rules.pro diff --git a/medtronic/src/main/AndroidManifest.xml b/pump/medtronic/src/main/AndroidManifest.xml similarity index 100% rename from medtronic/src/main/AndroidManifest.xml rename to pump/medtronic/src/main/AndroidManifest.xml diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt old mode 100755 new mode 100644 similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt similarity index 100% rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt rename to pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt diff --git a/medtronic/src/main/res/drawable/ic_medtronic_veo.xml b/pump/medtronic/src/main/res/drawable/ic_medtronic_veo.xml similarity index 100% rename from medtronic/src/main/res/drawable/ic_medtronic_veo.xml rename to pump/medtronic/src/main/res/drawable/ic_medtronic_veo.xml diff --git a/medtronic/src/main/res/layout/medtronic_fragment.xml b/pump/medtronic/src/main/res/layout/medtronic_fragment.xml similarity index 100% rename from medtronic/src/main/res/layout/medtronic_fragment.xml rename to pump/medtronic/src/main/res/layout/medtronic_fragment.xml diff --git a/medtronic/src/main/res/layout/medtronic_history_activity.xml b/pump/medtronic/src/main/res/layout/medtronic_history_activity.xml similarity index 100% rename from medtronic/src/main/res/layout/medtronic_history_activity.xml rename to pump/medtronic/src/main/res/layout/medtronic_history_activity.xml diff --git a/medtronic/src/main/res/layout/medtronic_history_item.xml b/pump/medtronic/src/main/res/layout/medtronic_history_item.xml similarity index 100% rename from medtronic/src/main/res/layout/medtronic_history_item.xml rename to pump/medtronic/src/main/res/layout/medtronic_history_item.xml diff --git a/medtronic/src/main/res/values-af-rZA/strings.xml b/pump/medtronic/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from medtronic/src/main/res/values-af-rZA/strings.xml rename to pump/medtronic/src/main/res/values-af-rZA/strings.xml diff --git a/medtronic/src/main/res/values-ar-rSA/strings.xml b/pump/medtronic/src/main/res/values-ar-rSA/strings.xml similarity index 100% rename from medtronic/src/main/res/values-ar-rSA/strings.xml rename to pump/medtronic/src/main/res/values-ar-rSA/strings.xml diff --git a/medtronic/src/main/res/values-bg-rBG/strings.xml b/pump/medtronic/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from medtronic/src/main/res/values-bg-rBG/strings.xml rename to pump/medtronic/src/main/res/values-bg-rBG/strings.xml diff --git a/medtronic/src/main/res/values-ca-rES/strings.xml b/pump/medtronic/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from medtronic/src/main/res/values-ca-rES/strings.xml rename to pump/medtronic/src/main/res/values-ca-rES/strings.xml diff --git a/medtronic/src/main/res/values-cs-rCZ/strings.xml b/pump/medtronic/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from medtronic/src/main/res/values-cs-rCZ/strings.xml rename to pump/medtronic/src/main/res/values-cs-rCZ/strings.xml diff --git a/medtronic/src/main/res/values-cy-rGB/strings.xml b/pump/medtronic/src/main/res/values-cy-rGB/strings.xml similarity index 100% rename from medtronic/src/main/res/values-cy-rGB/strings.xml rename to pump/medtronic/src/main/res/values-cy-rGB/strings.xml diff --git a/medtronic/src/main/res/values-da-rDK/strings.xml b/pump/medtronic/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from medtronic/src/main/res/values-da-rDK/strings.xml rename to pump/medtronic/src/main/res/values-da-rDK/strings.xml diff --git a/medtronic/src/main/res/values-de-rDE/strings.xml b/pump/medtronic/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from medtronic/src/main/res/values-de-rDE/strings.xml rename to pump/medtronic/src/main/res/values-de-rDE/strings.xml diff --git a/medtronic/src/main/res/values-el-rGR/strings.xml b/pump/medtronic/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from medtronic/src/main/res/values-el-rGR/strings.xml rename to pump/medtronic/src/main/res/values-el-rGR/strings.xml diff --git a/medtronic/src/main/res/values-es-rES/strings.xml b/pump/medtronic/src/main/res/values-es-rES/strings.xml similarity index 100% rename from medtronic/src/main/res/values-es-rES/strings.xml rename to pump/medtronic/src/main/res/values-es-rES/strings.xml diff --git a/medtronic/src/main/res/values-fi-rFI/strings.xml b/pump/medtronic/src/main/res/values-fi-rFI/strings.xml similarity index 100% rename from medtronic/src/main/res/values-fi-rFI/strings.xml rename to pump/medtronic/src/main/res/values-fi-rFI/strings.xml diff --git a/medtronic/src/main/res/values-fr-rFR/strings.xml b/pump/medtronic/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from medtronic/src/main/res/values-fr-rFR/strings.xml rename to pump/medtronic/src/main/res/values-fr-rFR/strings.xml diff --git a/medtronic/src/main/res/values-ga-rIE/strings.xml b/pump/medtronic/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from medtronic/src/main/res/values-ga-rIE/strings.xml rename to pump/medtronic/src/main/res/values-ga-rIE/strings.xml diff --git a/medtronic/src/main/res/values-hr-rHR/strings.xml b/pump/medtronic/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from medtronic/src/main/res/values-hr-rHR/strings.xml rename to pump/medtronic/src/main/res/values-hr-rHR/strings.xml diff --git a/medtronic/src/main/res/values-hu-rHU/strings.xml b/pump/medtronic/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from medtronic/src/main/res/values-hu-rHU/strings.xml rename to pump/medtronic/src/main/res/values-hu-rHU/strings.xml diff --git a/medtronic/src/main/res/values-it-rIT/strings.xml b/pump/medtronic/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from medtronic/src/main/res/values-it-rIT/strings.xml rename to pump/medtronic/src/main/res/values-it-rIT/strings.xml diff --git a/medtronic/src/main/res/values-iw-rIL/strings.xml b/pump/medtronic/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from medtronic/src/main/res/values-iw-rIL/strings.xml rename to pump/medtronic/src/main/res/values-iw-rIL/strings.xml diff --git a/medtronic/src/main/res/values-ko-rKR/strings.xml b/pump/medtronic/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from medtronic/src/main/res/values-ko-rKR/strings.xml rename to pump/medtronic/src/main/res/values-ko-rKR/strings.xml diff --git a/medtronic/src/main/res/values-lt-rLT/strings.xml b/pump/medtronic/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from medtronic/src/main/res/values-lt-rLT/strings.xml rename to pump/medtronic/src/main/res/values-lt-rLT/strings.xml diff --git a/medtronic/src/main/res/values-nl-rNL/strings.xml b/pump/medtronic/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from medtronic/src/main/res/values-nl-rNL/strings.xml rename to pump/medtronic/src/main/res/values-nl-rNL/strings.xml diff --git a/medtronic/src/main/res/values-no-rNO/strings.xml b/pump/medtronic/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from medtronic/src/main/res/values-no-rNO/strings.xml rename to pump/medtronic/src/main/res/values-no-rNO/strings.xml diff --git a/medtronic/src/main/res/values-pl-rPL/strings.xml b/pump/medtronic/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from medtronic/src/main/res/values-pl-rPL/strings.xml rename to pump/medtronic/src/main/res/values-pl-rPL/strings.xml diff --git a/medtronic/src/main/res/values-pt-rBR/strings.xml b/pump/medtronic/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from medtronic/src/main/res/values-pt-rBR/strings.xml rename to pump/medtronic/src/main/res/values-pt-rBR/strings.xml diff --git a/medtronic/src/main/res/values-pt-rPT/strings.xml b/pump/medtronic/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from medtronic/src/main/res/values-pt-rPT/strings.xml rename to pump/medtronic/src/main/res/values-pt-rPT/strings.xml diff --git a/medtronic/src/main/res/values-ro-rRO/strings.xml b/pump/medtronic/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from medtronic/src/main/res/values-ro-rRO/strings.xml rename to pump/medtronic/src/main/res/values-ro-rRO/strings.xml diff --git a/medtronic/src/main/res/values-ru-rRU/strings.xml b/pump/medtronic/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from medtronic/src/main/res/values-ru-rRU/strings.xml rename to pump/medtronic/src/main/res/values-ru-rRU/strings.xml diff --git a/medtronic/src/main/res/values-sk-rSK/strings.xml b/pump/medtronic/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from medtronic/src/main/res/values-sk-rSK/strings.xml rename to pump/medtronic/src/main/res/values-sk-rSK/strings.xml diff --git a/medtronic/src/main/res/values-sl-rSI/strings.xml b/pump/medtronic/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from medtronic/src/main/res/values-sl-rSI/strings.xml rename to pump/medtronic/src/main/res/values-sl-rSI/strings.xml diff --git a/medtronic/src/main/res/values-sr-rCS/strings.xml b/pump/medtronic/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from medtronic/src/main/res/values-sr-rCS/strings.xml rename to pump/medtronic/src/main/res/values-sr-rCS/strings.xml diff --git a/medtronic/src/main/res/values-sv-rSE/strings.xml b/pump/medtronic/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from medtronic/src/main/res/values-sv-rSE/strings.xml rename to pump/medtronic/src/main/res/values-sv-rSE/strings.xml diff --git a/medtronic/src/main/res/values-ta-rIN/strings.xml b/pump/medtronic/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from medtronic/src/main/res/values-ta-rIN/strings.xml rename to pump/medtronic/src/main/res/values-ta-rIN/strings.xml diff --git a/medtronic/src/main/res/values-tr-rTR/strings.xml b/pump/medtronic/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from medtronic/src/main/res/values-tr-rTR/strings.xml rename to pump/medtronic/src/main/res/values-tr-rTR/strings.xml diff --git a/medtronic/src/main/res/values-zh-rCN/strings.xml b/pump/medtronic/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from medtronic/src/main/res/values-zh-rCN/strings.xml rename to pump/medtronic/src/main/res/values-zh-rCN/strings.xml diff --git a/medtronic/src/main/res/values/arrays.xml b/pump/medtronic/src/main/res/values/arrays.xml similarity index 100% rename from medtronic/src/main/res/values/arrays.xml rename to pump/medtronic/src/main/res/values/arrays.xml diff --git a/medtronic/src/main/res/values/strings.xml b/pump/medtronic/src/main/res/values/strings.xml similarity index 100% rename from medtronic/src/main/res/values/strings.xml rename to pump/medtronic/src/main/res/values/strings.xml diff --git a/medtronic/src/main/res/xml/pref_medtronic.xml b/pump/medtronic/src/main/res/xml/pref_medtronic.xml similarity index 100% rename from medtronic/src/main/res/xml/pref_medtronic.xml rename to pump/medtronic/src/main/res/xml/pref_medtronic.xml diff --git a/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt similarity index 100% rename from medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt rename to pump/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java similarity index 100% rename from medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java rename to pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt similarity index 100% rename from medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt rename to pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt similarity index 100% rename from medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt rename to pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java similarity index 100% rename from medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java rename to pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt similarity index 100% rename from medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt rename to pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java similarity index 100% rename from medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java rename to pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java diff --git a/medtronic/src/test/resources/tbr_1724.json b/pump/medtronic/src/test/resources/tbr_1724.json similarity index 100% rename from medtronic/src/test/resources/tbr_1724.json rename to pump/medtronic/src/test/resources/tbr_1724.json diff --git a/medtronic/src/test/resources/tbr_data.json b/pump/medtronic/src/test/resources/tbr_data.json similarity index 100% rename from medtronic/src/test/resources/tbr_data.json rename to pump/medtronic/src/test/resources/tbr_data.json diff --git a/medtronic/src/test/resources/tbr_data_special.json b/pump/medtronic/src/test/resources/tbr_data_special.json similarity index 100% rename from medtronic/src/test/resources/tbr_data_special.json rename to pump/medtronic/src/test/resources/tbr_data_special.json diff --git a/omnipod-common/.gitignore b/pump/omnipod-common/.gitignore similarity index 100% rename from omnipod-common/.gitignore rename to pump/omnipod-common/.gitignore diff --git a/omnipod-common/build.gradle b/pump/omnipod-common/build.gradle similarity index 100% rename from omnipod-common/build.gradle rename to pump/omnipod-common/build.gradle diff --git a/omnipod-common/consumer-rules.pro b/pump/omnipod-common/consumer-rules.pro similarity index 100% rename from omnipod-common/consumer-rules.pro rename to pump/omnipod-common/consumer-rules.pro diff --git a/omnipod-common/proguard-rules.pro b/pump/omnipod-common/proguard-rules.pro similarity index 100% rename from omnipod-common/proguard-rules.pro rename to pump/omnipod-common/proguard-rules.pro diff --git a/omnipod-common/src/main/AndroidManifest.xml b/pump/omnipod-common/src/main/AndroidManifest.xml similarity index 100% rename from omnipod-common/src/main/AndroidManifest.xml rename to pump/omnipod-common/src/main/AndroidManifest.xml diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/definition/OmnipodCommandType.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodInjectHelpers.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodInjectHelpers.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodInjectHelpers.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodInjectHelpers.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodWizardModule.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodWizardModule.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodWizardModule.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/di/OmnipodWizardModule.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDeactivatePod.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDeactivatePod.java similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDeactivatePod.java rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDeactivatePod.java diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDisableSuspendAlerts.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDisableSuspendAlerts.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDisableSuspendAlerts.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandDisableSuspendAlerts.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandHandleTimeChange.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandHandleTimeChange.java similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandHandleTimeChange.java rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandHandleTimeChange.java diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandPlayTestBeep.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandPlayTestBeep.java similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandPlayTestBeep.java rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandPlayTestBeep.java diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandResumeDelivery.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandResumeDelivery.java similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandResumeDelivery.java rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandResumeDelivery.java diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSuspendDelivery.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSuspendDelivery.java similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSuspendDelivery.java rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSuspendDelivery.java diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandUpdateAlertConfiguration.java b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandUpdateAlertConfiguration.java similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandUpdateAlertConfiguration.java rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandUpdateAlertConfiguration.java diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/PodActivationWizardActivity.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/PodActivationWizardActivity.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/PodActivationWizardActivity.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/PodActivationWizardActivity.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InitializePodFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InitializePodFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InitializePodFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InitializePodFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InsertCannulaFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InsertCannulaFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InsertCannulaFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/InsertCannulaFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/PodActivationActionFragmentBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/PodActivationActionFragmentBase.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/PodActivationActionFragmentBase.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/PodActivationActionFragmentBase.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/PodActivatedFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/PodActivatedFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/PodActivatedFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/PodActivatedFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/StartPodActivationFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/StartPodActivationFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/StartPodActivationFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/StartPodActivationFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/AttachPodViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/AttachPodViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/AttachPodViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/AttachPodViewModel.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/PodActivatedViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/PodActivatedViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/PodActivatedViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/PodActivatedViewModel.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/StartPodActivationViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/StartPodActivationViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/StartPodActivationViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/info/StartPodActivationViewModel.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/InfoFragmentBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/InfoFragmentBase.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/InfoFragmentBase.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/InfoFragmentBase.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ViewModelBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ViewModelBase.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ViewModelBase.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ViewModelBase.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/PodDeactivationWizardActivity.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/PodDeactivationWizardActivity.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/PodDeactivationWizardActivity.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/PodDeactivationWizardActivity.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDeactivatedFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDeactivatedFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDeactivatedFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDeactivatedFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDiscardedFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDiscardedFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDiscardedFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/PodDiscardedFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/StartPodDeactivationFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/StartPodDeactivationFragment.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/StartPodDeactivationFragment.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/info/StartPodDeactivationFragment.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/PodDeactivatedViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/PodDeactivatedViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/PodDeactivatedViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/PodDeactivatedViewModel.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/PodDiscardedViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/PodDiscardedViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/PodDiscardedViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/PodDiscardedViewModel.kt diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/StartPodDeactivationViewModel.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/StartPodDeactivationViewModel.kt similarity index 100% rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/StartPodDeactivationViewModel.kt rename to pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/info/StartPodDeactivationViewModel.kt diff --git a/omnipod-common/src/main/res/drawable/ic_omnipod_overview_pod_management.xml b/pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_pod_management.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_omnipod_overview_pod_management.xml rename to pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_pod_management.xml diff --git a/omnipod-common/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml b/pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml rename to pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml diff --git a/omnipod-common/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml b/pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml rename to pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml diff --git a/omnipod-common/src/main/res/drawable/ic_omnipod_overview_set_time.xml b/pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_set_time.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_omnipod_overview_set_time.xml rename to pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_set_time.xml diff --git a/omnipod-common/src/main/res/drawable/ic_omnipod_overview_silence_alerts.xml b/pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_silence_alerts.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_omnipod_overview_silence_alerts.xml rename to pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_silence_alerts.xml diff --git a/omnipod-common/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml b/pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml rename to pump/omnipod-common/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml diff --git a/omnipod-common/src/main/res/drawable/ic_omnipod_wizard_success.xml b/pump/omnipod-common/src/main/res/drawable/ic_omnipod_wizard_success.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_omnipod_wizard_success.xml rename to pump/omnipod-common/src/main/res/drawable/ic_omnipod_wizard_success.xml diff --git a/omnipod-common/src/main/res/drawable/ic_pod.xml b/pump/omnipod-common/src/main/res/drawable/ic_pod.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_pod.xml rename to pump/omnipod-common/src/main/res/drawable/ic_pod.xml diff --git a/omnipod-common/src/main/res/drawable/ic_pod_management_activate_pod.xml b/pump/omnipod-common/src/main/res/drawable/ic_pod_management_activate_pod.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_pod_management_activate_pod.xml rename to pump/omnipod-common/src/main/res/drawable/ic_pod_management_activate_pod.xml diff --git a/omnipod-common/src/main/res/drawable/ic_pod_management_deactivate_pod.xml b/pump/omnipod-common/src/main/res/drawable/ic_pod_management_deactivate_pod.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_pod_management_deactivate_pod.xml rename to pump/omnipod-common/src/main/res/drawable/ic_pod_management_deactivate_pod.xml diff --git a/omnipod-common/src/main/res/drawable/ic_pod_management_discard_pod.xml b/pump/omnipod-common/src/main/res/drawable/ic_pod_management_discard_pod.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_pod_management_discard_pod.xml rename to pump/omnipod-common/src/main/res/drawable/ic_pod_management_discard_pod.xml diff --git a/omnipod-common/src/main/res/drawable/ic_pod_management_play_test_beep.xml b/pump/omnipod-common/src/main/res/drawable/ic_pod_management_play_test_beep.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_pod_management_play_test_beep.xml rename to pump/omnipod-common/src/main/res/drawable/ic_pod_management_play_test_beep.xml diff --git a/omnipod-common/src/main/res/drawable/ic_pod_management_pod_history.xml b/pump/omnipod-common/src/main/res/drawable/ic_pod_management_pod_history.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_pod_management_pod_history.xml rename to pump/omnipod-common/src/main/res/drawable/ic_pod_management_pod_history.xml diff --git a/omnipod-common/src/main/res/drawable/ic_pod_management_pulse_log.xml b/pump/omnipod-common/src/main/res/drawable/ic_pod_management_pulse_log.xml similarity index 100% rename from omnipod-common/src/main/res/drawable/ic_pod_management_pulse_log.xml rename to pump/omnipod-common/src/main/res/drawable/ic_pod_management_pulse_log.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_overview_buttons.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_overview_buttons.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_overview_buttons.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_overview_buttons.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_pod_activation_wizard_activity.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_pod_activation_wizard_activity.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_pod_activation_wizard_activity.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_pod_activation_wizard_activity.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_pod_deactivation_wizard_activity.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_pod_deactivation_wizard_activity.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_pod_deactivation_wizard_activity.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_pod_deactivation_wizard_activity.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_wizard_action_page_fragment.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_action_page_fragment.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_wizard_action_page_fragment.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_action_page_fragment.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_wizard_base_fragment.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_base_fragment.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_wizard_base_fragment.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_base_fragment.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_wizard_info_page_fragment.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_info_page_fragment.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_wizard_info_page_fragment.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_info_page_fragment.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_wizard_nav_buttons.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_nav_buttons.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_wizard_nav_buttons.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_nav_buttons.xml diff --git a/omnipod-common/src/main/res/layout/omnipod_common_wizard_progress_indication.xml b/pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_progress_indication.xml similarity index 100% rename from omnipod-common/src/main/res/layout/omnipod_common_wizard_progress_indication.xml rename to pump/omnipod-common/src/main/res/layout/omnipod_common_wizard_progress_indication.xml diff --git a/omnipod-common/src/main/res/navigation/omnipod_common_pod_activation_wizard_navigation_graph.xml b/pump/omnipod-common/src/main/res/navigation/omnipod_common_pod_activation_wizard_navigation_graph.xml similarity index 100% rename from omnipod-common/src/main/res/navigation/omnipod_common_pod_activation_wizard_navigation_graph.xml rename to pump/omnipod-common/src/main/res/navigation/omnipod_common_pod_activation_wizard_navigation_graph.xml diff --git a/omnipod-common/src/main/res/navigation/omnipod_common_pod_deactivation_wizard_navigation_graph.xml b/pump/omnipod-common/src/main/res/navigation/omnipod_common_pod_deactivation_wizard_navigation_graph.xml similarity index 100% rename from omnipod-common/src/main/res/navigation/omnipod_common_pod_deactivation_wizard_navigation_graph.xml rename to pump/omnipod-common/src/main/res/navigation/omnipod_common_pod_deactivation_wizard_navigation_graph.xml diff --git a/omnipod-common/src/main/res/values-af-rZA/strings.xml b/pump/omnipod-common/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-af-rZA/strings.xml rename to pump/omnipod-common/src/main/res/values-af-rZA/strings.xml diff --git a/omnipod-common/src/main/res/values-bg-rBG/strings.xml b/pump/omnipod-common/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-bg-rBG/strings.xml rename to pump/omnipod-common/src/main/res/values-bg-rBG/strings.xml diff --git a/omnipod-common/src/main/res/values-ca-rES/strings.xml b/pump/omnipod-common/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-ca-rES/strings.xml rename to pump/omnipod-common/src/main/res/values-ca-rES/strings.xml diff --git a/omnipod-common/src/main/res/values-cs-rCZ/strings.xml b/pump/omnipod-common/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-cs-rCZ/strings.xml rename to pump/omnipod-common/src/main/res/values-cs-rCZ/strings.xml diff --git a/omnipod-common/src/main/res/values-da-rDK/strings.xml b/pump/omnipod-common/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-da-rDK/strings.xml rename to pump/omnipod-common/src/main/res/values-da-rDK/strings.xml diff --git a/omnipod-common/src/main/res/values-de-rDE/strings.xml b/pump/omnipod-common/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-de-rDE/strings.xml rename to pump/omnipod-common/src/main/res/values-de-rDE/strings.xml diff --git a/omnipod-common/src/main/res/values-el-rGR/strings.xml b/pump/omnipod-common/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-el-rGR/strings.xml rename to pump/omnipod-common/src/main/res/values-el-rGR/strings.xml diff --git a/omnipod-common/src/main/res/values-es-rES/strings.xml b/pump/omnipod-common/src/main/res/values-es-rES/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-es-rES/strings.xml rename to pump/omnipod-common/src/main/res/values-es-rES/strings.xml diff --git a/omnipod-common/src/main/res/values-fr-rFR/strings.xml b/pump/omnipod-common/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-fr-rFR/strings.xml rename to pump/omnipod-common/src/main/res/values-fr-rFR/strings.xml diff --git a/omnipod-common/src/main/res/values-ga-rIE/strings.xml b/pump/omnipod-common/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-ga-rIE/strings.xml rename to pump/omnipod-common/src/main/res/values-ga-rIE/strings.xml diff --git a/omnipod-common/src/main/res/values-hr-rHR/strings.xml b/pump/omnipod-common/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-hr-rHR/strings.xml rename to pump/omnipod-common/src/main/res/values-hr-rHR/strings.xml diff --git a/omnipod-common/src/main/res/values-hu-rHU/strings.xml b/pump/omnipod-common/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-hu-rHU/strings.xml rename to pump/omnipod-common/src/main/res/values-hu-rHU/strings.xml diff --git a/omnipod-common/src/main/res/values-it-rIT/strings.xml b/pump/omnipod-common/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-it-rIT/strings.xml rename to pump/omnipod-common/src/main/res/values-it-rIT/strings.xml diff --git a/omnipod-common/src/main/res/values-iw-rIL/strings.xml b/pump/omnipod-common/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-iw-rIL/strings.xml rename to pump/omnipod-common/src/main/res/values-iw-rIL/strings.xml diff --git a/omnipod-common/src/main/res/values-ko-rKR/strings.xml b/pump/omnipod-common/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-ko-rKR/strings.xml rename to pump/omnipod-common/src/main/res/values-ko-rKR/strings.xml diff --git a/omnipod-common/src/main/res/values-lt-rLT/strings.xml b/pump/omnipod-common/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-lt-rLT/strings.xml rename to pump/omnipod-common/src/main/res/values-lt-rLT/strings.xml diff --git a/omnipod-common/src/main/res/values-nl-rNL/strings.xml b/pump/omnipod-common/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-nl-rNL/strings.xml rename to pump/omnipod-common/src/main/res/values-nl-rNL/strings.xml diff --git a/omnipod-common/src/main/res/values-no-rNO/strings.xml b/pump/omnipod-common/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-no-rNO/strings.xml rename to pump/omnipod-common/src/main/res/values-no-rNO/strings.xml diff --git a/omnipod-common/src/main/res/values-pl-rPL/strings.xml b/pump/omnipod-common/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-pl-rPL/strings.xml rename to pump/omnipod-common/src/main/res/values-pl-rPL/strings.xml diff --git a/omnipod-common/src/main/res/values-pt-rBR/strings.xml b/pump/omnipod-common/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-pt-rBR/strings.xml rename to pump/omnipod-common/src/main/res/values-pt-rBR/strings.xml diff --git a/omnipod-common/src/main/res/values-pt-rPT/strings.xml b/pump/omnipod-common/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-pt-rPT/strings.xml rename to pump/omnipod-common/src/main/res/values-pt-rPT/strings.xml diff --git a/omnipod-common/src/main/res/values-ro-rRO/strings.xml b/pump/omnipod-common/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-ro-rRO/strings.xml rename to pump/omnipod-common/src/main/res/values-ro-rRO/strings.xml diff --git a/omnipod-common/src/main/res/values-ru-rRU/strings.xml b/pump/omnipod-common/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-ru-rRU/strings.xml rename to pump/omnipod-common/src/main/res/values-ru-rRU/strings.xml diff --git a/omnipod-common/src/main/res/values-sk-rSK/strings.xml b/pump/omnipod-common/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-sk-rSK/strings.xml rename to pump/omnipod-common/src/main/res/values-sk-rSK/strings.xml diff --git a/omnipod-common/src/main/res/values-sl-rSI/strings.xml b/pump/omnipod-common/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-sl-rSI/strings.xml rename to pump/omnipod-common/src/main/res/values-sl-rSI/strings.xml diff --git a/omnipod-common/src/main/res/values-sr-rCS/strings.xml b/pump/omnipod-common/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-sr-rCS/strings.xml rename to pump/omnipod-common/src/main/res/values-sr-rCS/strings.xml diff --git a/omnipod-common/src/main/res/values-sv-rSE/strings.xml b/pump/omnipod-common/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-sv-rSE/strings.xml rename to pump/omnipod-common/src/main/res/values-sv-rSE/strings.xml diff --git a/omnipod-common/src/main/res/values-ta-rIN/strings.xml b/pump/omnipod-common/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-ta-rIN/strings.xml rename to pump/omnipod-common/src/main/res/values-ta-rIN/strings.xml diff --git a/omnipod-common/src/main/res/values-tr-rTR/strings.xml b/pump/omnipod-common/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-tr-rTR/strings.xml rename to pump/omnipod-common/src/main/res/values-tr-rTR/strings.xml diff --git a/omnipod-common/src/main/res/values-zh-rCN/strings.xml b/pump/omnipod-common/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values-zh-rCN/strings.xml rename to pump/omnipod-common/src/main/res/values-zh-rCN/strings.xml diff --git a/omnipod-common/src/main/res/values/dimens.xml b/pump/omnipod-common/src/main/res/values/dimens.xml similarity index 100% rename from omnipod-common/src/main/res/values/dimens.xml rename to pump/omnipod-common/src/main/res/values/dimens.xml diff --git a/omnipod-common/src/main/res/values/strings.xml b/pump/omnipod-common/src/main/res/values/strings.xml similarity index 100% rename from omnipod-common/src/main/res/values/strings.xml rename to pump/omnipod-common/src/main/res/values/strings.xml diff --git a/omnipod-common/src/main/res/values/styles.xml b/pump/omnipod-common/src/main/res/values/styles.xml similarity index 100% rename from omnipod-common/src/main/res/values/styles.xml rename to pump/omnipod-common/src/main/res/values/styles.xml diff --git a/omnipod-dash/.gitignore b/pump/omnipod-dash/.gitignore similarity index 100% rename from omnipod-dash/.gitignore rename to pump/omnipod-dash/.gitignore diff --git a/omnipod-dash/build.gradle b/pump/omnipod-dash/build.gradle similarity index 94% rename from omnipod-dash/build.gradle rename to pump/omnipod-dash/build.gradle index 04d92e3880..2f8de56b0e 100644 --- a/omnipod-dash/build.gradle +++ b/pump/omnipod-dash/build.gradle @@ -30,12 +30,12 @@ android { } dependencies { - implementation project(':libraries') - implementation project(':core') - implementation project(':pump-common') - implementation project(':omnipod-common') implementation project(':database') implementation project(':shared') + implementation project(':libraries') + implementation project(':core') + implementation project(':pump:pump-common') + implementation project(':pump:omnipod-common') api "androidx.room:room-ktx:$room_version" api "androidx.room:room-runtime:$room_version" diff --git a/omnipod-dash/consumer-rules.pro b/pump/omnipod-dash/consumer-rules.pro similarity index 100% rename from omnipod-dash/consumer-rules.pro rename to pump/omnipod-dash/consumer-rules.pro diff --git a/omnipod-dash/detekt-config.yml b/pump/omnipod-dash/detekt-config.yml similarity index 100% rename from omnipod-dash/detekt-config.yml rename to pump/omnipod-dash/detekt-config.yml diff --git a/omnipod-dash/proguard-rules.pro b/pump/omnipod-dash/proguard-rules.pro similarity index 100% rename from omnipod-dash/proguard-rules.pro rename to pump/omnipod-dash/proguard-rules.pro diff --git a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt b/pump/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt similarity index 100% rename from omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt rename to pump/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt diff --git a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt b/pump/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt similarity index 100% rename from omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt rename to pump/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt diff --git a/omnipod-dash/src/main/AndroidManifest.xml b/pump/omnipod-dash/src/main/AndroidManifest.xml similarity index 100% rename from omnipod-dash/src/main/AndroidManifest.xml rename to pump/omnipod-dash/src/main/AndroidManifest.xml diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashHistoryModule.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashModule.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashModule.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashModule.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashModule.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashWizardViewModelsModule.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashWizardViewModelsModule.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashWizardViewModelsModule.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/di/OmnipodDashWizardViewModelsModule.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Ids.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Ids.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Ids.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Ids.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/WriteConfirmation.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/WriteConfirmation.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/WriteConfirmation.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/WriteConfirmation.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/Nonce.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/Nonce.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/Nonce.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/Nonce.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BusyException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BusyException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BusyException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BusyException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ConnectException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ConnectException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ConnectException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ConnectException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseResponseException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseResponseException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseResponseException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseResponseException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotReadResponse.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotReadResponse.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotReadResponse.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotReadResponse.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendCommandException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendCommandException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendCommandException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendCommandException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/NotConnectedException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/NotConnectedException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/NotConnectedException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/NotConnectedException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/PairingException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/PairingException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/PairingException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/PairingException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/SessionEstablishmentException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/SessionEstablishmentException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/SessionEstablishmentException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/SessionEstablishmentException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IncomingPackets.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IncomingPackets.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IncomingPackets.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IncomingPackets.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadJoiner.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadJoiner.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadJoiner.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadJoiner.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadSplitter.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadSplitter.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadSplitter.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadSplitter.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/DiscoveredInvalidPodException.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/DiscoveredInvalidPodException.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/DiscoveredInvalidPodException.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/DiscoveredInvalidPodException.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/DisconnectHandler.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/DisconnectHandler.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/DisconnectHandler.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/DisconnectHandler.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapSqn.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapSqn.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapSqn.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapSqn.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ResponseUtil.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ResponseUtil.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ResponseUtil.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ResponseUtil.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionKeys.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionKeys.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionKeys.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionKeys.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SuspendDeliveryCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SuspendDeliveryCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SuspendDeliveryCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SuspendDeliveryCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodConstants.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodConstants.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodConstants.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodConstants.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/SoftwareVersion.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/SoftwareVersion.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/SoftwareVersion.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/SoftwareVersion.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/CommandConfirmed.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/CommandConfirmed.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/CommandConfirmed.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/CommandConfirmed.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Constants.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Constants.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Constants.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Constants.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Flag.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Flag.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Flag.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Flag.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt similarity index 100% rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt rename to pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_overview.xml b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_overview.xml similarity index 100% rename from omnipod-dash/src/main/res/layout/omnipod_dash_overview.xml rename to pump/omnipod-dash/src/main/res/layout/omnipod_dash_overview.xml diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml similarity index 100% rename from omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml rename to pump/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml similarity index 100% rename from omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml rename to pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_item.xml b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_item.xml similarity index 100% rename from omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_item.xml rename to pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_item.xml diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml similarity index 100% rename from omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml rename to pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml diff --git a/omnipod-dash/src/main/res/values-af-rZA/strings.xml b/pump/omnipod-dash/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-af-rZA/strings.xml rename to pump/omnipod-dash/src/main/res/values-af-rZA/strings.xml diff --git a/omnipod-dash/src/main/res/values-bg-rBG/strings.xml b/pump/omnipod-dash/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-bg-rBG/strings.xml rename to pump/omnipod-dash/src/main/res/values-bg-rBG/strings.xml diff --git a/omnipod-dash/src/main/res/values-ca-rES/strings.xml b/pump/omnipod-dash/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-ca-rES/strings.xml rename to pump/omnipod-dash/src/main/res/values-ca-rES/strings.xml diff --git a/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml b/pump/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-cs-rCZ/strings.xml rename to pump/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml diff --git a/omnipod-dash/src/main/res/values-da-rDK/strings.xml b/pump/omnipod-dash/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-da-rDK/strings.xml rename to pump/omnipod-dash/src/main/res/values-da-rDK/strings.xml diff --git a/omnipod-dash/src/main/res/values-de-rDE/strings.xml b/pump/omnipod-dash/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-de-rDE/strings.xml rename to pump/omnipod-dash/src/main/res/values-de-rDE/strings.xml diff --git a/omnipod-dash/src/main/res/values-el-rGR/strings.xml b/pump/omnipod-dash/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-el-rGR/strings.xml rename to pump/omnipod-dash/src/main/res/values-el-rGR/strings.xml diff --git a/omnipod-dash/src/main/res/values-es-rES/strings.xml b/pump/omnipod-dash/src/main/res/values-es-rES/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-es-rES/strings.xml rename to pump/omnipod-dash/src/main/res/values-es-rES/strings.xml diff --git a/omnipod-dash/src/main/res/values-fr-rFR/strings.xml b/pump/omnipod-dash/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-fr-rFR/strings.xml rename to pump/omnipod-dash/src/main/res/values-fr-rFR/strings.xml diff --git a/omnipod-dash/src/main/res/values-ga-rIE/strings.xml b/pump/omnipod-dash/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-ga-rIE/strings.xml rename to pump/omnipod-dash/src/main/res/values-ga-rIE/strings.xml diff --git a/omnipod-dash/src/main/res/values-hr-rHR/strings.xml b/pump/omnipod-dash/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-hr-rHR/strings.xml rename to pump/omnipod-dash/src/main/res/values-hr-rHR/strings.xml diff --git a/omnipod-dash/src/main/res/values-hu-rHU/strings.xml b/pump/omnipod-dash/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-hu-rHU/strings.xml rename to pump/omnipod-dash/src/main/res/values-hu-rHU/strings.xml diff --git a/omnipod-dash/src/main/res/values-it-rIT/strings.xml b/pump/omnipod-dash/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-it-rIT/strings.xml rename to pump/omnipod-dash/src/main/res/values-it-rIT/strings.xml diff --git a/omnipod-dash/src/main/res/values-iw-rIL/strings.xml b/pump/omnipod-dash/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-iw-rIL/strings.xml rename to pump/omnipod-dash/src/main/res/values-iw-rIL/strings.xml diff --git a/omnipod-dash/src/main/res/values-ko-rKR/strings.xml b/pump/omnipod-dash/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-ko-rKR/strings.xml rename to pump/omnipod-dash/src/main/res/values-ko-rKR/strings.xml diff --git a/omnipod-dash/src/main/res/values-lt-rLT/strings.xml b/pump/omnipod-dash/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-lt-rLT/strings.xml rename to pump/omnipod-dash/src/main/res/values-lt-rLT/strings.xml diff --git a/omnipod-dash/src/main/res/values-nl-rNL/strings.xml b/pump/omnipod-dash/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-nl-rNL/strings.xml rename to pump/omnipod-dash/src/main/res/values-nl-rNL/strings.xml diff --git a/omnipod-dash/src/main/res/values-no-rNO/strings.xml b/pump/omnipod-dash/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-no-rNO/strings.xml rename to pump/omnipod-dash/src/main/res/values-no-rNO/strings.xml diff --git a/omnipod-dash/src/main/res/values-pl-rPL/strings.xml b/pump/omnipod-dash/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-pl-rPL/strings.xml rename to pump/omnipod-dash/src/main/res/values-pl-rPL/strings.xml diff --git a/omnipod-dash/src/main/res/values-pt-rBR/strings.xml b/pump/omnipod-dash/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-pt-rBR/strings.xml rename to pump/omnipod-dash/src/main/res/values-pt-rBR/strings.xml diff --git a/omnipod-dash/src/main/res/values-pt-rPT/strings.xml b/pump/omnipod-dash/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-pt-rPT/strings.xml rename to pump/omnipod-dash/src/main/res/values-pt-rPT/strings.xml diff --git a/omnipod-dash/src/main/res/values-ro-rRO/strings.xml b/pump/omnipod-dash/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-ro-rRO/strings.xml rename to pump/omnipod-dash/src/main/res/values-ro-rRO/strings.xml diff --git a/omnipod-dash/src/main/res/values-ru-rRU/strings.xml b/pump/omnipod-dash/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-ru-rRU/strings.xml rename to pump/omnipod-dash/src/main/res/values-ru-rRU/strings.xml diff --git a/omnipod-dash/src/main/res/values-sk-rSK/strings.xml b/pump/omnipod-dash/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-sk-rSK/strings.xml rename to pump/omnipod-dash/src/main/res/values-sk-rSK/strings.xml diff --git a/omnipod-dash/src/main/res/values-sl-rSI/strings.xml b/pump/omnipod-dash/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-sl-rSI/strings.xml rename to pump/omnipod-dash/src/main/res/values-sl-rSI/strings.xml diff --git a/omnipod-dash/src/main/res/values-sr-rCS/strings.xml b/pump/omnipod-dash/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-sr-rCS/strings.xml rename to pump/omnipod-dash/src/main/res/values-sr-rCS/strings.xml diff --git a/omnipod-dash/src/main/res/values-sv-rSE/strings.xml b/pump/omnipod-dash/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-sv-rSE/strings.xml rename to pump/omnipod-dash/src/main/res/values-sv-rSE/strings.xml diff --git a/omnipod-dash/src/main/res/values-ta-rIN/strings.xml b/pump/omnipod-dash/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-ta-rIN/strings.xml rename to pump/omnipod-dash/src/main/res/values-ta-rIN/strings.xml diff --git a/omnipod-dash/src/main/res/values-tr-rTR/strings.xml b/pump/omnipod-dash/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-tr-rTR/strings.xml rename to pump/omnipod-dash/src/main/res/values-tr-rTR/strings.xml diff --git a/omnipod-dash/src/main/res/values-zh-rCN/strings.xml b/pump/omnipod-dash/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values-zh-rCN/strings.xml rename to pump/omnipod-dash/src/main/res/values-zh-rCN/strings.xml diff --git a/omnipod-dash/src/main/res/values/strings.xml b/pump/omnipod-dash/src/main/res/values/strings.xml similarity index 100% rename from omnipod-dash/src/main/res/values/strings.xml rename to pump/omnipod-dash/src/main/res/values/strings.xml diff --git a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml b/pump/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml similarity index 100% rename from omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml rename to pump/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SuspendDeliveryCommandTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SuspendDeliveryCommandTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SuspendDeliveryCommandTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SuspendDeliveryCommandTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt similarity index 100% rename from omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt rename to pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt diff --git a/omnipod-eros/.gitignore b/pump/omnipod-eros/.gitignore similarity index 100% rename from omnipod-eros/.gitignore rename to pump/omnipod-eros/.gitignore diff --git a/omnipod-eros/build.gradle b/pump/omnipod-eros/build.gradle similarity index 89% rename from omnipod-eros/build.gradle rename to pump/omnipod-eros/build.gradle index 5e5fa44f0f..6b3756e762 100644 --- a/omnipod-eros/build.gradle +++ b/pump/omnipod-eros/build.gradle @@ -23,13 +23,13 @@ android { } dependencies { - implementation project(':libraries') - implementation project(':core') - implementation project(':pump-common') - implementation project(':omnipod-common') - implementation project(':rileylink') implementation project(':database') implementation project(':shared') + implementation project(':libraries') + implementation project(':core') + implementation project(':pump:pump-common') + implementation project(':pump:rileylink') + implementation project(':pump:omnipod-common') api "androidx.room:room-ktx:$room_version" api "androidx.room:room-runtime:$room_version" diff --git a/omnipod-eros/consumer-rules.pro b/pump/omnipod-eros/consumer-rules.pro similarity index 100% rename from omnipod-eros/consumer-rules.pro rename to pump/omnipod-eros/consumer-rules.pro diff --git a/omnipod-eros/proguard-rules.pro b/pump/omnipod-eros/proguard-rules.pro similarity index 100% rename from omnipod-eros/proguard-rules.pro rename to pump/omnipod-eros/proguard-rules.pro diff --git a/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt b/pump/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt similarity index 100% rename from omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt rename to pump/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt diff --git a/omnipod-eros/src/main/AndroidManifest.xml b/pump/omnipod-eros/src/main/AndroidManifest.xml similarity index 100% rename from omnipod-eros/src/main/AndroidManifest.xml rename to pump/omnipod-eros/src/main/AndroidManifest.xml diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/RLHistoryItemOmnipod.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodErosStorageKeys.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodErosStorageKeys.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodErosStorageKeys.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/OmnipodErosStorageKeys.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/definition/PodHistoryEntryType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosHistoryModule.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosHistoryModule.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosHistoryModule.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosHistoryModule.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosModule.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosModule.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosModule.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosModule.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosWizardViewModelsModule.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosWizardViewModelsModule.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosWizardViewModelsModule.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/di/OmnipodErosWizardViewModelsModule.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/OmnipodAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/OmnipodAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/OmnipodAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/OmnipodAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/IRawRepresentable.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/IRawRepresentable.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/IRawRepresentable.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/IRawRepresentable.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/MessageBlock.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/MessageBlock.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/MessageBlock.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/MessageBlock.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/NonceResyncableMessageBlock.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/NonceResyncableMessageBlock.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/NonceResyncableMessageBlock.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/NonceResyncableMessageBlock.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodMessage.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodPacket.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodPacket.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodPacket.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/OmnipodPacket.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommand.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommand.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommand.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommand.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponse.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponse.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponse.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponse.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponse.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponse.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponse.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponse.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusUpdatableResponse.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusUpdatableResponse.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusUpdatableResponse.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusUpdatableResponse.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponse.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponse.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponse.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponse.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfo.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfo.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfo.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfo.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlerts.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLog.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLog.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLog.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLog.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatus.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTime.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLog.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLog.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponse.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponse.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponse.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponse.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ActivationProgress.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ActivationProgress.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ActivationProgress.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ActivationProgress.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertConfiguration.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertConfiguration.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertConfiguration.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertConfiguration.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSet.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSet.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSet.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSet.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSlot.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSlot.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSlot.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSlot.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertTrigger.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertTrigger.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertTrigger.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertTrigger.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepConfigType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepConfigType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepConfigType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepConfigType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepRepeat.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepRepeat.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepRepeat.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepRepeat.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/BeepType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryStatus.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryStatus.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryStatus.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryStatus.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/DeliveryType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ErrorEventInfo.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ErrorEventInfo.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ErrorEventInfo.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/ErrorEventInfo.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FaultEventCode.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FaultEventCode.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FaultEventCode.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FaultEventCode.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FirmwareVersion.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FirmwareVersion.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FirmwareVersion.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/FirmwareVersion.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/MessageBlockType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/MessageBlockType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/MessageBlockType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/MessageBlockType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodConstants.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodConstants.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodConstants.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodConstants.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodCrc.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodCrc.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodCrc.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/OmnipodCrc.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PacketType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PacketType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PacketType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PacketType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodInfoType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodInfoType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodInfoType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodInfoType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodProgressStatus.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodProgressStatus.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodProgressStatus.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/PodProgressStatus.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/TimerAlertTrigger.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/TimerAlertTrigger.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/TimerAlertTrigger.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/TimerAlertTrigger.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/UnitsRemainingAlertTrigger.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/UnitsRemainingAlertTrigger.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/UnitsRemainingAlertTrigger.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/UnitsRemainingAlertTrigger.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliverySchedule.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliverySchedule.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliverySchedule.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliverySchedule.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliveryTable.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliveryTable.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliveryTable.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalDeliveryTable.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalSchedule.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalSchedule.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalSchedule.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalSchedule.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleEntry.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleEntry.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleEntry.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleEntry.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalTableEntry.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalTableEntry.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalTableEntry.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalTableEntry.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BolusDeliverySchedule.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BolusDeliverySchedule.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BolusDeliverySchedule.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BolusDeliverySchedule.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/DeliverySchedule.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/DeliverySchedule.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/DeliverySchedule.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/DeliverySchedule.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/InsulinScheduleType.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/InsulinScheduleType.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/InsulinScheduleType.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/InsulinScheduleType.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/RateEntry.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/RateEntry.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/RateEntry.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/RateEntry.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/TempBasalDeliverySchedule.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/TempBasalDeliverySchedule.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/TempBasalDeliverySchedule.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/TempBasalDeliverySchedule.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/ActivationTimeExceededException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/ActivationTimeExceededException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/ActivationTimeExceededException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/ActivationTimeExceededException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CommandFailedAfterChangingDeliveryStatusException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CrcMismatchException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CrcMismatchException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CrcMismatchException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/CrcMismatchException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalActivationProgressException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalActivationProgressException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalActivationProgressException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalActivationProgressException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalDeliveryStatusException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalDeliveryStatusException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalDeliveryStatusException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalDeliveryStatusException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageAddressException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageAddressException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageAddressException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageAddressException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageSequenceNumberException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageSequenceNumberException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageSequenceNumberException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalMessageSequenceNumberException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPacketTypeException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPacketTypeException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPacketTypeException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPacketTypeException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPodProgressException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPodProgressException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPodProgressException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalPodProgressException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalResponseException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalResponseException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalResponseException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalResponseException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalVersionResponseTypeException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalVersionResponseTypeException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalVersionResponseTypeException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/IllegalVersionResponseTypeException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/MessageDecodingException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/MessageDecodingException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/MessageDecodingException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/MessageDecodingException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceOutOfSyncException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceOutOfSyncException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceOutOfSyncException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceOutOfSyncException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceResyncException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceResyncException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceResyncException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NonceResyncException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NotEnoughDataException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NotEnoughDataException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NotEnoughDataException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/NotEnoughDataException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/OmnipodException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/OmnipodException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/OmnipodException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/OmnipodException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodFaultException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodFaultException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodFaultException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodFaultException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodProgressStatusVerificationFailedException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodProgressStatusVerificationFailedException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodProgressStatusVerificationFailedException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodProgressStatusVerificationFailedException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodReturnedErrorResponseException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodReturnedErrorResponseException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodReturnedErrorResponseException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PodReturnedErrorResponseException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PrecedingCommandFailedUncertainlyException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PrecedingCommandFailedUncertainlyException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PrecedingCommandFailedUncertainlyException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/PrecedingCommandFailedUncertainlyException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkInterruptedException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkInterruptedException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkInterruptedException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkInterruptedException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkTimeoutException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkTimeoutException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkTimeoutException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkTimeoutException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnexpectedException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnexpectedException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnexpectedException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnexpectedException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnreachableException.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnreachableException.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnreachableException.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/exception/RileyLinkUnreachableException.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/AlertConfigurationUtil.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/AlertConfigurationUtil.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/AlertConfigurationUtil.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/AlertConfigurationUtil.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtil.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtil.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtil.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtil.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosActiveAlertsChanged.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosActiveAlertsChanged.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosActiveAlertsChanged.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosActiveAlertsChanged.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosFaultEventChanged.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosFaultEventChanged.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosFaultEventChanged.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosFaultEventChanged.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosPumpValuesChanged.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosPumpValuesChanged.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosPumpValuesChanged.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosPumpValuesChanged.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosTbrChanged.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosTbrChanged.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosTbrChanged.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosTbrChanged.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosUncertainTbrRecovered.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosUncertainTbrRecovered.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosUncertainTbrRecovered.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/event/EventOmnipodErosUncertainTbrRecovered.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistory.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistory.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistory.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistory.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryDatabase.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryDatabase.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryDatabase.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryDatabase.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordDao.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordDao.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordDao.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordDao.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/database/ErosHistoryRecordEntity.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandGetPodStatus.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/queue/command/CommandReadPulseLog.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/ErosPodActivationWizardActivity.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/ErosPodActivationWizardActivity.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/ErosPodActivationWizardActivity.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/ErosPodActivationWizardActivity.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosAttachPodViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosAttachPodViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosAttachPodViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosAttachPodViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosPodActivatedViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosPodActivatedViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosPodActivatedViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosPodActivatedViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosStartPodActivationViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosStartPodActivationViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosStartPodActivationViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/info/ErosStartPodActivationViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/ErosPodDeactivationWizardActivity.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/ErosPodDeactivationWizardActivity.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/ErosPodDeactivationWizardActivity.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/ErosPodDeactivationWizardActivity.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosPodDeactivatedViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosPodDeactivatedViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosPodDeactivatedViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosPodDeactivatedViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosPodDiscardedViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosPodDiscardedViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosPodDiscardedViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosPodDiscardedViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosStartPodDeactivationViewModel.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosStartPodDeactivationViewModel.kt similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosStartPodDeactivationViewModel.kt rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/info/ErosStartPodDeactivationViewModel.kt diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java similarity index 100% rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java rename to pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/OmnipodAlertUtil.java diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml b/pump/omnipod-eros/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml similarity index 100% rename from omnipod-eros/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml rename to pump/omnipod-eros/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_management_rl_stats.xml b/pump/omnipod-eros/src/main/res/drawable/ic_pod_management_rl_stats.xml similarity index 100% rename from omnipod-eros/src/main/res/drawable/ic_pod_management_rl_stats.xml rename to pump/omnipod-eros/src/main/res/drawable/ic_pod_management_rl_stats.xml diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_overview.xml b/pump/omnipod-eros/src/main/res/layout/omnipod_eros_overview.xml similarity index 100% rename from omnipod-eros/src/main/res/layout/omnipod_eros_overview.xml rename to pump/omnipod-eros/src/main/res/layout/omnipod_eros_overview.xml diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml b/pump/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml similarity index 100% rename from omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml rename to pump/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml b/pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml similarity index 100% rename from omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml rename to pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_item.xml b/pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_item.xml similarity index 100% rename from omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_item.xml rename to pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_item.xml diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml b/pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml similarity index 100% rename from omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml rename to pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml diff --git a/omnipod-eros/src/main/res/values-af-rZA/strings.xml b/pump/omnipod-eros/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-af-rZA/strings.xml rename to pump/omnipod-eros/src/main/res/values-af-rZA/strings.xml diff --git a/omnipod-eros/src/main/res/values-bg-rBG/strings.xml b/pump/omnipod-eros/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-bg-rBG/strings.xml rename to pump/omnipod-eros/src/main/res/values-bg-rBG/strings.xml diff --git a/omnipod-eros/src/main/res/values-ca-rES/strings.xml b/pump/omnipod-eros/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-ca-rES/strings.xml rename to pump/omnipod-eros/src/main/res/values-ca-rES/strings.xml diff --git a/omnipod-eros/src/main/res/values-cs-rCZ/strings.xml b/pump/omnipod-eros/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-cs-rCZ/strings.xml rename to pump/omnipod-eros/src/main/res/values-cs-rCZ/strings.xml diff --git a/omnipod-eros/src/main/res/values-da-rDK/strings.xml b/pump/omnipod-eros/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-da-rDK/strings.xml rename to pump/omnipod-eros/src/main/res/values-da-rDK/strings.xml diff --git a/omnipod-eros/src/main/res/values-de-rDE/strings.xml b/pump/omnipod-eros/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-de-rDE/strings.xml rename to pump/omnipod-eros/src/main/res/values-de-rDE/strings.xml diff --git a/omnipod-eros/src/main/res/values-el-rGR/strings.xml b/pump/omnipod-eros/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-el-rGR/strings.xml rename to pump/omnipod-eros/src/main/res/values-el-rGR/strings.xml diff --git a/omnipod-eros/src/main/res/values-es-rES/strings.xml b/pump/omnipod-eros/src/main/res/values-es-rES/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-es-rES/strings.xml rename to pump/omnipod-eros/src/main/res/values-es-rES/strings.xml diff --git a/omnipod-eros/src/main/res/values-fr-rFR/strings.xml b/pump/omnipod-eros/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-fr-rFR/strings.xml rename to pump/omnipod-eros/src/main/res/values-fr-rFR/strings.xml diff --git a/omnipod-eros/src/main/res/values-ga-rIE/strings.xml b/pump/omnipod-eros/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-ga-rIE/strings.xml rename to pump/omnipod-eros/src/main/res/values-ga-rIE/strings.xml diff --git a/omnipod-eros/src/main/res/values-hr-rHR/strings.xml b/pump/omnipod-eros/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-hr-rHR/strings.xml rename to pump/omnipod-eros/src/main/res/values-hr-rHR/strings.xml diff --git a/omnipod-eros/src/main/res/values-hu-rHU/strings.xml b/pump/omnipod-eros/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-hu-rHU/strings.xml rename to pump/omnipod-eros/src/main/res/values-hu-rHU/strings.xml diff --git a/omnipod-eros/src/main/res/values-it-rIT/strings.xml b/pump/omnipod-eros/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-it-rIT/strings.xml rename to pump/omnipod-eros/src/main/res/values-it-rIT/strings.xml diff --git a/omnipod-eros/src/main/res/values-iw-rIL/strings.xml b/pump/omnipod-eros/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-iw-rIL/strings.xml rename to pump/omnipod-eros/src/main/res/values-iw-rIL/strings.xml diff --git a/omnipod-eros/src/main/res/values-ko-rKR/strings.xml b/pump/omnipod-eros/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-ko-rKR/strings.xml rename to pump/omnipod-eros/src/main/res/values-ko-rKR/strings.xml diff --git a/omnipod-eros/src/main/res/values-lt-rLT/strings.xml b/pump/omnipod-eros/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-lt-rLT/strings.xml rename to pump/omnipod-eros/src/main/res/values-lt-rLT/strings.xml diff --git a/omnipod-eros/src/main/res/values-nl-rNL/strings.xml b/pump/omnipod-eros/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-nl-rNL/strings.xml rename to pump/omnipod-eros/src/main/res/values-nl-rNL/strings.xml diff --git a/omnipod-eros/src/main/res/values-no-rNO/strings.xml b/pump/omnipod-eros/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-no-rNO/strings.xml rename to pump/omnipod-eros/src/main/res/values-no-rNO/strings.xml diff --git a/omnipod-eros/src/main/res/values-pl-rPL/strings.xml b/pump/omnipod-eros/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-pl-rPL/strings.xml rename to pump/omnipod-eros/src/main/res/values-pl-rPL/strings.xml diff --git a/omnipod-eros/src/main/res/values-pt-rBR/strings.xml b/pump/omnipod-eros/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-pt-rBR/strings.xml rename to pump/omnipod-eros/src/main/res/values-pt-rBR/strings.xml diff --git a/omnipod-eros/src/main/res/values-pt-rPT/strings.xml b/pump/omnipod-eros/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-pt-rPT/strings.xml rename to pump/omnipod-eros/src/main/res/values-pt-rPT/strings.xml diff --git a/omnipod-eros/src/main/res/values-ro-rRO/strings.xml b/pump/omnipod-eros/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-ro-rRO/strings.xml rename to pump/omnipod-eros/src/main/res/values-ro-rRO/strings.xml diff --git a/omnipod-eros/src/main/res/values-ru-rRU/strings.xml b/pump/omnipod-eros/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-ru-rRU/strings.xml rename to pump/omnipod-eros/src/main/res/values-ru-rRU/strings.xml diff --git a/omnipod-eros/src/main/res/values-sk-rSK/strings.xml b/pump/omnipod-eros/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-sk-rSK/strings.xml rename to pump/omnipod-eros/src/main/res/values-sk-rSK/strings.xml diff --git a/omnipod-eros/src/main/res/values-sl-rSI/strings.xml b/pump/omnipod-eros/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-sl-rSI/strings.xml rename to pump/omnipod-eros/src/main/res/values-sl-rSI/strings.xml diff --git a/omnipod-eros/src/main/res/values-sr-rCS/strings.xml b/pump/omnipod-eros/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-sr-rCS/strings.xml rename to pump/omnipod-eros/src/main/res/values-sr-rCS/strings.xml diff --git a/omnipod-eros/src/main/res/values-sv-rSE/strings.xml b/pump/omnipod-eros/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-sv-rSE/strings.xml rename to pump/omnipod-eros/src/main/res/values-sv-rSE/strings.xml diff --git a/omnipod-eros/src/main/res/values-ta-rIN/strings.xml b/pump/omnipod-eros/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-ta-rIN/strings.xml rename to pump/omnipod-eros/src/main/res/values-ta-rIN/strings.xml diff --git a/omnipod-eros/src/main/res/values-tr-rTR/strings.xml b/pump/omnipod-eros/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-tr-rTR/strings.xml rename to pump/omnipod-eros/src/main/res/values-tr-rTR/strings.xml diff --git a/omnipod-eros/src/main/res/values-zh-rCN/strings.xml b/pump/omnipod-eros/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values-zh-rCN/strings.xml rename to pump/omnipod-eros/src/main/res/values-zh-rCN/strings.xml diff --git a/omnipod-eros/src/main/res/values/strings.xml b/pump/omnipod-eros/src/main/res/values/strings.xml similarity index 100% rename from omnipod-eros/src/main/res/values/strings.xml rename to pump/omnipod-eros/src/main/res/values/strings.xml diff --git a/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml b/pump/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml similarity index 100% rename from omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml rename to pump/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/TestBase.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/TestBase.kt similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/TestBase.kt rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/TestBase.kt diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AcknowledgeAlertsCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/AssignAddressCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BasalScheduleExtraCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BeepConfigCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/BolusExtraCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/CancelDeliveryCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/ConfigureAlertsCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/DeactivatePodCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/FaultConfigCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/GetStatusCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetInsulinScheduleCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/SetupPodCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommandTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommandTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommandTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/command/TempBasalExtraCommandTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/defs/schedule/BasalTableEntryTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/defs/schedule/BasalTableEntryTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/defs/schedule/BasalTableEntryTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/defs/schedule/BasalTableEntryTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponseTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponseTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponseTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/ErrorResponseTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponseTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponseTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponseTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/StatusResponseTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponseTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponseTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponseTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/VersionResponseTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoActiveAlertsTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLogTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLogTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLogTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDataLogTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoDetailedStatusTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoOlderPulseLogTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoRecentPulseLogTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponseTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponseTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponseTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/message/response/podinfo/PodInfoResponseTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSetTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSetTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSetTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/AlertSetTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/definition/schedule/BasalScheduleTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtilTest.java b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtilTest.java similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtilTest.java rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/util/TimeUtilTest.java diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt similarity index 100% rename from omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt rename to pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt diff --git a/pump-common/.gitignore b/pump/pump-common/.gitignore similarity index 100% rename from pump-common/.gitignore rename to pump/pump-common/.gitignore diff --git a/pump-common/build.gradle b/pump/pump-common/build.gradle similarity index 100% rename from pump-common/build.gradle rename to pump/pump-common/build.gradle diff --git a/pump-common/consumer-rules.pro b/pump/pump-common/consumer-rules.pro similarity index 100% rename from pump-common/consumer-rules.pro rename to pump/pump-common/consumer-rules.pro diff --git a/pump-common/proguard-rules.pro b/pump/pump-common/proguard-rules.pro similarity index 100% rename from pump-common/proguard-rules.pro rename to pump/pump-common/proguard-rules.pro diff --git a/pump-common/src/main/AndroidManifest.xml b/pump/pump-common/src/main/AndroidManifest.xml similarity index 100% rename from pump-common/src/main/AndroidManifest.xml rename to pump/pump-common/src/main/AndroidManifest.xml diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BondStateReceiver.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BondStateReceiver.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BondStateReceiver.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BondStateReceiver.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpTimeDifferenceDto.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpTimeDifferenceDto.kt old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpTimeDifferenceDto.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpTimeDifferenceDto.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/BasalProfileStatus.java b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/BasalProfileStatus.java old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/BasalProfileStatus.java rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/BasalProfileStatus.java diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpRunningState.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpRunningState.kt old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpRunningState.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpRunningState.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTypeGroupConfig.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTypeGroupConfig.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTypeGroupConfig.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTypeGroupConfig.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpUpdateFragmentType.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpUpdateFragmentType.kt old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpUpdateFragmentType.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpUpdateFragmentType.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfiguration.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfiguration.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfiguration.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfiguration.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfigurationCapable.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfigurationCapable.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfigurationCapable.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/PumpDriverConfigurationCapable.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelectorAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelectorAbstract.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelectorAbstract.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelectorAbstract.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpDataConverter.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpDataConverter.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpDataConverter.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpDataConverter.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProvider.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProvider.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProvider.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProvider.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryDataProviderAbstract.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryEntry.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryEntry.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryEntry.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/history/PumpHistoryEntry.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventBondChanged.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventBondChanged.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventBondChanged.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventBondChanged.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpChanged.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpChanged.kt old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpChanged.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpChanged.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpConnectionParametersChanged.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpConnectionParametersChanged.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpConnectionParametersChanged.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpConnectionParametersChanged.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpFragmentValuesChanged.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpFragmentValuesChanged.kt old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpFragmentValuesChanged.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventPumpFragmentValuesChanged.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRefreshButtonState.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRefreshButtonState.kt old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRefreshButtonState.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRefreshButtonState.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpHistoryActivity.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpHistoryActivity.kt old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpHistoryActivity.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpHistoryActivity.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java similarity index 100% rename from pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java rename to pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java diff --git a/pump-common/src/main/res/layout/pump_ble_config_activity.xml b/pump/pump-common/src/main/res/layout/pump_ble_config_activity.xml old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/res/layout/pump_ble_config_activity.xml rename to pump/pump-common/src/main/res/layout/pump_ble_config_activity.xml diff --git a/pump-common/src/main/res/layout/pump_ble_config_scan_item.xml b/pump/pump-common/src/main/res/layout/pump_ble_config_scan_item.xml old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/res/layout/pump_ble_config_scan_item.xml rename to pump/pump-common/src/main/res/layout/pump_ble_config_scan_item.xml diff --git a/pump-common/src/main/res/layout/pump_history_activity.xml b/pump/pump-common/src/main/res/layout/pump_history_activity.xml old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/res/layout/pump_history_activity.xml rename to pump/pump-common/src/main/res/layout/pump_history_activity.xml diff --git a/pump-common/src/main/res/layout/pump_history_item.xml b/pump/pump-common/src/main/res/layout/pump_history_item.xml old mode 100755 new mode 100644 similarity index 100% rename from pump-common/src/main/res/layout/pump_history_item.xml rename to pump/pump-common/src/main/res/layout/pump_history_item.xml diff --git a/pump-common/src/main/res/values-af-rZA/strings.xml b/pump/pump-common/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from pump-common/src/main/res/values-af-rZA/strings.xml rename to pump/pump-common/src/main/res/values-af-rZA/strings.xml diff --git a/pump-common/src/main/res/values-bg-rBG/strings.xml b/pump/pump-common/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from pump-common/src/main/res/values-bg-rBG/strings.xml rename to pump/pump-common/src/main/res/values-bg-rBG/strings.xml diff --git a/pump-common/src/main/res/values-ca-rES/strings.xml b/pump/pump-common/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from pump-common/src/main/res/values-ca-rES/strings.xml rename to pump/pump-common/src/main/res/values-ca-rES/strings.xml diff --git a/pump-common/src/main/res/values-cs-rCZ/strings.xml b/pump/pump-common/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from pump-common/src/main/res/values-cs-rCZ/strings.xml rename to pump/pump-common/src/main/res/values-cs-rCZ/strings.xml diff --git a/pump-common/src/main/res/values-da-rDK/strings.xml b/pump/pump-common/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from pump-common/src/main/res/values-da-rDK/strings.xml rename to pump/pump-common/src/main/res/values-da-rDK/strings.xml diff --git a/pump-common/src/main/res/values-de-rDE/strings.xml b/pump/pump-common/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from pump-common/src/main/res/values-de-rDE/strings.xml rename to pump/pump-common/src/main/res/values-de-rDE/strings.xml diff --git a/pump-common/src/main/res/values-el-rGR/strings.xml b/pump/pump-common/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from pump-common/src/main/res/values-el-rGR/strings.xml rename to pump/pump-common/src/main/res/values-el-rGR/strings.xml diff --git a/pump-common/src/main/res/values-es-rES/strings.xml b/pump/pump-common/src/main/res/values-es-rES/strings.xml similarity index 100% rename from pump-common/src/main/res/values-es-rES/strings.xml rename to pump/pump-common/src/main/res/values-es-rES/strings.xml diff --git a/pump-common/src/main/res/values-fr-rFR/strings.xml b/pump/pump-common/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from pump-common/src/main/res/values-fr-rFR/strings.xml rename to pump/pump-common/src/main/res/values-fr-rFR/strings.xml diff --git a/pump-common/src/main/res/values-ga-rIE/strings.xml b/pump/pump-common/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from pump-common/src/main/res/values-ga-rIE/strings.xml rename to pump/pump-common/src/main/res/values-ga-rIE/strings.xml diff --git a/pump-common/src/main/res/values-hr-rHR/strings.xml b/pump/pump-common/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from pump-common/src/main/res/values-hr-rHR/strings.xml rename to pump/pump-common/src/main/res/values-hr-rHR/strings.xml diff --git a/pump-common/src/main/res/values-hu-rHU/strings.xml b/pump/pump-common/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from pump-common/src/main/res/values-hu-rHU/strings.xml rename to pump/pump-common/src/main/res/values-hu-rHU/strings.xml diff --git a/pump-common/src/main/res/values-it-rIT/strings.xml b/pump/pump-common/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from pump-common/src/main/res/values-it-rIT/strings.xml rename to pump/pump-common/src/main/res/values-it-rIT/strings.xml diff --git a/pump-common/src/main/res/values-iw-rIL/strings.xml b/pump/pump-common/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from pump-common/src/main/res/values-iw-rIL/strings.xml rename to pump/pump-common/src/main/res/values-iw-rIL/strings.xml diff --git a/pump-common/src/main/res/values-ko-rKR/strings.xml b/pump/pump-common/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from pump-common/src/main/res/values-ko-rKR/strings.xml rename to pump/pump-common/src/main/res/values-ko-rKR/strings.xml diff --git a/pump-common/src/main/res/values-lt-rLT/strings.xml b/pump/pump-common/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from pump-common/src/main/res/values-lt-rLT/strings.xml rename to pump/pump-common/src/main/res/values-lt-rLT/strings.xml diff --git a/pump-common/src/main/res/values-nl-rNL/strings.xml b/pump/pump-common/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from pump-common/src/main/res/values-nl-rNL/strings.xml rename to pump/pump-common/src/main/res/values-nl-rNL/strings.xml diff --git a/pump-common/src/main/res/values-no-rNO/strings.xml b/pump/pump-common/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from pump-common/src/main/res/values-no-rNO/strings.xml rename to pump/pump-common/src/main/res/values-no-rNO/strings.xml diff --git a/pump-common/src/main/res/values-pl-rPL/strings.xml b/pump/pump-common/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from pump-common/src/main/res/values-pl-rPL/strings.xml rename to pump/pump-common/src/main/res/values-pl-rPL/strings.xml diff --git a/pump-common/src/main/res/values-pt-rBR/strings.xml b/pump/pump-common/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from pump-common/src/main/res/values-pt-rBR/strings.xml rename to pump/pump-common/src/main/res/values-pt-rBR/strings.xml diff --git a/pump-common/src/main/res/values-pt-rPT/strings.xml b/pump/pump-common/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from pump-common/src/main/res/values-pt-rPT/strings.xml rename to pump/pump-common/src/main/res/values-pt-rPT/strings.xml diff --git a/pump-common/src/main/res/values-ro-rRO/strings.xml b/pump/pump-common/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from pump-common/src/main/res/values-ro-rRO/strings.xml rename to pump/pump-common/src/main/res/values-ro-rRO/strings.xml diff --git a/pump-common/src/main/res/values-ru-rRU/strings.xml b/pump/pump-common/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from pump-common/src/main/res/values-ru-rRU/strings.xml rename to pump/pump-common/src/main/res/values-ru-rRU/strings.xml diff --git a/pump-common/src/main/res/values-sk-rSK/strings.xml b/pump/pump-common/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from pump-common/src/main/res/values-sk-rSK/strings.xml rename to pump/pump-common/src/main/res/values-sk-rSK/strings.xml diff --git a/pump-common/src/main/res/values-sr-rCS/strings.xml b/pump/pump-common/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from pump-common/src/main/res/values-sr-rCS/strings.xml rename to pump/pump-common/src/main/res/values-sr-rCS/strings.xml diff --git a/pump-common/src/main/res/values-sv-rSE/strings.xml b/pump/pump-common/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from pump-common/src/main/res/values-sv-rSE/strings.xml rename to pump/pump-common/src/main/res/values-sv-rSE/strings.xml diff --git a/pump-common/src/main/res/values-tr-rTR/strings.xml b/pump/pump-common/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from pump-common/src/main/res/values-tr-rTR/strings.xml rename to pump/pump-common/src/main/res/values-tr-rTR/strings.xml diff --git a/pump-common/src/main/res/values-zh-rCN/strings.xml b/pump/pump-common/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from pump-common/src/main/res/values-zh-rCN/strings.xml rename to pump/pump-common/src/main/res/values-zh-rCN/strings.xml diff --git a/pump-common/src/main/res/values/strings.xml b/pump/pump-common/src/main/res/values/strings.xml similarity index 100% rename from pump-common/src/main/res/values/strings.xml rename to pump/pump-common/src/main/res/values/strings.xml diff --git a/rileylink/.gitignore b/pump/rileylink/.gitignore similarity index 100% rename from rileylink/.gitignore rename to pump/rileylink/.gitignore diff --git a/rileylink/build.gradle b/pump/rileylink/build.gradle similarity index 92% rename from rileylink/build.gradle rename to pump/rileylink/build.gradle index 24ac3125e8..33c437bb34 100644 --- a/rileylink/build.gradle +++ b/pump/rileylink/build.gradle @@ -13,7 +13,7 @@ android { } dependencies { - implementation project(':core') - implementation project(':pump-common') implementation project(':shared') + implementation project(':core') + implementation project(':pump:pump-common') } diff --git a/rileylink/consumer-rules.pro b/pump/rileylink/consumer-rules.pro similarity index 100% rename from rileylink/consumer-rules.pro rename to pump/rileylink/consumer-rules.pro diff --git a/rileylink/proguard-rules.pro b/pump/rileylink/proguard-rules.pro similarity index 100% rename from rileylink/proguard-rules.pro rename to pump/rileylink/proguard-rules.pro diff --git a/rileylink/src/main/AndroidManifest.xml b/pump/rileylink/src/main/AndroidManifest.xml similarity index 100% rename from rileylink/src/main/AndroidManifest.xml rename to pump/rileylink/src/main/AndroidManifest.xml diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/RileyLinkModule.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/device/OrangeLinkImpl.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpInfo.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpInfo.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpInfo.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpInfo.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.kt similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.kt rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.kt diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java similarity index 100% rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java rename to pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java diff --git a/rileylink/src/main/res/layout/riley_link_ble_config_activity.xml b/pump/rileylink/src/main/res/layout/riley_link_ble_config_activity.xml similarity index 100% rename from rileylink/src/main/res/layout/riley_link_ble_config_activity.xml rename to pump/rileylink/src/main/res/layout/riley_link_ble_config_activity.xml diff --git a/rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml b/pump/rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml similarity index 100% rename from rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml rename to pump/rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml diff --git a/rileylink/src/main/res/layout/rileylink_status.xml b/pump/rileylink/src/main/res/layout/rileylink_status.xml similarity index 100% rename from rileylink/src/main/res/layout/rileylink_status.xml rename to pump/rileylink/src/main/res/layout/rileylink_status.xml diff --git a/rileylink/src/main/res/layout/rileylink_status_device_item.xml b/pump/rileylink/src/main/res/layout/rileylink_status_device_item.xml similarity index 100% rename from rileylink/src/main/res/layout/rileylink_status_device_item.xml rename to pump/rileylink/src/main/res/layout/rileylink_status_device_item.xml diff --git a/rileylink/src/main/res/layout/rileylink_status_general.xml b/pump/rileylink/src/main/res/layout/rileylink_status_general.xml similarity index 100% rename from rileylink/src/main/res/layout/rileylink_status_general.xml rename to pump/rileylink/src/main/res/layout/rileylink_status_general.xml diff --git a/rileylink/src/main/res/layout/rileylink_status_history.xml b/pump/rileylink/src/main/res/layout/rileylink_status_history.xml similarity index 100% rename from rileylink/src/main/res/layout/rileylink_status_history.xml rename to pump/rileylink/src/main/res/layout/rileylink_status_history.xml diff --git a/rileylink/src/main/res/layout/rileylink_status_history_item.xml b/pump/rileylink/src/main/res/layout/rileylink_status_history_item.xml similarity index 100% rename from rileylink/src/main/res/layout/rileylink_status_history_item.xml rename to pump/rileylink/src/main/res/layout/rileylink_status_history_item.xml diff --git a/rileylink/src/main/res/menu/menu_rileylink_ble_scan.xml b/pump/rileylink/src/main/res/menu/menu_rileylink_ble_scan.xml similarity index 100% rename from rileylink/src/main/res/menu/menu_rileylink_ble_scan.xml rename to pump/rileylink/src/main/res/menu/menu_rileylink_ble_scan.xml diff --git a/rileylink/src/main/res/values-af-rZA/strings.xml b/pump/rileylink/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from rileylink/src/main/res/values-af-rZA/strings.xml rename to pump/rileylink/src/main/res/values-af-rZA/strings.xml diff --git a/rileylink/src/main/res/values-ar-rSA/strings.xml b/pump/rileylink/src/main/res/values-ar-rSA/strings.xml similarity index 100% rename from rileylink/src/main/res/values-ar-rSA/strings.xml rename to pump/rileylink/src/main/res/values-ar-rSA/strings.xml diff --git a/rileylink/src/main/res/values-bg-rBG/strings.xml b/pump/rileylink/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from rileylink/src/main/res/values-bg-rBG/strings.xml rename to pump/rileylink/src/main/res/values-bg-rBG/strings.xml diff --git a/rileylink/src/main/res/values-ca-rES/strings.xml b/pump/rileylink/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from rileylink/src/main/res/values-ca-rES/strings.xml rename to pump/rileylink/src/main/res/values-ca-rES/strings.xml diff --git a/rileylink/src/main/res/values-cs-rCZ/strings.xml b/pump/rileylink/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from rileylink/src/main/res/values-cs-rCZ/strings.xml rename to pump/rileylink/src/main/res/values-cs-rCZ/strings.xml diff --git a/rileylink/src/main/res/values-cy-rGB/strings.xml b/pump/rileylink/src/main/res/values-cy-rGB/strings.xml similarity index 100% rename from rileylink/src/main/res/values-cy-rGB/strings.xml rename to pump/rileylink/src/main/res/values-cy-rGB/strings.xml diff --git a/rileylink/src/main/res/values-da-rDK/strings.xml b/pump/rileylink/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from rileylink/src/main/res/values-da-rDK/strings.xml rename to pump/rileylink/src/main/res/values-da-rDK/strings.xml diff --git a/rileylink/src/main/res/values-de-rDE/strings.xml b/pump/rileylink/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from rileylink/src/main/res/values-de-rDE/strings.xml rename to pump/rileylink/src/main/res/values-de-rDE/strings.xml diff --git a/rileylink/src/main/res/values-el-rGR/strings.xml b/pump/rileylink/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from rileylink/src/main/res/values-el-rGR/strings.xml rename to pump/rileylink/src/main/res/values-el-rGR/strings.xml diff --git a/rileylink/src/main/res/values-es-rES/strings.xml b/pump/rileylink/src/main/res/values-es-rES/strings.xml similarity index 100% rename from rileylink/src/main/res/values-es-rES/strings.xml rename to pump/rileylink/src/main/res/values-es-rES/strings.xml diff --git a/rileylink/src/main/res/values-fi-rFI/strings.xml b/pump/rileylink/src/main/res/values-fi-rFI/strings.xml similarity index 100% rename from rileylink/src/main/res/values-fi-rFI/strings.xml rename to pump/rileylink/src/main/res/values-fi-rFI/strings.xml diff --git a/rileylink/src/main/res/values-fr-rFR/strings.xml b/pump/rileylink/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from rileylink/src/main/res/values-fr-rFR/strings.xml rename to pump/rileylink/src/main/res/values-fr-rFR/strings.xml diff --git a/rileylink/src/main/res/values-ga-rIE/strings.xml b/pump/rileylink/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from rileylink/src/main/res/values-ga-rIE/strings.xml rename to pump/rileylink/src/main/res/values-ga-rIE/strings.xml diff --git a/rileylink/src/main/res/values-hr-rHR/strings.xml b/pump/rileylink/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from rileylink/src/main/res/values-hr-rHR/strings.xml rename to pump/rileylink/src/main/res/values-hr-rHR/strings.xml diff --git a/rileylink/src/main/res/values-hu-rHU/strings.xml b/pump/rileylink/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from rileylink/src/main/res/values-hu-rHU/strings.xml rename to pump/rileylink/src/main/res/values-hu-rHU/strings.xml diff --git a/rileylink/src/main/res/values-it-rIT/strings.xml b/pump/rileylink/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from rileylink/src/main/res/values-it-rIT/strings.xml rename to pump/rileylink/src/main/res/values-it-rIT/strings.xml diff --git a/rileylink/src/main/res/values-iw-rIL/strings.xml b/pump/rileylink/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from rileylink/src/main/res/values-iw-rIL/strings.xml rename to pump/rileylink/src/main/res/values-iw-rIL/strings.xml diff --git a/rileylink/src/main/res/values-ko-rKR/strings.xml b/pump/rileylink/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from rileylink/src/main/res/values-ko-rKR/strings.xml rename to pump/rileylink/src/main/res/values-ko-rKR/strings.xml diff --git a/rileylink/src/main/res/values-lt-rLT/strings.xml b/pump/rileylink/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from rileylink/src/main/res/values-lt-rLT/strings.xml rename to pump/rileylink/src/main/res/values-lt-rLT/strings.xml diff --git a/rileylink/src/main/res/values-nl-rNL/strings.xml b/pump/rileylink/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from rileylink/src/main/res/values-nl-rNL/strings.xml rename to pump/rileylink/src/main/res/values-nl-rNL/strings.xml diff --git a/rileylink/src/main/res/values-no-rNO/strings.xml b/pump/rileylink/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from rileylink/src/main/res/values-no-rNO/strings.xml rename to pump/rileylink/src/main/res/values-no-rNO/strings.xml diff --git a/rileylink/src/main/res/values-pl-rPL/strings.xml b/pump/rileylink/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from rileylink/src/main/res/values-pl-rPL/strings.xml rename to pump/rileylink/src/main/res/values-pl-rPL/strings.xml diff --git a/rileylink/src/main/res/values-pt-rBR/strings.xml b/pump/rileylink/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from rileylink/src/main/res/values-pt-rBR/strings.xml rename to pump/rileylink/src/main/res/values-pt-rBR/strings.xml diff --git a/rileylink/src/main/res/values-pt-rPT/strings.xml b/pump/rileylink/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from rileylink/src/main/res/values-pt-rPT/strings.xml rename to pump/rileylink/src/main/res/values-pt-rPT/strings.xml diff --git a/rileylink/src/main/res/values-ro-rRO/strings.xml b/pump/rileylink/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from rileylink/src/main/res/values-ro-rRO/strings.xml rename to pump/rileylink/src/main/res/values-ro-rRO/strings.xml diff --git a/rileylink/src/main/res/values-ru-rRU/strings.xml b/pump/rileylink/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from rileylink/src/main/res/values-ru-rRU/strings.xml rename to pump/rileylink/src/main/res/values-ru-rRU/strings.xml diff --git a/rileylink/src/main/res/values-sk-rSK/strings.xml b/pump/rileylink/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from rileylink/src/main/res/values-sk-rSK/strings.xml rename to pump/rileylink/src/main/res/values-sk-rSK/strings.xml diff --git a/rileylink/src/main/res/values-sl-rSI/strings.xml b/pump/rileylink/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from rileylink/src/main/res/values-sl-rSI/strings.xml rename to pump/rileylink/src/main/res/values-sl-rSI/strings.xml diff --git a/rileylink/src/main/res/values-sr-rCS/strings.xml b/pump/rileylink/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from rileylink/src/main/res/values-sr-rCS/strings.xml rename to pump/rileylink/src/main/res/values-sr-rCS/strings.xml diff --git a/rileylink/src/main/res/values-sv-rSE/strings.xml b/pump/rileylink/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from rileylink/src/main/res/values-sv-rSE/strings.xml rename to pump/rileylink/src/main/res/values-sv-rSE/strings.xml diff --git a/rileylink/src/main/res/values-ta-rIN/strings.xml b/pump/rileylink/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from rileylink/src/main/res/values-ta-rIN/strings.xml rename to pump/rileylink/src/main/res/values-ta-rIN/strings.xml diff --git a/rileylink/src/main/res/values-tr-rTR/strings.xml b/pump/rileylink/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from rileylink/src/main/res/values-tr-rTR/strings.xml rename to pump/rileylink/src/main/res/values-tr-rTR/strings.xml diff --git a/rileylink/src/main/res/values-zh-rCN/strings.xml b/pump/rileylink/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from rileylink/src/main/res/values-zh-rCN/strings.xml rename to pump/rileylink/src/main/res/values-zh-rCN/strings.xml diff --git a/rileylink/src/main/res/values/strings.xml b/pump/rileylink/src/main/res/values/strings.xml similarity index 100% rename from rileylink/src/main/res/values/strings.xml rename to pump/rileylink/src/main/res/values/strings.xml diff --git a/rileylink/src/test/java/info/nightscout/androidaps/TestBase.kt b/pump/rileylink/src/test/java/info/nightscout/androidaps/TestBase.kt similarity index 100% rename from rileylink/src/test/java/info/nightscout/androidaps/TestBase.kt rename to pump/rileylink/src/test/java/info/nightscout/androidaps/TestBase.kt diff --git a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.kt b/pump/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.kt similarity index 100% rename from rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.kt rename to pump/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.kt diff --git a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java b/pump/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java similarity index 100% rename from rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java rename to pump/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java diff --git a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java b/pump/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java similarity index 100% rename from rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java rename to pump/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java diff --git a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersionTest.java b/pump/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersionTest.java similarity index 100% rename from rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersionTest.java rename to pump/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersionTest.java diff --git a/settings.gradle b/settings.gradle index 04c5fb7e1b..f770757e60 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,24 +1,24 @@ -include ':automation' -include ':insight' include ':app' include ':wear' include ':database' include ':core' -include ':combo' -include ':dana' -include ':danar' -include ':danars' -include ':pump-common' -include ':rileylink' -include ':medtronic' -include ':omnipod-common' -include ':omnipod-eros' -include ':omnipod-dash' -include ':diaconn' -include ':openhumans' include ':shared' include ':graphview' include ':libraries' include ':ui' include ':implementation' include ':plugins' +include ':pump:combo' +include ':pump:dana' +include ':pump:danar' +include ':pump:danars' +include ':pump:diaconn' +include ':insight' +include ':pump:medtronic' +include ':pump:omnipod-common' +include ':pump:omnipod-eros' +include ':pump:omnipod-dash' +include ':pump:pump-common' +include ':pump:rileylink' +include ':openhumans' +include ':automation'