diff --git a/app/build.gradle b/app/build.gradle index 71b577f4b1..b7c039306d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -190,7 +190,7 @@ dependencies { implementation project(':core:ui') implementation project(':interfaces') implementation project(':ui') - implementation project(':plugins') + implementation project(':plugins:main') implementation project(':implementation') implementation project(':database:entities') implementation project(':database:entities') diff --git a/crowdin.yml b/crowdin.yml index 6e8a4d5bb0..a7a88bc5a8 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -13,7 +13,6 @@ files: translation: /core/src/main/res/values-%android_code%/validator.xml - source: /core/core-main/src/main/res/values/strings.xml translation: /core/core-main/src/main/res/values-%android_code%/strings.xml - translate_attributes: 0 - source: /shared/src/main/res/values/strings.xml translation: /shared/src/main/res/values-%android_code%/strings.xml - source: /pump/combo/src/main/res/values/strings.xml @@ -56,5 +55,7 @@ files: translation: /implementation/src/main/res/values-%android_code%/strings.xml - source: /ui/src/main/res/values/strings.xml translation: /ui/src/main/res/values-%android_code%/strings.xml - - source: /plugins/src/main/res/values/strings.xml - translation: /plugins/src/main/res/values-%android_code%/strings.xml + - source: /plugins/aps/src/main/res/values/strings.xml + translation: /plugins/aps/src/main/res/values-%android_code%/strings.xml + - source: /plugins/main/src/main/res/values/strings.xml + translation: /plugins/main/src/main/res/values-%android_code%/strings.xml diff --git a/plugins/.gitignore b/plugins/aps/.gitignore similarity index 100% rename from plugins/.gitignore rename to plugins/aps/.gitignore diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle new file mode 100644 index 0000000000..719b680415 --- /dev/null +++ b/plugins/aps/build.gradle @@ -0,0 +1,29 @@ +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-kapt' + id 'kotlin-allopen' + id 'com.hiya.jacoco-android' +} + +apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/allopen_dependencies.gradle" +apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle" +android { + namespace 'info.nightscout.plugins.aps' +} + +dependencies { + implementation project(':app-wear-shared:rx') + implementation project(':app-wear-shared:shared') + implementation project(':database:entities') + implementation project(':database:impl') + implementation project(':core:core-main') + implementation project(':core:fabric') + implementation project(':core:ui') + implementation project(':interfaces') + + api "androidx.appcompat:appcompat:$appcompat_version" +} \ No newline at end of file diff --git a/plugins/consumer-rules.pro b/plugins/aps/consumer-rules.pro similarity index 100% rename from plugins/consumer-rules.pro rename to plugins/aps/consumer-rules.pro diff --git a/plugins/proguard-rules.pro b/plugins/aps/proguard-rules.pro similarity index 100% rename from plugins/proguard-rules.pro rename to plugins/aps/proguard-rules.pro diff --git a/plugins/aps/src/main/AndroidManifest.xml b/plugins/aps/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..a5918e68ab --- /dev/null +++ b/plugins/aps/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/main/.gitignore b/plugins/main/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/plugins/main/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/plugins/build.gradle b/plugins/main/build.gradle similarity index 100% rename from plugins/build.gradle rename to plugins/main/build.gradle diff --git a/plugins/main/consumer-rules.pro b/plugins/main/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/main/proguard-rules.pro b/plugins/main/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/plugins/main/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/plugins/src/main/AndroidManifest.xml b/plugins/main/src/main/AndroidManifest.xml similarity index 100% rename from plugins/src/main/AndroidManifest.xml rename to plugins/main/src/main/AndroidManifest.xml diff --git a/plugins/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt b/plugins/main/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt rename to plugins/main/src/main/java/info/nightscout/plugins/configBuilder/RunningConfiguration.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/SntpClient.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/events/EventObjectivesUpdateGui.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective1.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective10.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective3.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective7.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective9.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/SntpClient.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/AutotuneModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/AutotuneModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/AutotuneModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/AutotuneModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/FoodModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/FoodModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/FoodModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/FoodModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/InsulinModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/InsulinModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/InsulinModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/InsulinModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/ObjectivesModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/ObjectivesModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/ObjectivesModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/ObjectivesModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/PluginsModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/PluginsModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/PluginsModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/ProfileModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/ProfileModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/ProfileModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/SMSCommunicatorModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/SMSCommunicatorModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/SMSCommunicatorModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/SMSCommunicatorModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/SkinsModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/SkinsModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/SkinsModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/SkinsModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/SourceModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/SourceModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/SourceModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/SourceModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/SyncModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/SyncModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/SyncModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/SyncModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/di/VirtualPumpModule.kt b/plugins/main/src/main/java/info/nightscout/plugins/di/VirtualPumpModule.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/di/VirtualPumpModule.kt rename to plugins/main/src/main/java/info/nightscout/plugins/di/VirtualPumpModule.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/extensions/PumpEnactResultExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/extensions/PumpEnactResultExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/extensions/PumpEnactResultExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/extensions/PumpEnactResultExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/DiaDeviation.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/DiaDeviation.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/data/DiaDeviation.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/DiaDeviation.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/PeakDeviation.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/PeakDeviation.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/data/PeakDeviation.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/PeakDeviation.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/maintenance/LoggerUtils.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/maintenance/LoggerUtils.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/maintenance/LoggerUtils.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/maintenance/LoggerUtils.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/overview/notifications/DismissNotificationService.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/DismissNotificationService.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/overview/notifications/DismissNotificationService.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/DismissNotificationService.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/overview/notifications/events/EventUpdateOverviewNotification.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/events/EventUpdateOverviewNotification.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/overview/notifications/events/EventUpdateOverviewNotification.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/events/EventUpdateOverviewNotification.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/AuthRequest.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/AuthRequest.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/AuthRequest.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/AuthRequest.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsAction.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsAction.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsAction.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsAction.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/events/EventSmsCommunicatorUpdateGui.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePasswordValidationResult.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePasswordValidationResult.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePasswordValidationResult.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePasswordValidationResult.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/themes/ThemeSwitcherPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/wear/events/EventWearUpdateGui.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/events/EventWearUpdateGui.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/wear/events/EventWearUpdateGui.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/wear/events/EventWearUpdateGui.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/general/xdripStatusline/StatusLinePlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/ActivityGraph.kt b/plugins/main/src/main/java/info/nightscout/plugins/insulin/ActivityGraph.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/insulin/ActivityGraph.kt rename to plugins/main/src/main/java/info/nightscout/plugins/insulin/ActivityGraph.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/insulin/InsulinFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinLyumjevPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefBasePlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/pump/virtual/events/EventVirtualPumpUpdateGui.kt b/plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/events/EventVirtualPumpUpdateGui.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/pump/virtual/events/EventVirtualPumpUpdateGui.kt rename to plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/events/EventVirtualPumpUpdateGui.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/skins/SkinButtonsOn.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinButtonsOn.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/skins/SkinButtonsOn.kt rename to plugins/main/src/main/java/info/nightscout/plugins/skins/SkinButtonsOn.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/skins/SkinClassic.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinClassic.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/skins/SkinClassic.kt rename to plugins/main/src/main/java/info/nightscout/plugins/skins/SkinClassic.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/skins/SkinInterface.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinInterface.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/skins/SkinInterface.kt rename to plugins/main/src/main/java/info/nightscout/plugins/skins/SkinInterface.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/skins/SkinLargeDisplay.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLargeDisplay.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/skins/SkinLargeDisplay.kt rename to plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLargeDisplay.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/skins/SkinListPreference.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinListPreference.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/skins/SkinListPreference.kt rename to plugins/main/src/main/java/info/nightscout/plugins/skins/SkinListPreference.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/skins/SkinLowRes.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLowRes.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/skins/SkinLowRes.kt rename to plugins/main/src/main/java/info/nightscout/plugins/skins/SkinLowRes.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/skins/SkinProvider.kt b/plugins/main/src/main/java/info/nightscout/plugins/skins/SkinProvider.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/skins/SkinProvider.kt rename to plugins/main/src/main/java/info/nightscout/plugins/skins/SkinProvider.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/GlimpPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/GlimpPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/GlimpPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/GlimpPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/GlunovoPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/GlunovoPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/GlunovoPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/GlunovoPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/IntelligoPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/IntelligoPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/IntelligoPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/IntelligoPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/NSClientSourcePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/NSClientSourcePlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/NSClientSourcePlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/NSClientSourcePlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/PoctechPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/PoctechPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/PoctechPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/PoctechPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/RandomBgPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/RandomBgPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/RandomBgPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/RandomBgPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/TomatoPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/TomatoPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/TomatoPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/TomatoPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/source/activities/RequestDexcomPermissionActivity.kt b/plugins/main/src/main/java/info/nightscout/plugins/source/activities/RequestDexcomPermissionActivity.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/source/activities/RequestDexcomPermissionActivity.kt rename to plugins/main/src/main/java/info/nightscout/plugins/source/activities/RequestDexcomPermissionActivity.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDb.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDb.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDb.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDb.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientNewLog.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientNewLog.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientNewLog.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientNewLog.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientResend.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientResend.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientResend.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientResend.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientStatus.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientStatus.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientStatus.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientStatus.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGUI.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGUI.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGUI.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/events/EventNSClientUpdateGUI.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/extensions/PumpEnactResultExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/extensions/PumpEnactResultExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsShared/extensions/PumpEnactResultExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/extensions/PumpEnactResultExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/DataSyncSelectorImplementation.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegate.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAddAck.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAuthAck.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAuthAck.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAuthAck.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSAuthAck.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/acks/NSUpdateAck.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/AlarmAck.java b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/AlarmAck.java similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/AlarmAck.java rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/AlarmAck.java diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSAlarm.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSAlarm.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSAlarm.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSAlarm.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSMbg.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatus.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatus.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatus.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatus.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSgv.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSgv.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSgv.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSgv.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusData.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusData.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusData.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusData.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/BolusExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/CarbsExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/DeviceStatusExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/EffectiveProfileSwitchExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ExtendedBolusExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/OfflineEventExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/ProfileSwitchExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryBasalExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/services/NSClientService.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientMbgWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusCalculatorResultExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/BolusExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/CarbsExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/EffectiveProfileSwitchExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/OfflineEventExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/ProfileSwitchExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryBasalExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TemporaryTargetExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/extensions/TherapyEventExtension.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadDeviceStatusWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadLastModificationWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadStatusWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadTreatmentsWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/InfoInterceptor.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/Session.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/Session.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/Session.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/Session.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolApiService.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolApiService.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolApiService.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolApiService.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolCallback.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/comm/UploadChunk.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BasalElement.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BaseElement.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BaseElement.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BaseElement.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BaseElement.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BloodGlucoseElement.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BloodGlucoseElement.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BloodGlucoseElement.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BloodGlucoseElement.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BolusElement.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BolusElement.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BolusElement.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/BolusElement.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/ProfileElement.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/SensorGlucoseElement.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/SensorGlucoseElement.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/SensorGlucoseElement.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/SensorGlucoseElement.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/WizardElement.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/WizardElement.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/elements/WizardElement.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/elements/WizardElement.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolDoUpload.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolDoUpload.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolDoUpload.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolDoUpload.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolResetData.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolResetData.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolResetData.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolResetData.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolStatus.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolStatus.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolStatus.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolStatus.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolUpdateGUI.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolUpdateGUI.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolUpdateGUI.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/events/EventTidepoolUpdateGUI.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthReplyMessage.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthReplyMessage.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthReplyMessage.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthReplyMessage.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthRequestMessage.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthRequestMessage.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthRequestMessage.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/AuthRequestMessage.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/BaseMessage.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/BaseMessage.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/BaseMessage.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/BaseMessage.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/CloseDatasetRequestMessage.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/CloseDatasetRequestMessage.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/CloseDatasetRequestMessage.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/CloseDatasetRequestMessage.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/DatasetReplyMessage.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/DatasetReplyMessage.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/DatasetReplyMessage.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/DatasetReplyMessage.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/OpenDatasetRequestMessage.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/OpenDatasetRequestMessage.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/OpenDatasetRequestMessage.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/OpenDatasetRequestMessage.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/UploadReplyMessage.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/UploadReplyMessage.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/messages/UploadReplyMessage.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/messages/UploadReplyMessage.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/utils/GsonInstance.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/utils/GsonInstance.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/utils/GsonInstance.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/utils/GsonInstance.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt b/plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt rename to plugins/main/src/main/java/info/nightscout/plugins/sync/tidepool/utils/RateLimit.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/ui/StatusLightHandler.kt b/plugins/main/src/main/java/info/nightscout/plugins/ui/StatusLightHandler.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/ui/StatusLightHandler.kt rename to plugins/main/src/main/java/info/nightscout/plugins/ui/StatusLightHandler.kt diff --git a/plugins/src/main/java/info/nightscout/plugins/ui/TimeListEdit.java b/plugins/main/src/main/java/info/nightscout/plugins/ui/TimeListEdit.java similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/ui/TimeListEdit.java rename to plugins/main/src/main/java/info/nightscout/plugins/ui/TimeListEdit.java diff --git a/plugins/src/main/java/info/nightscout/plugins/utils/Percentile.kt b/plugins/main/src/main/java/info/nightscout/plugins/utils/Percentile.kt similarity index 100% rename from plugins/src/main/java/info/nightscout/plugins/utils/Percentile.kt rename to plugins/main/src/main/java/info/nightscout/plugins/utils/Percentile.kt diff --git a/plugins/src/main/res/drawable/ic_actions_cancel_extended_bolus.xml b/plugins/main/src/main/res/drawable/ic_actions_cancel_extended_bolus.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_actions_cancel_extended_bolus.xml rename to plugins/main/src/main/res/drawable/ic_actions_cancel_extended_bolus.xml diff --git a/plugins/src/main/res/drawable/ic_arrow_drop_down_white_24dp.xml b/plugins/main/src/main/res/drawable/ic_arrow_drop_down_white_24dp.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_arrow_drop_down_white_24dp.xml rename to plugins/main/src/main/res/drawable/ic_arrow_drop_down_white_24dp.xml diff --git a/plugins/src/main/res/drawable/ic_baseline_warning_24_red.xml b/plugins/main/src/main/res/drawable/ic_baseline_warning_24_red.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_baseline_warning_24_red.xml rename to plugins/main/src/main/res/drawable/ic_baseline_warning_24_red.xml diff --git a/plugins/src/main/res/drawable/ic_baseline_warning_24_yellow.xml b/plugins/main/src/main/res/drawable/ic_baseline_warning_24_yellow.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_baseline_warning_24_yellow.xml rename to plugins/main/src/main/res/drawable/ic_baseline_warning_24_yellow.xml diff --git a/plugins/src/main/res/drawable/ic_cancel_basal.xml b/plugins/main/src/main/res/drawable/ic_cancel_basal.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_cancel_basal.xml rename to plugins/main/src/main/res/drawable/ic_cancel_basal.xml diff --git a/plugins/src/main/res/drawable/ic_cp_age_battery.xml b/plugins/main/src/main/res/drawable/ic_cp_age_battery.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_cp_age_battery.xml rename to plugins/main/src/main/res/drawable/ic_cp_age_battery.xml diff --git a/plugins/src/main/res/drawable/ic_cp_age_cannula.xml b/plugins/main/src/main/res/drawable/ic_cp_age_cannula.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_cp_age_cannula.xml rename to plugins/main/src/main/res/drawable/ic_cp_age_cannula.xml diff --git a/plugins/src/main/res/drawable/ic_cp_age_insulin.xml b/plugins/main/src/main/res/drawable/ic_cp_age_insulin.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_cp_age_insulin.xml rename to plugins/main/src/main/res/drawable/ic_cp_age_insulin.xml diff --git a/plugins/src/main/res/drawable/ic_cp_age_sensor.xml b/plugins/main/src/main/res/drawable/ic_cp_age_sensor.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_cp_age_sensor.xml rename to plugins/main/src/main/res/drawable/ic_cp_age_sensor.xml diff --git a/plugins/src/main/res/drawable/ic_crosstarget.xml b/plugins/main/src/main/res/drawable/ic_crosstarget.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_crosstarget.xml rename to plugins/main/src/main/res/drawable/ic_crosstarget.xml diff --git a/plugins/src/main/res/drawable/ic_dice.xml b/plugins/main/src/main/res/drawable/ic_dice.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_dice.xml rename to plugins/main/src/main/res/drawable/ic_dice.xml diff --git a/plugins/src/main/res/drawable/ic_local_activate.xml b/plugins/main/src/main/res/drawable/ic_local_activate.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_local_activate.xml rename to plugins/main/src/main/res/drawable/ic_local_activate.xml diff --git a/plugins/src/main/res/drawable/ic_local_reset.xml b/plugins/main/src/main/res/drawable/ic_local_reset.xml similarity index 100% rename from plugins/src/main/res/drawable/ic_local_reset.xml rename to plugins/main/src/main/res/drawable/ic_local_reset.xml diff --git a/plugins/src/main/res/layout/actions_fragment.xml b/plugins/main/src/main/res/layout/actions_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/actions_fragment.xml rename to plugins/main/src/main/res/layout/actions_fragment.xml diff --git a/plugins/src/main/res/layout/actions_stats_fragment.xml b/plugins/main/src/main/res/layout/actions_stats_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/actions_stats_fragment.xml rename to plugins/main/src/main/res/layout/actions_stats_fragment.xml diff --git a/plugins/src/main/res/layout/autotune_fragment.xml b/plugins/main/src/main/res/layout/autotune_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/autotune_fragment.xml rename to plugins/main/src/main/res/layout/autotune_fragment.xml diff --git a/plugins/src/main/res/layout/food_fragment.xml b/plugins/main/src/main/res/layout/food_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/food_fragment.xml rename to plugins/main/src/main/res/layout/food_fragment.xml diff --git a/plugins/src/main/res/layout/food_item.xml b/plugins/main/src/main/res/layout/food_item.xml similarity index 100% rename from plugins/src/main/res/layout/food_item.xml rename to plugins/main/src/main/res/layout/food_item.xml diff --git a/plugins/src/main/res/layout/insulin_fragment.xml b/plugins/main/src/main/res/layout/insulin_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/insulin_fragment.xml rename to plugins/main/src/main/res/layout/insulin_fragment.xml diff --git a/plugins/src/main/res/layout/ns_client_fragment.xml b/plugins/main/src/main/res/layout/ns_client_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/ns_client_fragment.xml rename to plugins/main/src/main/res/layout/ns_client_fragment.xml diff --git a/plugins/src/main/res/layout/objectives_exam_fragment.xml b/plugins/main/src/main/res/layout/objectives_exam_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/objectives_exam_fragment.xml rename to plugins/main/src/main/res/layout/objectives_exam_fragment.xml diff --git a/plugins/src/main/res/layout/objectives_fragment.xml b/plugins/main/src/main/res/layout/objectives_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/objectives_fragment.xml rename to plugins/main/src/main/res/layout/objectives_fragment.xml diff --git a/plugins/src/main/res/layout/objectives_item.xml b/plugins/main/src/main/res/layout/objectives_item.xml similarity index 100% rename from plugins/src/main/res/layout/objectives_item.xml rename to plugins/main/src/main/res/layout/objectives_item.xml diff --git a/plugins/src/main/res/layout/overview_buttons_layout.xml b/plugins/main/src/main/res/layout/overview_buttons_layout.xml similarity index 100% rename from plugins/src/main/res/layout/overview_buttons_layout.xml rename to plugins/main/src/main/res/layout/overview_buttons_layout.xml diff --git a/plugins/src/main/res/layout/overview_fragment.xml b/plugins/main/src/main/res/layout/overview_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/overview_fragment.xml rename to plugins/main/src/main/res/layout/overview_fragment.xml diff --git a/plugins/src/main/res/layout/overview_graphs_layout.xml b/plugins/main/src/main/res/layout/overview_graphs_layout.xml similarity index 100% rename from plugins/src/main/res/layout/overview_graphs_layout.xml rename to plugins/main/src/main/res/layout/overview_graphs_layout.xml diff --git a/plugins/src/main/res/layout/overview_info_layout.xml b/plugins/main/src/main/res/layout/overview_info_layout.xml similarity index 100% rename from plugins/src/main/res/layout/overview_info_layout.xml rename to plugins/main/src/main/res/layout/overview_info_layout.xml diff --git a/plugins/src/main/res/layout/overview_notification_item.xml b/plugins/main/src/main/res/layout/overview_notification_item.xml similarity index 100% rename from plugins/src/main/res/layout/overview_notification_item.xml rename to plugins/main/src/main/res/layout/overview_notification_item.xml diff --git a/plugins/src/main/res/layout/overview_statuslights_layout.xml b/plugins/main/src/main/res/layout/overview_statuslights_layout.xml similarity index 100% rename from plugins/src/main/res/layout/overview_statuslights_layout.xml rename to plugins/main/src/main/res/layout/overview_statuslights_layout.xml diff --git a/plugins/src/main/res/layout/profile_fragment.xml b/plugins/main/src/main/res/layout/profile_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/profile_fragment.xml rename to plugins/main/src/main/res/layout/profile_fragment.xml diff --git a/plugins/src/main/res/layout/smscommunicator_activity_otp.xml b/plugins/main/src/main/res/layout/smscommunicator_activity_otp.xml similarity index 100% rename from plugins/src/main/res/layout/smscommunicator_activity_otp.xml rename to plugins/main/src/main/res/layout/smscommunicator_activity_otp.xml diff --git a/plugins/src/main/res/layout/smscommunicator_fragment.xml b/plugins/main/src/main/res/layout/smscommunicator_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/smscommunicator_fragment.xml rename to plugins/main/src/main/res/layout/smscommunicator_fragment.xml diff --git a/plugins/src/main/res/layout/source_fragment.xml b/plugins/main/src/main/res/layout/source_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/source_fragment.xml rename to plugins/main/src/main/res/layout/source_fragment.xml diff --git a/plugins/src/main/res/layout/source_item.xml b/plugins/main/src/main/res/layout/source_item.xml similarity index 100% rename from plugins/src/main/res/layout/source_item.xml rename to plugins/main/src/main/res/layout/source_item.xml diff --git a/plugins/src/main/res/layout/tidepool_fragment.xml b/plugins/main/src/main/res/layout/tidepool_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/tidepool_fragment.xml rename to plugins/main/src/main/res/layout/tidepool_fragment.xml diff --git a/plugins/src/main/res/layout/timelistedit_element.xml b/plugins/main/src/main/res/layout/timelistedit_element.xml similarity index 100% rename from plugins/src/main/res/layout/timelistedit_element.xml rename to plugins/main/src/main/res/layout/timelistedit_element.xml diff --git a/plugins/src/main/res/layout/timelistedit_element_vertical.xml b/plugins/main/src/main/res/layout/timelistedit_element_vertical.xml similarity index 100% rename from plugins/src/main/res/layout/timelistedit_element_vertical.xml rename to plugins/main/src/main/res/layout/timelistedit_element_vertical.xml diff --git a/plugins/src/main/res/layout/virtual_pump_fragment.xml b/plugins/main/src/main/res/layout/virtual_pump_fragment.xml similarity index 100% rename from plugins/src/main/res/layout/virtual_pump_fragment.xml rename to plugins/main/src/main/res/layout/virtual_pump_fragment.xml diff --git a/plugins/src/main/res/raw/urgentalarm.mp3 b/plugins/main/src/main/res/raw/urgentalarm.mp3 similarity index 100% rename from plugins/src/main/res/raw/urgentalarm.mp3 rename to plugins/main/src/main/res/raw/urgentalarm.mp3 diff --git a/plugins/src/main/res/values-af-rZA/strings.xml b/plugins/main/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from plugins/src/main/res/values-af-rZA/strings.xml rename to plugins/main/src/main/res/values-af-rZA/strings.xml diff --git a/plugins/src/main/res/values-bg-rBG/strings.xml b/plugins/main/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from plugins/src/main/res/values-bg-rBG/strings.xml rename to plugins/main/src/main/res/values-bg-rBG/strings.xml diff --git a/plugins/src/main/res/values-ca-rES/strings.xml b/plugins/main/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from plugins/src/main/res/values-ca-rES/strings.xml rename to plugins/main/src/main/res/values-ca-rES/strings.xml diff --git a/plugins/src/main/res/values-cs-rCZ/strings.xml b/plugins/main/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from plugins/src/main/res/values-cs-rCZ/strings.xml rename to plugins/main/src/main/res/values-cs-rCZ/strings.xml diff --git a/plugins/src/main/res/values-da-rDK/strings.xml b/plugins/main/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from plugins/src/main/res/values-da-rDK/strings.xml rename to plugins/main/src/main/res/values-da-rDK/strings.xml diff --git a/plugins/src/main/res/values-de-rDE/strings.xml b/plugins/main/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from plugins/src/main/res/values-de-rDE/strings.xml rename to plugins/main/src/main/res/values-de-rDE/strings.xml diff --git a/plugins/src/main/res/values-el-rGR/strings.xml b/plugins/main/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from plugins/src/main/res/values-el-rGR/strings.xml rename to plugins/main/src/main/res/values-el-rGR/strings.xml diff --git a/plugins/src/main/res/values-es-rES/strings.xml b/plugins/main/src/main/res/values-es-rES/strings.xml similarity index 100% rename from plugins/src/main/res/values-es-rES/strings.xml rename to plugins/main/src/main/res/values-es-rES/strings.xml diff --git a/plugins/src/main/res/values-fr-rFR/strings.xml b/plugins/main/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from plugins/src/main/res/values-fr-rFR/strings.xml rename to plugins/main/src/main/res/values-fr-rFR/strings.xml diff --git a/plugins/src/main/res/values-ga-rIE/strings.xml b/plugins/main/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from plugins/src/main/res/values-ga-rIE/strings.xml rename to plugins/main/src/main/res/values-ga-rIE/strings.xml diff --git a/plugins/src/main/res/values-hr-rHR/strings.xml b/plugins/main/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from plugins/src/main/res/values-hr-rHR/strings.xml rename to plugins/main/src/main/res/values-hr-rHR/strings.xml diff --git a/plugins/src/main/res/values-hu-rHU/strings.xml b/plugins/main/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from plugins/src/main/res/values-hu-rHU/strings.xml rename to plugins/main/src/main/res/values-hu-rHU/strings.xml diff --git a/plugins/src/main/res/values-it-rIT/strings.xml b/plugins/main/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from plugins/src/main/res/values-it-rIT/strings.xml rename to plugins/main/src/main/res/values-it-rIT/strings.xml diff --git a/plugins/src/main/res/values-iw-rIL/strings.xml b/plugins/main/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from plugins/src/main/res/values-iw-rIL/strings.xml rename to plugins/main/src/main/res/values-iw-rIL/strings.xml diff --git a/plugins/src/main/res/values-ko-rKR/strings.xml b/plugins/main/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from plugins/src/main/res/values-ko-rKR/strings.xml rename to plugins/main/src/main/res/values-ko-rKR/strings.xml diff --git a/plugins/src/main/res/values-lt-rLT/strings.xml b/plugins/main/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from plugins/src/main/res/values-lt-rLT/strings.xml rename to plugins/main/src/main/res/values-lt-rLT/strings.xml diff --git a/plugins/src/main/res/values-nl-rNL/strings.xml b/plugins/main/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from plugins/src/main/res/values-nl-rNL/strings.xml rename to plugins/main/src/main/res/values-nl-rNL/strings.xml diff --git a/plugins/src/main/res/values-no-rNO/strings.xml b/plugins/main/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from plugins/src/main/res/values-no-rNO/strings.xml rename to plugins/main/src/main/res/values-no-rNO/strings.xml diff --git a/plugins/src/main/res/values-pl-rPL/strings.xml b/plugins/main/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from plugins/src/main/res/values-pl-rPL/strings.xml rename to plugins/main/src/main/res/values-pl-rPL/strings.xml diff --git a/plugins/src/main/res/values-pt-rBR/strings.xml b/plugins/main/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from plugins/src/main/res/values-pt-rBR/strings.xml rename to plugins/main/src/main/res/values-pt-rBR/strings.xml diff --git a/plugins/src/main/res/values-pt-rPT/strings.xml b/plugins/main/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from plugins/src/main/res/values-pt-rPT/strings.xml rename to plugins/main/src/main/res/values-pt-rPT/strings.xml diff --git a/plugins/src/main/res/values-ro-rRO/strings.xml b/plugins/main/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from plugins/src/main/res/values-ro-rRO/strings.xml rename to plugins/main/src/main/res/values-ro-rRO/strings.xml diff --git a/plugins/src/main/res/values-ru-rRU/strings.xml b/plugins/main/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from plugins/src/main/res/values-ru-rRU/strings.xml rename to plugins/main/src/main/res/values-ru-rRU/strings.xml diff --git a/plugins/src/main/res/values-sk-rSK/strings.xml b/plugins/main/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from plugins/src/main/res/values-sk-rSK/strings.xml rename to plugins/main/src/main/res/values-sk-rSK/strings.xml diff --git a/plugins/src/main/res/values-sr-rCS/strings.xml b/plugins/main/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from plugins/src/main/res/values-sr-rCS/strings.xml rename to plugins/main/src/main/res/values-sr-rCS/strings.xml diff --git a/plugins/src/main/res/values-sv-rSE/strings.xml b/plugins/main/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from plugins/src/main/res/values-sv-rSE/strings.xml rename to plugins/main/src/main/res/values-sv-rSE/strings.xml diff --git a/plugins/src/main/res/values-tr-rTR/strings.xml b/plugins/main/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from plugins/src/main/res/values-tr-rTR/strings.xml rename to plugins/main/src/main/res/values-tr-rTR/strings.xml diff --git a/plugins/src/main/res/values-zh-rCN/strings.xml b/plugins/main/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from plugins/src/main/res/values-zh-rCN/strings.xml rename to plugins/main/src/main/res/values-zh-rCN/strings.xml diff --git a/plugins/src/main/res/values/arrays.xml b/plugins/main/src/main/res/values/arrays.xml similarity index 100% rename from plugins/src/main/res/values/arrays.xml rename to plugins/main/src/main/res/values/arrays.xml diff --git a/plugins/src/main/res/values/exam.xml b/plugins/main/src/main/res/values/exam.xml similarity index 100% rename from plugins/src/main/res/values/exam.xml rename to plugins/main/src/main/res/values/exam.xml diff --git a/plugins/src/main/res/values/objectives.xml b/plugins/main/src/main/res/values/objectives.xml similarity index 100% rename from plugins/src/main/res/values/objectives.xml rename to plugins/main/src/main/res/values/objectives.xml diff --git a/plugins/src/main/res/values/strings.xml b/plugins/main/src/main/res/values/strings.xml similarity index 100% rename from plugins/src/main/res/values/strings.xml rename to plugins/main/src/main/res/values/strings.xml diff --git a/plugins/src/main/res/xml/pref_autotune.xml b/plugins/main/src/main/res/xml/pref_autotune.xml similarity index 100% rename from plugins/src/main/res/xml/pref_autotune.xml rename to plugins/main/src/main/res/xml/pref_autotune.xml diff --git a/plugins/src/main/res/xml/pref_bgsource.xml b/plugins/main/src/main/res/xml/pref_bgsource.xml similarity index 100% rename from plugins/src/main/res/xml/pref_bgsource.xml rename to plugins/main/src/main/res/xml/pref_bgsource.xml diff --git a/plugins/src/main/res/xml/pref_dexcom.xml b/plugins/main/src/main/res/xml/pref_dexcom.xml similarity index 100% rename from plugins/src/main/res/xml/pref_dexcom.xml rename to plugins/main/src/main/res/xml/pref_dexcom.xml diff --git a/plugins/src/main/res/xml/pref_insulinoreffreepeak.xml b/plugins/main/src/main/res/xml/pref_insulinoreffreepeak.xml similarity index 100% rename from plugins/src/main/res/xml/pref_insulinoreffreepeak.xml rename to plugins/main/src/main/res/xml/pref_insulinoreffreepeak.xml diff --git a/plugins/src/main/res/xml/pref_ns_client.xml b/plugins/main/src/main/res/xml/pref_ns_client.xml similarity index 100% rename from plugins/src/main/res/xml/pref_ns_client.xml rename to plugins/main/src/main/res/xml/pref_ns_client.xml diff --git a/plugins/src/main/res/xml/pref_safety.xml b/plugins/main/src/main/res/xml/pref_safety.xml similarity index 100% rename from plugins/src/main/res/xml/pref_safety.xml rename to plugins/main/src/main/res/xml/pref_safety.xml diff --git a/plugins/src/main/res/xml/pref_smscommunicator.xml b/plugins/main/src/main/res/xml/pref_smscommunicator.xml similarity index 100% rename from plugins/src/main/res/xml/pref_smscommunicator.xml rename to plugins/main/src/main/res/xml/pref_smscommunicator.xml diff --git a/plugins/src/main/res/xml/pref_tidepool.xml b/plugins/main/src/main/res/xml/pref_tidepool.xml similarity index 100% rename from plugins/src/main/res/xml/pref_tidepool.xml rename to plugins/main/src/main/res/xml/pref_tidepool.xml diff --git a/plugins/src/main/res/xml/pref_virtual_pump.xml b/plugins/main/src/main/res/xml/pref_virtual_pump.xml similarity index 100% rename from plugins/src/main/res/xml/pref_virtual_pump.xml rename to plugins/main/src/main/res/xml/pref_virtual_pump.xml diff --git a/plugins/src/main/res/xml/pref_xdripstatus.xml b/plugins/main/src/main/res/xml/pref_xdripstatus.xml similarity index 100% rename from plugins/src/main/res/xml/pref_xdripstatus.xml rename to plugins/main/src/main/res/xml/pref_xdripstatus.xml diff --git a/plugins/src/test/java/info/nightscout/androidaps/HardLimitsMock.kt b/plugins/main/src/test/java/info/nightscout/androidaps/HardLimitsMock.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/androidaps/HardLimitsMock.kt rename to plugins/main/src/test/java/info/nightscout/androidaps/HardLimitsMock.kt diff --git a/plugins/src/test/java/info/nightscout/androidaps/TestBase.kt b/plugins/main/src/test/java/info/nightscout/androidaps/TestBase.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/androidaps/TestBase.kt rename to plugins/main/src/test/java/info/nightscout/androidaps/TestBase.kt diff --git a/plugins/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/plugins/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt rename to plugins/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt diff --git a/plugins/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt b/plugins/main/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt rename to plugins/main/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/general/autotune/PreppedGlucoseTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/autotune/PreppedGlucoseTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/general/autotune/PreppedGlucoseTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/general/autotune/PreppedGlucoseTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/AuthRequestTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/AuthRequestTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/AuthRequestTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/AuthRequestTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsActionTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsActionTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsActionTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsActionTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinLyumjevPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinOrefBasePluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinOrefFreePeakPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinOrefRapidActingPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/pump/virtual/VirtualPumpPluginUTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/pump/virtual/VirtualPumpPluginUTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/pump/virtual/VirtualPumpPluginUTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/pump/virtual/VirtualPumpPluginUTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/source/GlimpPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/source/GlimpPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/source/GlimpPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/source/GlimpPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/source/MM640GPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/source/MM640GPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/source/MM640GPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/source/MM640GPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/source/NSClientPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/source/NSClientPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/source/NSClientPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/source/NSClientPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/source/XdripPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/source/XdripPluginTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/source/XdripPluginTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/source/XdripPluginTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegateTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegateTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegateTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/sync/nsclient/NsClientReceiverDelegateTest.kt diff --git a/plugins/src/test/java/info/nightscout/plugins/sync/tidepool/comm/SessionTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/sync/tidepool/comm/SessionTest.kt similarity index 100% rename from plugins/src/test/java/info/nightscout/plugins/sync/tidepool/comm/SessionTest.kt rename to plugins/main/src/test/java/info/nightscout/plugins/sync/tidepool/comm/SessionTest.kt diff --git a/plugins/src/test/res/autotune/test1/Convert_Log2JSON.xlsx b/plugins/main/src/test/res/autotune/test1/Convert_Log2JSON.xlsx similarity index 100% rename from plugins/src/test/res/autotune/test1/Convert_Log2JSON.xlsx rename to plugins/main/src/test/res/autotune/test1/Convert_Log2JSON.xlsx diff --git a/plugins/src/test/res/autotune/test1/Oref0-Autotune_Command.txt b/plugins/main/src/test/res/autotune/test1/Oref0-Autotune_Command.txt similarity index 100% rename from plugins/src/test/res/autotune/test1/Oref0-Autotune_Command.txt rename to plugins/main/src/test/res/autotune/test1/Oref0-Autotune_Command.txt diff --git a/plugins/src/test/res/autotune/test1/aaps-entries.2022-05-21.json b/plugins/main/src/test/res/autotune/test1/aaps-entries.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test1/aaps-entries.2022-05-21.json rename to plugins/main/src/test/res/autotune/test1/aaps-entries.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test1/aaps-treatments.2022-05-21.json b/plugins/main/src/test/res/autotune/test1/aaps-treatments.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test1/aaps-treatments.2022-05-21.json rename to plugins/main/src/test/res/autotune/test1/aaps-treatments.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test1/aapsorefautotune_recommendations.log b/plugins/main/src/test/res/autotune/test1/aapsorefautotune_recommendations.log similarity index 100% rename from plugins/src/test/res/autotune/test1/aapsorefautotune_recommendations.log rename to plugins/main/src/test/res/autotune/test1/aapsorefautotune_recommendations.log diff --git a/plugins/src/test/res/autotune/test1/aapsorefprofile.2022-05-21.json b/plugins/main/src/test/res/autotune/test1/aapsorefprofile.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test1/aapsorefprofile.2022-05-21.json rename to plugins/main/src/test/res/autotune/test1/aapsorefprofile.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test1/aapsorefprofile.json b/plugins/main/src/test/res/autotune/test1/aapsorefprofile.json similarity index 100% rename from plugins/src/test/res/autotune/test1/aapsorefprofile.json rename to plugins/main/src/test/res/autotune/test1/aapsorefprofile.json diff --git a/plugins/src/test/res/autotune/test1/autotune.2022-05-21.json b/plugins/main/src/test/res/autotune/test1/autotune.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test1/autotune.2022-05-21.json rename to plugins/main/src/test/res/autotune/test1/autotune.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test1/autotune.2022-06-17-212314.log b/plugins/main/src/test/res/autotune/test1/autotune.2022-06-17-212314.log similarity index 100% rename from plugins/src/test/res/autotune/test1/autotune.2022-06-17-212314.log rename to plugins/main/src/test/res/autotune/test1/autotune.2022-06-17-212314.log diff --git a/plugins/src/test/res/autotune/test1/newaapsorefprofile.2022-05-21.json b/plugins/main/src/test/res/autotune/test1/newaapsorefprofile.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test1/newaapsorefprofile.2022-05-21.json rename to plugins/main/src/test/res/autotune/test1/newaapsorefprofile.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test1/oaps-iobCalc.2022-05-21.json b/plugins/main/src/test/res/autotune/test1/oaps-iobCalc.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test1/oaps-iobCalc.2022-05-21.json rename to plugins/main/src/test/res/autotune/test1/oaps-iobCalc.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test1/profile.pump.json b/plugins/main/src/test/res/autotune/test1/profile.pump.json similarity index 100% rename from plugins/src/test/res/autotune/test1/profile.pump.json rename to plugins/main/src/test/res/autotune/test1/profile.pump.json diff --git a/plugins/src/test/res/autotune/test2/aaps-entries.2022-05-21.json b/plugins/main/src/test/res/autotune/test2/aaps-entries.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test2/aaps-entries.2022-05-21.json rename to plugins/main/src/test/res/autotune/test2/aaps-entries.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test2/aaps-treatments.2022-05-21.json b/plugins/main/src/test/res/autotune/test2/aaps-treatments.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test2/aaps-treatments.2022-05-21.json rename to plugins/main/src/test/res/autotune/test2/aaps-treatments.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test2/aapsorefautotune_recommendations.log b/plugins/main/src/test/res/autotune/test2/aapsorefautotune_recommendations.log similarity index 100% rename from plugins/src/test/res/autotune/test2/aapsorefautotune_recommendations.log rename to plugins/main/src/test/res/autotune/test2/aapsorefautotune_recommendations.log diff --git a/plugins/src/test/res/autotune/test2/aapsorefprofile.2022-05-21.json b/plugins/main/src/test/res/autotune/test2/aapsorefprofile.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test2/aapsorefprofile.2022-05-21.json rename to plugins/main/src/test/res/autotune/test2/aapsorefprofile.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test2/aapsorefprofile.json b/plugins/main/src/test/res/autotune/test2/aapsorefprofile.json similarity index 100% rename from plugins/src/test/res/autotune/test2/aapsorefprofile.json rename to plugins/main/src/test/res/autotune/test2/aapsorefprofile.json diff --git a/plugins/src/test/res/autotune/test2/autotune.2022-05-21.json b/plugins/main/src/test/res/autotune/test2/autotune.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test2/autotune.2022-05-21.json rename to plugins/main/src/test/res/autotune/test2/autotune.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test2/autotune.2022-06-25-111214.log b/plugins/main/src/test/res/autotune/test2/autotune.2022-06-25-111214.log similarity index 100% rename from plugins/src/test/res/autotune/test2/autotune.2022-06-25-111214.log rename to plugins/main/src/test/res/autotune/test2/autotune.2022-06-25-111214.log diff --git a/plugins/src/test/res/autotune/test2/newaapsorefprofile.2022-05-21.json b/plugins/main/src/test/res/autotune/test2/newaapsorefprofile.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test2/newaapsorefprofile.2022-05-21.json rename to plugins/main/src/test/res/autotune/test2/newaapsorefprofile.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test2/oaps-iobCalc.2022-05-21.json b/plugins/main/src/test/res/autotune/test2/oaps-iobCalc.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test2/oaps-iobCalc.2022-05-21.json rename to plugins/main/src/test/res/autotune/test2/oaps-iobCalc.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test2/profile.pump.json b/plugins/main/src/test/res/autotune/test2/profile.pump.json similarity index 100% rename from plugins/src/test/res/autotune/test2/profile.pump.json rename to plugins/main/src/test/res/autotune/test2/profile.pump.json diff --git a/plugins/src/test/res/autotune/test3/aaps-entries.2022-05-21.json b/plugins/main/src/test/res/autotune/test3/aaps-entries.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test3/aaps-entries.2022-05-21.json rename to plugins/main/src/test/res/autotune/test3/aaps-entries.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test3/aaps-treatments.2022-05-21.json b/plugins/main/src/test/res/autotune/test3/aaps-treatments.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test3/aaps-treatments.2022-05-21.json rename to plugins/main/src/test/res/autotune/test3/aaps-treatments.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test3/aapsorefautotune_recommendations.log b/plugins/main/src/test/res/autotune/test3/aapsorefautotune_recommendations.log similarity index 100% rename from plugins/src/test/res/autotune/test3/aapsorefautotune_recommendations.log rename to plugins/main/src/test/res/autotune/test3/aapsorefautotune_recommendations.log diff --git a/plugins/src/test/res/autotune/test3/aapsorefprofile.2022-05-21.json b/plugins/main/src/test/res/autotune/test3/aapsorefprofile.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test3/aapsorefprofile.2022-05-21.json rename to plugins/main/src/test/res/autotune/test3/aapsorefprofile.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test3/aapsorefprofile.json b/plugins/main/src/test/res/autotune/test3/aapsorefprofile.json similarity index 100% rename from plugins/src/test/res/autotune/test3/aapsorefprofile.json rename to plugins/main/src/test/res/autotune/test3/aapsorefprofile.json diff --git a/plugins/src/test/res/autotune/test3/autotune.2022-05-21.json b/plugins/main/src/test/res/autotune/test3/autotune.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test3/autotune.2022-05-21.json rename to plugins/main/src/test/res/autotune/test3/autotune.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test3/autotune.2022-06-25-111350.log b/plugins/main/src/test/res/autotune/test3/autotune.2022-06-25-111350.log similarity index 100% rename from plugins/src/test/res/autotune/test3/autotune.2022-06-25-111350.log rename to plugins/main/src/test/res/autotune/test3/autotune.2022-06-25-111350.log diff --git a/plugins/src/test/res/autotune/test3/newaapsorefprofile.2022-05-21.json b/plugins/main/src/test/res/autotune/test3/newaapsorefprofile.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test3/newaapsorefprofile.2022-05-21.json rename to plugins/main/src/test/res/autotune/test3/newaapsorefprofile.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test3/oaps-iobCalc.2022-05-21.json b/plugins/main/src/test/res/autotune/test3/oaps-iobCalc.2022-05-21.json similarity index 100% rename from plugins/src/test/res/autotune/test3/oaps-iobCalc.2022-05-21.json rename to plugins/main/src/test/res/autotune/test3/oaps-iobCalc.2022-05-21.json diff --git a/plugins/src/test/res/autotune/test3/profile.pump.json b/plugins/main/src/test/res/autotune/test3/profile.pump.json similarity index 100% rename from plugins/src/test/res/autotune/test3/profile.pump.json rename to plugins/main/src/test/res/autotune/test3/profile.pump.json diff --git a/plugins/src/test/res/autotune/test4/autotune.2022-05-30.json b/plugins/main/src/test/res/autotune/test4/autotune.2022-05-30.json similarity index 100% rename from plugins/src/test/res/autotune/test4/autotune.2022-05-30.json rename to plugins/main/src/test/res/autotune/test4/autotune.2022-05-30.json diff --git a/plugins/src/test/res/autotune/test4/autotune.2022-06-25-195325.log b/plugins/main/src/test/res/autotune/test4/autotune.2022-06-25-195325.log similarity index 100% rename from plugins/src/test/res/autotune/test4/autotune.2022-06-25-195325.log rename to plugins/main/src/test/res/autotune/test4/autotune.2022-06-25-195325.log diff --git a/plugins/src/test/res/autotune/test4/newprofile.2022-05-30.json b/plugins/main/src/test/res/autotune/test4/newprofile.2022-05-30.json similarity index 100% rename from plugins/src/test/res/autotune/test4/newprofile.2022-05-30.json rename to plugins/main/src/test/res/autotune/test4/newprofile.2022-05-30.json diff --git a/plugins/src/test/res/autotune/test4/ns-entries.2022-05-30.json b/plugins/main/src/test/res/autotune/test4/ns-entries.2022-05-30.json similarity index 100% rename from plugins/src/test/res/autotune/test4/ns-entries.2022-05-30.json rename to plugins/main/src/test/res/autotune/test4/ns-entries.2022-05-30.json diff --git a/plugins/src/test/res/autotune/test4/ns-treatments.2022-05-30.json b/plugins/main/src/test/res/autotune/test4/ns-treatments.2022-05-30.json similarity index 100% rename from plugins/src/test/res/autotune/test4/ns-treatments.2022-05-30.json rename to plugins/main/src/test/res/autotune/test4/ns-treatments.2022-05-30.json diff --git a/plugins/src/test/res/autotune/test4/profile.2022-05-30.json b/plugins/main/src/test/res/autotune/test4/profile.2022-05-30.json similarity index 100% rename from plugins/src/test/res/autotune/test4/profile.2022-05-30.json rename to plugins/main/src/test/res/autotune/test4/profile.2022-05-30.json diff --git a/plugins/src/test/res/autotune/test4/profile.pump.json b/plugins/main/src/test/res/autotune/test4/profile.pump.json similarity index 100% rename from plugins/src/test/res/autotune/test4/profile.pump.json rename to plugins/main/src/test/res/autotune/test4/profile.pump.json diff --git a/settings.gradle b/settings.gradle index e068798fa7..f65ea5f331 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,11 @@ include ':app' include ':wear' +include ':automation' include ':database:entities' include ':database:impl' include ':core:core-main' include ':core:fabric' +include ':core:ui' include ':app-wear-shared:rx' include ':app-wear-shared:shared' include ':app-wear-shared:shared-impl' @@ -12,7 +14,9 @@ include ':libraries' include ':ns-sdk' include ':ui' include ':implementation' -include ':plugins' +include ':interfaces' +include ':plugins:aps' +include ':plugins:main' include ':pump:combo' include ':pump:dana' include ':pump:danar' @@ -29,6 +33,3 @@ include ':pump:pump-common' include ':pump:pump-core' include ':pump:rileylink' include ':openhumans' -include ':automation' -include ':interfaces' -include ':core:ui'