diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/BolusProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/BolusProgressDialog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/BolusProgressDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/BolusProgressDialog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/BolusProgressHelperActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/BolusProgressHelperActivity.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/BolusProgressHelperActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/BolusProgressHelperActivity.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/CalibrationDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/CalibrationDialog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/CalibrationDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/CalibrationDialog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/EditQuickWizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/EditQuickWizardDialog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/EditQuickWizardDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/EditQuickWizardDialog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/ErrorDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/ErrorDialog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/ErrorDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/ErrorDialog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/ErrorHelperActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/ErrorHelperActivity.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/ErrorHelperActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/ErrorHelperActivity.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/NewCarbsDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/NewCarbsDialog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/NewCarbsDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/NewCarbsDialog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/NewInsulinDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/NewInsulinDialog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/NewInsulinDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/NewInsulinDialog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/NewTreatmentDialog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/NewTreatmentDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/NewTreatmentDialog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/WizardDialog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/Dialogs/WizardDialog.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/Dialogs/WizardDialog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/OverviewFragment.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/OverviewPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/OverviewPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/activities/QuickWizardListActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/activities/QuickWizardListActivity.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventDismissBolusprogressIfRunning.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusprogressIfRunning.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventDismissBolusprogressIfRunning.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusprogressIfRunning.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventDismissNotification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventDismissNotification.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissNotification.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventNewNotification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventNewNotification.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventNewNotification.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventOverviewBolusProgress.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventOverviewBolusProgress.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventQuickWizardChange.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventQuickWizardChange.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/events/EventQuickWizardChange.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventQuickWizardChange.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphData/GraphData.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphData/GraphData.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/AreaGraphSeries.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/AreaGraphSeries.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/AreaGraphSeries.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/AreaGraphSeries.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/DataPointWithLabelInterface.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/DataPointWithLabelInterface.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/DoubleDataPoint.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DoubleDataPoint.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/DoubleDataPoint.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DoubleDataPoint.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/FixedLineGraphSeries.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/FixedLineGraphSeries.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/FixedLineGraphSeries.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/FixedLineGraphSeries.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/PointsWithLabelGraphSeries.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/PointsWithLabelGraphSeries.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/Scale.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/Scale.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/ScaledDataPoint.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/graphExtensions/ScaledDataPoint.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/ScaledDataPoint.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/DismissNotificationService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/DismissNotificationService.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/DismissNotificationService.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/Notification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/Notification.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/NotificationRecyclerViewAdapter.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/NotificationRecyclerViewAdapter.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/NotificationStore.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/NotificationStore.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/NotificationWithAction.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/Overview/notifications/NotificationWithAction.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.java