diff --git a/app-wear-shared/rx/build.gradle b/app-wear-shared/rx/build.gradle
deleted file mode 100644
index ec7948f508..0000000000
--- a/app-wear-shared/rx/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
-    id 'kotlinx-serialization'
-}
-
-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/jacoco_global.gradle"
-
-android {
-
-    namespace 'info.nightscout.rx'
-    defaultConfig {
-        minSdkVersion 23  // for wear
-    }
-}
-dependencies {
-    api "com.google.dagger:dagger:$dagger_version"
-    api "com.google.dagger:dagger-android:$dagger_version"
-
-    //Logger
-    api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed
-    api 'com.github.tony19:logback-android:2.0.0'
-
-    //RxBus
-    api "io.reactivex.rxjava3:rxjava:$rxjava_version"
-    api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version"
-    api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
-
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
-    api "org.apache.commons:commons-lang3:$commonslang3_version"
-
-    api "net.danlew:android.joda:$joda_version"
-}
diff --git a/app-wear-shared/rx/src/debug/java/info/nightscout/rx/annotations/RxOpenForTesting.kt b/app-wear-shared/rx/src/debug/java/info/nightscout/rx/annotations/RxOpenForTesting.kt
deleted file mode 100644
index dd515ed180..0000000000
--- a/app-wear-shared/rx/src/debug/java/info/nightscout/rx/annotations/RxOpenForTesting.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package info.nightscout.rx.annotations
-
-/**
- * This is the actual annotation that makes the class open. Don't use it directly, only through [RxOpenForTesting]
- * which has a NOOP replacement in production.
- */
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-annotation class RxOpenClass
-
-/**
- * Annotate a class with [RxOpenForTesting] if it should be extendable for testing.
- */
-@RxOpenClass
-@Target(AnnotationTarget.CLASS)
-annotation class RxOpenForTesting
\ No newline at end of file
diff --git a/app-wear-shared/rx/src/main/AndroidManifest.xml b/app-wear-shared/rx/src/main/AndroidManifest.xml
deleted file mode 100644
index 44008a4332..0000000000
--- a/app-wear-shared/rx/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>
\ No newline at end of file
diff --git a/app-wear-shared/rx/src/main/res/values-af-rZA/strings.xml b/app-wear-shared/rx/src/main/res/values-af-rZA/strings.xml
deleted file mode 100644
index b036aacc1d..0000000000
--- a/app-wear-shared/rx/src/main/res/values-af-rZA/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Handskudding</string>
-    <string name="connected">Gekoppel</string>
-    <string name="disconnecting">Ontkoppel</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-bg-rBG/strings.xml b/app-wear-shared/rx/src/main/res/values-bg-rBG/strings.xml
deleted file mode 100644
index d54a4d5fec..0000000000
--- a/app-wear-shared/rx/src/main/res/values-bg-rBG/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Сдвояване</string>
-    <string name="connected">Свързана</string>
-    <string name="disconnecting">Разкачане</string>
-    <string name="waiting_for_disconnection">Изчакване за разкачане</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-ca-rES/strings.xml b/app-wear-shared/rx/src/main/res/values-ca-rES/strings.xml
deleted file mode 100644
index 8c4c06b2dd..0000000000
--- a/app-wear-shared/rx/src/main/res/values-ca-rES/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Establint comunicació</string>
-    <string name="connected">Connectat</string>
-    <string name="disconnecting">Desconnectant</string>
-    <string name="waiting_for_disconnection">S\'està esperant la desconnexió</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-cs-rCZ/strings.xml b/app-wear-shared/rx/src/main/res/values-cs-rCZ/strings.xml
deleted file mode 100644
index f3b0bb294d..0000000000
--- a/app-wear-shared/rx/src/main/res/values-cs-rCZ/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Připojování %1$d sec</string>
-    <string name="handshaking">Navazování spojení</string>
-    <string name="connected">Připojeno</string>
-    <string name="disconnecting">Odpojuji</string>
-    <string name="waiting_for_disconnection">Čekám na odpojení</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-da-rDK/strings.xml b/app-wear-shared/rx/src/main/res/values-da-rDK/strings.xml
deleted file mode 100644
index 7e9181ad77..0000000000
--- a/app-wear-shared/rx/src/main/res/values-da-rDK/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Forbindelse verificeres</string>
-    <string name="connected">Tilsuttet</string>
-    <string name="disconnecting">Afbryder</string>
-    <string name="waiting_for_disconnection">Venter på afbrydelse</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-de-rDE/strings.xml b/app-wear-shared/rx/src/main/res/values-de-rDE/strings.xml
deleted file mode 100644
index 0f4bf0c39b..0000000000
--- a/app-wear-shared/rx/src/main/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Verbunden</string>
-    <string name="disconnecting">Verbindung wird getrennt</string>
-    <string name="waiting_for_disconnection">Warte auf Trennung der Verbindung</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-el-rGR/strings.xml b/app-wear-shared/rx/src/main/res/values-el-rGR/strings.xml
deleted file mode 100644
index 7bc1ea6c2f..0000000000
--- a/app-wear-shared/rx/src/main/res/values-el-rGR/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Δημιουργία σύνδεσης</string>
-    <string name="connected">Συνδέθηκε</string>
-    <string name="disconnecting">Αποσυνδέεται</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-es-rES/strings.xml b/app-wear-shared/rx/src/main/res/values-es-rES/strings.xml
deleted file mode 100644
index 01b2015eac..0000000000
--- a/app-wear-shared/rx/src/main/res/values-es-rES/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Conectando durante %1$d s</string>
-    <string name="handshaking">Estableciendo comunicacion</string>
-    <string name="connected">Conectado</string>
-    <string name="disconnecting">Desconectando</string>
-    <string name="waiting_for_disconnection">Esperando la desconexión</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-fr-rFR/strings.xml b/app-wear-shared/rx/src/main/res/values-fr-rFR/strings.xml
deleted file mode 100644
index 09260d1d6a..0000000000
--- a/app-wear-shared/rx/src/main/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Connexion en cours %1$ds</string>
-    <string name="handshaking">Connexion</string>
-    <string name="connected">Connectée</string>
-    <string name="disconnecting">Déconnexion en cours</string>
-    <string name="waiting_for_disconnection">Attente de déconnexion</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-ga-rIE/strings.xml b/app-wear-shared/rx/src/main/res/values-ga-rIE/strings.xml
deleted file mode 100644
index ac54a91378..0000000000
--- a/app-wear-shared/rx/src/main/res/values-ga-rIE/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connected">Nasctha</string>
-    <string name="disconnecting">Dícheangal</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-hr-rHR/strings.xml b/app-wear-shared/rx/src/main/res/values-hr-rHR/strings.xml
deleted file mode 100644
index 596747670f..0000000000
--- a/app-wear-shared/rx/src/main/res/values-hr-rHR/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Povezivanje</string>
-    <string name="connected">Povezano</string>
-    <string name="disconnecting">Odspajanje</string>
-    <string name="waiting_for_disconnection">Čeka se prekid veze</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-hu-rHU/strings.xml b/app-wear-shared/rx/src/main/res/values-hu-rHU/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/app-wear-shared/rx/src/main/res/values-hu-rHU/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/app-wear-shared/rx/src/main/res/values-it-rIT/strings.xml b/app-wear-shared/rx/src/main/res/values-it-rIT/strings.xml
deleted file mode 100644
index 58d256eed5..0000000000
--- a/app-wear-shared/rx/src/main/res/values-it-rIT/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Connessione</string>
-    <string name="connected">Connesso</string>
-    <string name="disconnecting">Disconnessione</string>
-    <string name="waiting_for_disconnection">In attesa della disconnessione</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-iw-rIL/strings.xml b/app-wear-shared/rx/src/main/res/values-iw-rIL/strings.xml
deleted file mode 100644
index 2fec401570..0000000000
--- a/app-wear-shared/rx/src/main/res/values-iw-rIL/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">לוחץ יד</string>
-    <string name="connected">מחובר</string>
-    <string name="disconnecting">מתנתק</string>
-    <string name="waiting_for_disconnection">ממתין לניתוק</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-ja-rJP/strings.xml b/app-wear-shared/rx/src/main/res/values-ja-rJP/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/app-wear-shared/rx/src/main/res/values-ja-rJP/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/app-wear-shared/rx/src/main/res/values-ko-rKR/strings.xml b/app-wear-shared/rx/src/main/res/values-ko-rKR/strings.xml
deleted file mode 100644
index ced6fb27f8..0000000000
--- a/app-wear-shared/rx/src/main/res/values-ko-rKR/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">통신 확인</string>
-    <string name="connected">연결됨</string>
-    <string name="disconnecting">연결끊기중</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-lt-rLT/strings.xml b/app-wear-shared/rx/src/main/res/values-lt-rLT/strings.xml
deleted file mode 100644
index 0df1cc19eb..0000000000
--- a/app-wear-shared/rx/src/main/res/values-lt-rLT/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Ryšio užmezgimas</string>
-    <string name="connected">Prisijungta</string>
-    <string name="disconnecting">Atsijungiama</string>
-    <string name="waiting_for_disconnection">Laukiama atsijungimo</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-nl-rNL/strings.xml b/app-wear-shared/rx/src/main/res/values-nl-rNL/strings.xml
deleted file mode 100644
index fc90a0ee48..0000000000
--- a/app-wear-shared/rx/src/main/res/values-nl-rNL/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Verbonden</string>
-    <string name="disconnecting">Verbinding aan het verbreken</string>
-    <string name="waiting_for_disconnection">Wachten op het loskoppelen</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-no-rNO/strings.xml b/app-wear-shared/rx/src/main/res/values-no-rNO/strings.xml
deleted file mode 100644
index 0eb0c70aa4..0000000000
--- a/app-wear-shared/rx/src/main/res/values-no-rNO/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Tilkobler i %1$d sek</string>
-    <string name="handshaking">Tilkobling verifiseres</string>
-    <string name="connected">Tilkoblet</string>
-    <string name="disconnecting">Frakobler</string>
-    <string name="waiting_for_disconnection">Venter på frakobling</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-pl-rPL/strings.xml b/app-wear-shared/rx/src/main/res/values-pl-rPL/strings.xml
deleted file mode 100644
index 54d8eb6de9..0000000000
--- a/app-wear-shared/rx/src/main/res/values-pl-rPL/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Uściskdłoni</string>
-    <string name="connected">Połączono</string>
-    <string name="disconnecting">Rozłączanie</string>
-    <string name="waiting_for_disconnection">Oczekiwanie na rozłączenie</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-pt-rBR/strings.xml b/app-wear-shared/rx/src/main/res/values-pt-rBR/strings.xml
deleted file mode 100644
index a6cd37877e..0000000000
--- a/app-wear-shared/rx/src/main/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Cumprimento</string>
-    <string name="connected">Conectado</string>
-    <string name="disconnecting">A desligar</string>
-    <string name="waiting_for_disconnection">Aguardando a desconexão</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-pt-rPT/strings.xml b/app-wear-shared/rx/src/main/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 4619724e6c..0000000000
--- a/app-wear-shared/rx/src/main/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Cumprimento</string>
-    <string name="connected">Ligado</string>
-    <string name="disconnecting">A desconectar</string>
-    <string name="waiting_for_disconnection">A aguardar a desconexão</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-ro-rRO/strings.xml b/app-wear-shared/rx/src/main/res/values-ro-rRO/strings.xml
deleted file mode 100644
index 36bf7a557f..0000000000
--- a/app-wear-shared/rx/src/main/res/values-ro-rRO/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Împerechere</string>
-    <string name="connected">Conectat</string>
-    <string name="disconnecting">Se deconectează</string>
-    <string name="waiting_for_disconnection">Se așteaptă deconectarea</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-ru-rRU/strings.xml b/app-wear-shared/rx/src/main/res/values-ru-rRU/strings.xml
deleted file mode 100644
index b7f1368b47..0000000000
--- a/app-wear-shared/rx/src/main/res/values-ru-rRU/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Подтверждение связи</string>
-    <string name="connected">соединение установлено</string>
-    <string name="disconnecting">разъединение</string>
-    <string name="waiting_for_disconnection">Ожидание разъединения</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-sk-rSK/strings.xml b/app-wear-shared/rx/src/main/res/values-sk-rSK/strings.xml
deleted file mode 100644
index e6d3796851..0000000000
--- a/app-wear-shared/rx/src/main/res/values-sk-rSK/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Pripájanie %1$d s</string>
-    <string name="handshaking">Overovanie</string>
-    <string name="connected">Pripojené</string>
-    <string name="disconnecting">Odpájanie</string>
-    <string name="waiting_for_disconnection">Čakám na odpojenie</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-sr-rCS/strings.xml b/app-wear-shared/rx/src/main/res/values-sr-rCS/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/app-wear-shared/rx/src/main/res/values-sr-rCS/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/app-wear-shared/rx/src/main/res/values-sv-rSE/strings.xml b/app-wear-shared/rx/src/main/res/values-sv-rSE/strings.xml
deleted file mode 100644
index 47c878f134..0000000000
--- a/app-wear-shared/rx/src/main/res/values-sv-rSE/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Anslutningen verifieras</string>
-    <string name="connected">Ansluten</string>
-    <string name="disconnecting">Kopplar från</string>
-    <string name="waiting_for_disconnection">Väntar på frånkoppling</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-tr-rTR/strings.xml b/app-wear-shared/rx/src/main/res/values-tr-rTR/strings.xml
deleted file mode 100644
index 2cb3616e3c..0000000000
--- a/app-wear-shared/rx/src/main/res/values-tr-rTR/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">Bağlandı</string>
-    <string name="connected">Bağlanıldı</string>
-    <string name="disconnecting">Bağlantı kesiliyor</string>
-    <string name="waiting_for_disconnection">Bağlantının kesilmesi bekleniyor</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values-zh-rCN/strings.xml b/app-wear-shared/rx/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index a3786b5192..0000000000
--- a/app-wear-shared/rx/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="handshaking">握手</string>
-    <string name="connected">已连接</string>
-    <string name="disconnecting">正在断开连接</string>
-    <string name="waiting_for_disconnection">正在等待连接</string>
-</resources>
diff --git a/app-wear-shared/rx/src/main/res/values/strings.xml b/app-wear-shared/rx/src/main/res/values/strings.xml
deleted file mode 100644
index f2ac972013..0000000000
--- a/app-wear-shared/rx/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="connecting_for">Connecting for %1$d s</string>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Connected</string>
-    <string name="disconnecting">Disconnecting</string>
-    <string name="waiting_for_disconnection">Waiting for disconnection</string>
-
-</resources>
\ No newline at end of file
diff --git a/app-wear-shared/rx/src/release/java/info/nightscout/rx/annotations/RxOpenForTesting.kt b/app-wear-shared/rx/src/release/java/info/nightscout/rx/annotations/RxOpenForTesting.kt
deleted file mode 100644
index fbb976549d..0000000000
--- a/app-wear-shared/rx/src/release/java/info/nightscout/rx/annotations/RxOpenForTesting.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.rx.annotations
-
-/**
- * Annotate a class with [RxOpenForTesting] if it should be extendable for testing.
- * In production the class remains final.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class RxOpenForTesting
\ No newline at end of file
diff --git a/app-wear-shared/shared-impl/build.gradle b/app-wear-shared/shared-impl/build.gradle
index 8d49bea8d6..e1fd20a1d7 100644
--- a/app-wear-shared/shared-impl/build.gradle
+++ b/app-wear-shared/shared-impl/build.gradle
@@ -19,6 +19,5 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
 }
\ No newline at end of file
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/AapsSchedulers.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/AapsSchedulers.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/AapsSchedulers.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/AapsSchedulers.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/bus/RxBus.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt
similarity index 92%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/bus/RxBus.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt
index 8c352794be..e294e9b443 100644
--- a/app-wear-shared/rx/src/main/java/info/nightscout/rx/bus/RxBus.kt
+++ b/app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt
@@ -1,7 +1,7 @@
 package info.nightscout.rx.bus
 
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.rx.AapsSchedulers
-import info.nightscout.rx.annotations.RxOpenForTesting
 import info.nightscout.rx.events.Event
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
@@ -10,7 +10,7 @@ import io.reactivex.rxjava3.subjects.PublishSubject
 import javax.inject.Inject
 import javax.inject.Singleton
 
-@RxOpenForTesting
+@OpenForTesting
 @Singleton
 class RxBus @Inject constructor(
     val aapsSchedulers: AapsSchedulers,
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/di/RxModule.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/di/RxModule.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/di/RxModule.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/di/RxModule.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/Event.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/Event.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/Event.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/Event.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventAppExit.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppExit.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventAppExit.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppExit.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventBTChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBTChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventBTChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBTChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventChargingState.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventChargingState.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventChargingState.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventChargingState.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventLoop.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoop.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventLoop.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoop.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNewBG.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewBG.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNewBG.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewBG.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
similarity index 98%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
index 76eb41c39c..0cf7a63171 100644
--- a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
+++ b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
@@ -1,7 +1,7 @@
 package info.nightscout.rx.events
 
 import android.content.Context
-import info.nightscout.rx.R
+import info.nightscout.shared.R
 
 class EventPumpStatusChanged : EventStatus {
 
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventScale.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventScale.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventScale.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventScale.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventStatus.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventStatus.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventStatus.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventStatus.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/interfaces/L.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/L.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/interfaces/L.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/L.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/interfaces/LogElement.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/LogElement.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/interfaces/LogElement.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/LogElement.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/AAPSLoggerProduction.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerProduction.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/AAPSLoggerProduction.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerProduction.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/AAPSLoggerTest.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerTest.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/AAPSLoggerTest.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerTest.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/BundleLogger.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/BundleLogger.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/BundleLogger.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/BundleLogger.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/LTag.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/logging/LTag.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt
diff --git a/app-wear-shared/rx/src/main/java/info/nightscout/rx/weardata/EventData.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt
similarity index 100%
rename from app-wear-shared/rx/src/main/java/info/nightscout/rx/weardata/EventData.kt
rename to app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt
diff --git a/app-wear-shared/shared/src/main/res/values/strings.xml b/app-wear-shared/shared/src/main/res/values/strings.xml
index 74ddc9cc0c..9f363f5cfc 100644
--- a/app-wear-shared/shared/src/main/res/values/strings.xml
+++ b/app-wear-shared/shared/src/main/res/values/strings.xml
@@ -31,4 +31,12 @@
     <string name="tomorrow">Tomorrow</string>
     <string name="today">Today</string>
     <string name="yesterday">Yesterday</string>
+
+    <!-- Rx -->
+    <string name="connecting_for">Connecting for %1$d s</string>
+    <string name="handshaking">Handshaking</string>
+    <string name="connected">Connected</string>
+    <string name="disconnecting">Disconnecting</string>
+    <string name="waiting_for_disconnection">Waiting for disconnection</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index f229f05b92..093944c887 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -183,17 +183,16 @@ dependencies {
     // in order to use internet's versions you'd need to enable Jetifier again
     // https://github.com/nightscout/graphview.git
     // https://github.com/nightscout/iconify.git
-    implementation project(':graphview')
-    implementation project(':libraries')
-    implementation project(':ns-sdk')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:shared-impl')
     implementation project(':core:core-main')
     implementation project(':core:graph')
+    implementation project(':core:graphview')
+    implementation project(':core:interfaces')
+    implementation project(':core:libraries')
+    implementation project(':core:ns-sdk')
     implementation project(':core:utils')
     implementation project(':core:ui')
-    implementation project(':interfaces')
     implementation project(':ui')
     implementation project(':plugins:aps')
     implementation project(':plugins:automation')
diff --git a/core/core-main/build.gradle b/core/core-main/build.gradle
index 286ad7d99c..4506e7aa0a 100644
--- a/core/core-main/build.gradle
+++ b/core/core-main/build.gradle
@@ -14,11 +14,10 @@ apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
-    implementation project(':interfaces')
     implementation project(':core:graph')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
 
diff --git a/core/graph/build.gradle b/core/graph/build.gradle
index 5f3730cd98..d4e3d96612 100644
--- a/core/graph/build.gradle
+++ b/core/graph/build.gradle
@@ -14,10 +14,10 @@ apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 dependencies {
-    implementation project(':graphview')
+    implementation project(':core:graphview')
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
-    implementation project(':interfaces')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
 
     api "com.google.android.material:material:$material_version"
diff --git a/app-wear-shared/rx/.gitignore b/core/graphview/.gitignore
similarity index 100%
rename from app-wear-shared/rx/.gitignore
rename to core/graphview/.gitignore
diff --git a/graphview/build.gradle b/core/graphview/build.gradle
similarity index 100%
rename from graphview/build.gradle
rename to core/graphview/build.gradle
diff --git a/app-wear-shared/rx/consumer-rules.pro b/core/graphview/consumer-rules.pro
similarity index 100%
rename from app-wear-shared/rx/consumer-rules.pro
rename to core/graphview/consumer-rules.pro
diff --git a/app-wear-shared/rx/proguard-rules.pro b/core/graphview/proguard-rules.pro
similarity index 100%
rename from app-wear-shared/rx/proguard-rules.pro
rename to core/graphview/proguard-rules.pro
diff --git a/graphview/src/main/AndroidManifest.xml b/core/graphview/src/main/AndroidManifest.xml
similarity index 100%
rename from graphview/src/main/AndroidManifest.xml
rename to core/graphview/src/main/AndroidManifest.xml
diff --git a/graphview/src/main/java/com/jjoe64/graphview/DefaultLabelFormatter.java b/core/graphview/src/main/java/com/jjoe64/graphview/DefaultLabelFormatter.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/DefaultLabelFormatter.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/DefaultLabelFormatter.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/GraphView.java b/core/graphview/src/main/java/com/jjoe64/graphview/GraphView.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/GraphView.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/GraphView.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java b/core/graphview/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/LabelFormatter.java b/core/graphview/src/main/java/com/jjoe64/graphview/LabelFormatter.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/LabelFormatter.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/LabelFormatter.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/LegendRenderer.java b/core/graphview/src/main/java/com/jjoe64/graphview/LegendRenderer.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/LegendRenderer.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/LegendRenderer.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/SecondScale.java b/core/graphview/src/main/java/com/jjoe64/graphview/SecondScale.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/SecondScale.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/SecondScale.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/ValueDependentColor.java b/core/graphview/src/main/java/com/jjoe64/graphview/ValueDependentColor.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/ValueDependentColor.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/ValueDependentColor.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/Viewport.java b/core/graphview/src/main/java/com/jjoe64/graphview/Viewport.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/Viewport.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/Viewport.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/compat/OverScrollerCompat.java b/core/graphview/src/main/java/com/jjoe64/graphview/compat/OverScrollerCompat.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/compat/OverScrollerCompat.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/compat/OverScrollerCompat.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/helper/DateAsXAxisLabelFormatter.java b/core/graphview/src/main/java/com/jjoe64/graphview/helper/DateAsXAxisLabelFormatter.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/helper/DateAsXAxisLabelFormatter.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/helper/DateAsXAxisLabelFormatter.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/helper/GraphViewXML.java b/core/graphview/src/main/java/com/jjoe64/graphview/helper/GraphViewXML.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/helper/GraphViewXML.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/helper/GraphViewXML.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/helper/StaticLabelsFormatter.java b/core/graphview/src/main/java/com/jjoe64/graphview/helper/StaticLabelsFormatter.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/helper/StaticLabelsFormatter.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/helper/StaticLabelsFormatter.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/series/BarGraphSeries.java b/core/graphview/src/main/java/com/jjoe64/graphview/series/BarGraphSeries.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/series/BarGraphSeries.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/series/BarGraphSeries.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/series/BaseSeries.java b/core/graphview/src/main/java/com/jjoe64/graphview/series/BaseSeries.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/series/BaseSeries.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/series/BaseSeries.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/series/DataPoint.java b/core/graphview/src/main/java/com/jjoe64/graphview/series/DataPoint.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/series/DataPoint.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/series/DataPoint.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/series/DataPointInterface.java b/core/graphview/src/main/java/com/jjoe64/graphview/series/DataPointInterface.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/series/DataPointInterface.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/series/DataPointInterface.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/series/LineGraphSeries.java b/core/graphview/src/main/java/com/jjoe64/graphview/series/LineGraphSeries.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/series/LineGraphSeries.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/series/LineGraphSeries.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/series/OnDataPointTapListener.java b/core/graphview/src/main/java/com/jjoe64/graphview/series/OnDataPointTapListener.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/series/OnDataPointTapListener.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/series/OnDataPointTapListener.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/series/PointsGraphSeries.java b/core/graphview/src/main/java/com/jjoe64/graphview/series/PointsGraphSeries.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/series/PointsGraphSeries.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/series/PointsGraphSeries.java
diff --git a/graphview/src/main/java/com/jjoe64/graphview/series/Series.java b/core/graphview/src/main/java/com/jjoe64/graphview/series/Series.java
similarity index 100%
rename from graphview/src/main/java/com/jjoe64/graphview/series/Series.java
rename to core/graphview/src/main/java/com/jjoe64/graphview/series/Series.java
diff --git a/graphview/src/main/res/values/attr.xml b/core/graphview/src/main/res/values/attr.xml
similarity index 100%
rename from graphview/src/main/res/values/attr.xml
rename to core/graphview/src/main/res/values/attr.xml
diff --git a/graphview/.gitignore b/core/interfaces/.gitignore
similarity index 100%
rename from graphview/.gitignore
rename to core/interfaces/.gitignore
diff --git a/interfaces/build.gradle b/core/interfaces/build.gradle
similarity index 95%
rename from interfaces/build.gradle
rename to core/interfaces/build.gradle
index 996cf6c443..b47e31a5e6 100644
--- a/interfaces/build.gradle
+++ b/core/interfaces/build.gradle
@@ -22,7 +22,6 @@ dependencies {
     // database module is compiled longer anyway
     // (ResourceHelper, AAPSLogger interface)
     implementation project(':app-wear-shared:shared')
-    implementation project(':app-wear-shared:rx')
     implementation project(':database:entities')
 
     api "androidx.appcompat:appcompat:$appcompat_version"
diff --git a/graphview/consumer-rules.pro b/core/interfaces/consumer-rules.pro
similarity index 100%
rename from graphview/consumer-rules.pro
rename to core/interfaces/consumer-rules.pro
diff --git a/graphview/proguard-rules.pro b/core/interfaces/proguard-rules.pro
similarity index 100%
rename from graphview/proguard-rules.pro
rename to core/interfaces/proguard-rules.pro
diff --git a/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt b/core/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
similarity index 100%
rename from interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
rename to core/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
diff --git a/interfaces/src/main/AndroidManifest.xml b/core/interfaces/src/main/AndroidManifest.xml
similarity index 100%
rename from interfaces/src/main/AndroidManifest.xml
rename to core/interfaces/src/main/AndroidManifest.xml
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/AndroidPermission.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/AndroidPermission.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/AndroidPermission.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/AndroidPermission.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/BolusTimer.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/BolusTimer.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/BolusTimer.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/BolusTimer.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/CarbTimer.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/CarbTimer.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/CarbTimer.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/CarbTimer.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/Config.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/Config.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/Config.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/Config.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/ConfigBuilder.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/ConfigBuilder.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/ConfigBuilder.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/ConfigBuilder.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/ConfigExportImport.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/ConfigExportImport.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/ConfigExportImport.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/ConfigExportImport.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/Constants.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/LocalAlertUtils.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/LocalAlertUtils.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/LocalAlertUtils.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/LocalAlertUtils.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/NotificationHolder.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/NotificationHolder.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/NotificationHolder.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/NotificationHolder.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/Overview.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/Overview.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/Overview.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/Overview.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/Translator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/Translator.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/Translator.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/Translator.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/XDripBroadcast.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/XDripBroadcast.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/XDripBroadcast.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/XDripBroadcast.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/APS.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/APS.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/APS.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/APS.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/APSResult.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/APSResult.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/APSResult.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/APSResult.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensData.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensData.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensData.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensData.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensDataStore.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensDataStore.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensDataStore.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensDataStore.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/AutosensResult.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/BasalData.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/BasalData.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/BasalData.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/BasalData.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/DetermineBasalAdapter.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/DetermineBasalAdapter.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/DetermineBasalAdapter.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/DetermineBasalAdapter.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/Loop.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/Loop.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/Loop.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/Loop.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/SMBDefaults.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/SMBDefaults.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/SMBDefaults.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/SMBDefaults.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/Sensitivity.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/Sensitivity.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/Sensitivity.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/Sensitivity.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/aps/VariableSensitivityResult.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/aps/VariableSensitivityResult.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/aps/VariableSensitivityResult.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/aps/VariableSensitivityResult.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/autotune/Autotune.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/autotune/Autotune.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/autotune/Autotune.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/autotune/Autotune.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraint.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraint.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraint.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraint.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/constraints/Objectives.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Objectives.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/constraints/Objectives.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Objectives.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/constraints/Safety.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Safety.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/constraints/Safety.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Safety.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/constraints/versionChecker/AllowedVersions.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/versionChecker/AllowedVersions.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/constraints/versionChecker/AllowedVersions.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/constraints/versionChecker/AllowedVersions.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/db/PersistenceLayer.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/db/PersistenceLayer.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/db/PersistenceLayer.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/db/PersistenceLayer.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/ItemTouchHelperAdapter.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/ItemTouchHelperAdapter.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/ItemTouchHelperAdapter.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/ItemTouchHelperAdapter.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/OnStartDragListener.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/OnStartDragListener.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/OnStartDragListener.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/OnStartDragListener.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/SimpleItemTouchHelperCallback.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/SimpleItemTouchHelperCallback.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/SimpleItemTouchHelperCallback.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/SimpleItemTouchHelperCallback.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/insulin/Insulin.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/insulin/Insulin.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/insulin/Insulin.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/insulin/Insulin.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/iob/CobInfo.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/CobInfo.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/iob/CobInfo.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/iob/CobInfo.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/iob/GlucoseStatus.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/GlucoseStatus.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/iob/GlucoseStatus.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/iob/GlucoseStatus.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/iob/InMemoryGlucoseValue.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/InMemoryGlucoseValue.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/iob/InMemoryGlucoseValue.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/iob/InMemoryGlucoseValue.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/iob/Iob.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/Iob.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/iob/Iob.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/iob/Iob.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/iob/IobCobCalculator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/IobCobCalculator.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/iob/IobCobCalculator.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/iob/IobCobCalculator.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/iob/IobTotal.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/IobTotal.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/iob/IobTotal.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/iob/IobTotal.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/iob/MealData.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/MealData.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/iob/MealData.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/iob/MealData.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/logging/LoggerUtils.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/logging/LoggerUtils.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/logging/LoggerUtils.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/logging/LoggerUtils.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/logging/UserEntryLogger.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/logging/UserEntryLogger.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/logging/UserEntryLogger.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/logging/UserEntryLogger.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/maintenance/ImportExportPrefs.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/ImportExportPrefs.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/maintenance/ImportExportPrefs.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/ImportExportPrefs.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefFileListProvider.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefFileListProvider.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefFileListProvider.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefFileListProvider.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFile.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFile.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFile.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFile.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFormat.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFormat.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFormat.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsFormat.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsImportDir.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsImportDir.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsImportDir.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/maintenance/PrefsImportDir.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/notifications/Notification.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/notifications/Notification.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/notifications/Notification.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/notifications/Notification.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/permissions/OptimizationPermissionContract.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/permissions/OptimizationPermissionContract.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/permissions/OptimizationPermissionContract.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/permissions/OptimizationPermissionContract.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/plugin/ActivePlugin.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/ActivePlugin.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/plugin/ActivePlugin.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/plugin/ActivePlugin.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginBase.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginBase.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginBase.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginBase.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginFragment.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginFragment.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginFragment.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginFragment.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginType.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginType.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginType.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginType.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/profile/DefaultValueHelper.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/DefaultValueHelper.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/profile/DefaultValueHelper.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/profile/DefaultValueHelper.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/profile/Profile.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/Profile.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/profile/Profile.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/profile/Profile.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileFunction.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileFunction.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileFunction.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileFunction.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileInstantiator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileInstantiator.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileInstantiator.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileInstantiator.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileSource.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileStore.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileStore.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileStore.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/profile/ProfileStore.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/profile/PureProfile.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profile/PureProfile.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/profile/PureProfile.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/profile/PureProfile.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/profiling/Profiler.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/profiling/Profiler.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/profiling/Profiler.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/profiling/Profiler.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/protection/PasswordCheck.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/protection/PasswordCheck.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/protection/PasswordCheck.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/protection/PasswordCheck.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/protection/ProtectionCheck.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/protection/ProtectionCheck.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/protection/ProtectionCheck.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/protection/ProtectionCheck.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/BolusProgressData.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/BolusProgressData.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/BolusProgressData.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/BolusProgressData.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/Dana.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/Dana.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/Dana.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/Dana.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfo.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfo.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfo.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfo.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfoStorage.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfoStorage.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfoStorage.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfoStorage.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/Diaconn.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/Diaconn.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/Diaconn.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/Diaconn.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/Insight.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/Insight.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/Insight.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/Insight.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodDash.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodDash.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodDash.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodDash.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodEros.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodEros.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodEros.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/OmnipodEros.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/Pump.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/Pump.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/Pump.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/Pump.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpEnactResult.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpEnactResult.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/PumpEnactResult.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpEnactResult.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpPluginBase.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpPluginBase.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/PumpPluginBase.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpPluginBase.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpSync.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpSync.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/PumpSync.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/PumpSync.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/TemporaryBasalStorage.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/TemporaryBasalStorage.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/TemporaryBasalStorage.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/TemporaryBasalStorage.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/VirtualPump.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/VirtualPump.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/VirtualPump.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/VirtualPump.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/WarnColors.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/WarnColors.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/WarnColors.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/WarnColors.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/actions/CustomAction.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/actions/CustomAction.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/actions/CustomAction.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/actions/CustomAction.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/actions/CustomActionType.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/actions/CustomActionType.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/actions/CustomActionType.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/actions/CustomActionType.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseSettings.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseSettings.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseSettings.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseSettings.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseStepSize.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseStepSize.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseStepSize.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/DoseStepSize.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/ManufacturerType.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/ManufacturerType.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/defs/ManufacturerType.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/ManufacturerType.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpCapability.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpCapability.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpCapability.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpCapability.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpDescription.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpDescription.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpDescription.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpDescription.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpTempBasalType.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpTempBasalType.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpTempBasalType.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpTempBasalType.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpType.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpType.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpType.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpType.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/queue/Callback.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/queue/Callback.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/queue/Callback.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/queue/Callback.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/queue/Command.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/queue/Command.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/queue/Command.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/queue/Command.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/queue/CommandQueue.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/queue/CommandQueue.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/queue/CommandQueue.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/queue/CommandQueue.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/queue/CustomCommand.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/queue/CustomCommand.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/queue/CustomCommand.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/queue/CustomCommand.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/receivers/Intents.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/Sms.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/Sms.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/Sms.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/Sms.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/SmsCommunicator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/SmsCommunicator.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/SmsCommunicator.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/SmsCommunicator.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/source/BgSource.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/source/BgSource.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/source/BgSource.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/source/BgSource.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTIR.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTIR.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTIR.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTIR.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTirCalculator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTirCalculator.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTirCalculator.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/stats/DexcomTirCalculator.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/stats/TIR.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/stats/TIR.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/stats/TIR.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/stats/TIR.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/stats/TddCalculator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/stats/TddCalculator.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/stats/TddCalculator.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/stats/TddCalculator.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/stats/TirCalculator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/stats/TirCalculator.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/stats/TirCalculator.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/stats/TirCalculator.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/storage/FileStorage.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/storage/FileStorage.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/storage/FileStorage.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/storage/FileStorage.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/storage/Storage.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/storage/Storage.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/storage/Storage.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/storage/Storage.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/sync/DataSyncSelector.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/sync/NsClient.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/sync/Sync.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/sync/Sync.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/sync/Sync.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/sync/Sync.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/ui/ActivityNames.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/ui/ActivityNames.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/ui/ActivityNames.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/ui/ActivityNames.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/ui/IconsProvider.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/ui/IconsProvider.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/ui/IconsProvider.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/ui/IconsProvider.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/userEntry/UserEntryMapper.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/UserEntryMapper.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/userEntry/UserEntryMapper.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/UserEntryMapper.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/userEntry/ValueWithUnitMapper.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/ValueWithUnitMapper.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/userEntry/ValueWithUnitMapper.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/ValueWithUnitMapper.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/DecimalFormatter.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/DecimalFormatter.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/DecimalFormatter.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/DecimalFormatter.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/HardLimits.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/HardLimits.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/HardLimits.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/HardLimits.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/HtmlHelper.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/HtmlHelper.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/HtmlHelper.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/HtmlHelper.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/JsonHelper.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/JsonHelper.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/JsonHelper.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/JsonHelper.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/MidnightTime.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/MidnightTime.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/MidnightTime.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/MidnightTime.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/Round.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/Round.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/Round.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/Round.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/TimeChangeType.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/TimeChangeType.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/TimeChangeType.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/TimeChangeType.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/TimerUtil.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/TimerUtil.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/TimerUtil.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/TimerUtil.kt
diff --git a/interfaces/src/main/java/info/nightscout/interfaces/utils/TrendCalculator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/TrendCalculator.kt
similarity index 100%
rename from interfaces/src/main/java/info/nightscout/interfaces/utils/TrendCalculator.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/TrendCalculator.kt
diff --git a/interfaces/src/main/res/drawable/ic_actions_profileswitch.xml b/core/interfaces/src/main/res/drawable/ic_actions_profileswitch.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_actions_profileswitch.xml
rename to core/interfaces/src/main/res/drawable/ic_actions_profileswitch.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_date.xml b/core/interfaces/src/main/res/drawable/ic_meta_date.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_date.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_date.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_encryption.xml b/core/interfaces/src/main/res/drawable/ic_meta_encryption.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_encryption.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_encryption.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_error.xml b/core/interfaces/src/main/res/drawable/ic_meta_error.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_error.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_error.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_flavour.xml b/core/interfaces/src/main/res/drawable/ic_meta_flavour.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_flavour.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_flavour.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_format.xml b/core/interfaces/src/main/res/drawable/ic_meta_format.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_format.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_format.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_model.xml b/core/interfaces/src/main/res/drawable/ic_meta_model.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_model.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_model.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_name.xml b/core/interfaces/src/main/res/drawable/ic_meta_name.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_name.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_name.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_ok.xml b/core/interfaces/src/main/res/drawable/ic_meta_ok.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_ok.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_ok.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_version.xml b/core/interfaces/src/main/res/drawable/ic_meta_version.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_version.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_version.xml
diff --git a/interfaces/src/main/res/drawable/ic_meta_warning.xml b/core/interfaces/src/main/res/drawable/ic_meta_warning.xml
similarity index 100%
rename from interfaces/src/main/res/drawable/ic_meta_warning.xml
rename to core/interfaces/src/main/res/drawable/ic_meta_warning.xml
diff --git a/interfaces/src/main/res/values-night/colors.xml b/core/interfaces/src/main/res/values-night/colors.xml
similarity index 100%
rename from interfaces/src/main/res/values-night/colors.xml
rename to core/interfaces/src/main/res/values-night/colors.xml
diff --git a/interfaces/src/main/res/values/colors.xml b/core/interfaces/src/main/res/values/colors.xml
similarity index 100%
rename from interfaces/src/main/res/values/colors.xml
rename to core/interfaces/src/main/res/values/colors.xml
diff --git a/interfaces/src/main/res/values/strings.xml b/core/interfaces/src/main/res/values/strings.xml
similarity index 100%
rename from interfaces/src/main/res/values/strings.xml
rename to core/interfaces/src/main/res/values/strings.xml
diff --git a/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt b/core/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
similarity index 100%
rename from interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
rename to core/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
diff --git a/interfaces/.gitignore b/core/libraries/.gitignore
similarity index 100%
rename from interfaces/.gitignore
rename to core/libraries/.gitignore
diff --git a/libraries/build.gradle b/core/libraries/build.gradle
similarity index 100%
rename from libraries/build.gradle
rename to core/libraries/build.gradle
diff --git a/interfaces/consumer-rules.pro b/core/libraries/consumer-rules.pro
similarity index 100%
rename from interfaces/consumer-rules.pro
rename to core/libraries/consumer-rules.pro
diff --git a/libraries/libs/hellocharts-library-1.5.8.aar b/core/libraries/libs/hellocharts-library-1.5.8.aar
similarity index 100%
rename from libraries/libs/hellocharts-library-1.5.8.aar
rename to core/libraries/libs/hellocharts-library-1.5.8.aar
diff --git a/libraries/libs/iconify.aar b/core/libraries/libs/iconify.aar
similarity index 100%
rename from libraries/libs/iconify.aar
rename to core/libraries/libs/iconify.aar
diff --git a/libraries/libs/ustwo-clockwise-debug.aar b/core/libraries/libs/ustwo-clockwise-debug.aar
similarity index 100%
rename from libraries/libs/ustwo-clockwise-debug.aar
rename to core/libraries/libs/ustwo-clockwise-debug.aar
diff --git a/libraries/libs/wearpreferenceactivity-0.5.0.aar b/core/libraries/libs/wearpreferenceactivity-0.5.0.aar
similarity index 100%
rename from libraries/libs/wearpreferenceactivity-0.5.0.aar
rename to core/libraries/libs/wearpreferenceactivity-0.5.0.aar
diff --git a/interfaces/proguard-rules.pro b/core/libraries/proguard-rules.pro
similarity index 100%
rename from interfaces/proguard-rules.pro
rename to core/libraries/proguard-rules.pro
diff --git a/libraries/src/main/AndroidManifest.xml b/core/libraries/src/main/AndroidManifest.xml
similarity index 100%
rename from libraries/src/main/AndroidManifest.xml
rename to core/libraries/src/main/AndroidManifest.xml
diff --git a/libraries/.gitignore b/core/ns-sdk/.gitignore
similarity index 100%
rename from libraries/.gitignore
rename to core/ns-sdk/.gitignore
diff --git a/ns-sdk/build.gradle b/core/ns-sdk/build.gradle
similarity index 100%
rename from ns-sdk/build.gradle
rename to core/ns-sdk/build.gradle
diff --git a/libraries/proguard-rules.pro b/core/ns-sdk/proguard-rules.pro
similarity index 100%
rename from libraries/proguard-rules.pro
rename to core/ns-sdk/proguard-rules.pro
diff --git a/ns-sdk/src/main/AndroidManifest.xml b/core/ns-sdk/src/main/AndroidManifest.xml
similarity index 100%
rename from ns-sdk/src/main/AndroidManifest.xml
rename to core/ns-sdk/src/main/AndroidManifest.xml
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidCallbackClientImpl.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidCallbackClientImpl.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidCallbackClientImpl.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidCallbackClientImpl.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidRxClientImpl.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidRxClientImpl.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidRxClientImpl.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidRxClientImpl.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/DateHeaderOutOfToleranceException.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/DateHeaderOutOfToleranceException.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/exceptions/DateHeaderOutOfToleranceException.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/DateHeaderOutOfToleranceException.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidAccessTokenException.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidAccessTokenException.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidAccessTokenException.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/InvalidAccessTokenException.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/NightscoutException.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/NightscoutException.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/exceptions/NightscoutException.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/NightscoutException.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/TodoNightscoutException.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/TodoNightscoutException.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/exceptions/TodoNightscoutException.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/TodoNightscoutException.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidCallbackClient.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidCallbackClient.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidCallbackClient.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidCallbackClient.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidClient.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidRxClient.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidRxClient.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidRxClient.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/interfaces/NSAndroidRxClient.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermission.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermission.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermission.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermission.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermissions.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermissions.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermissions.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/ApiPermissions.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Status.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Status.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Status.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Status.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Storage.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Storage.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Storage.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/Storage.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Direction.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Direction.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Direction.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Direction.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Entry.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Entry.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Entry.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/Entry.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NSSgvV3.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NSSgvV3.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NSSgvV3.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NSSgvV3.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NsUnits.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NsUnits.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NsUnits.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/entry/NsUnits.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/EventType.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/EventType.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/EventType.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/EventType.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/GlucoseType.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/GlucoseType.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/GlucoseType.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/GlucoseType.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolus.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolus.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolus.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolus.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolusWizard.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolusWizard.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolusWizard.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSBolusWizard.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSCarbs.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSCarbs.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSCarbs.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSCarbs.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSEffectiveProfileSwitch.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSEffectiveProfileSwitch.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSEffectiveProfileSwitch.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSEffectiveProfileSwitch.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSExtendedBolus.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSExtendedBolus.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSExtendedBolus.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSExtendedBolus.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSOfflineEvent.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSOfflineEvent.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSOfflineEvent.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSOfflineEvent.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSProfileSwitch.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSProfileSwitch.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSProfileSwitch.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSProfileSwitch.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryBasal.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryBasal.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryBasal.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryBasal.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryTarget.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryTarget.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryTarget.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTemporaryTarget.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTherapyEvent.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTherapyEvent.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTherapyEvent.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTherapyEvent.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTreatment.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTreatment.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTreatment.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/localmodel/treatment/NSTreatment.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/mapper/ApiPermissionMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/ApiPermissionMapper.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/mapper/ApiPermissionMapper.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/ApiPermissionMapper.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StatusResponseMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StatusResponseMapper.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/mapper/StatusResponseMapper.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StatusResponseMapper.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StorageMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StorageMapper.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/mapper/StorageMapper.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/StorageMapper.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/SvgMapper.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/mapper/TreatmentMapper.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/networking/NSAuthInterceptor.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NSAuthInterceptor.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/networking/NSAuthInterceptor.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NSAuthInterceptor.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/networking/NetworkStackBuilder.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NetworkStackBuilder.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/networking/NetworkStackBuilder.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NetworkStackBuilder.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutAuthRefreshService.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutAuthRefreshService.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutAuthRefreshService.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutAuthRefreshService.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/networking/NightscoutRemoteService.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/networking/Status.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/networking/Status.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/networking/Status.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/networking/Status.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/LastModified.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteAuthResponse.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteAuthResponse.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteAuthResponse.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteAuthResponse.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteDeviceStatus.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteDeviceStatus.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteDeviceStatus.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteDeviceStatus.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteEntry.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteEntry.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteEntry.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteEntry.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteStatusResponse.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteStatusResponse.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteStatusResponse.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteStatusResponse.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteTreatment.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteTreatment.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteTreatment.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/RemoteTreatment.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/examples.json b/core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/examples.json
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/examples.json
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/remotemodel/examples.json
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/utils/CoroutineUtils.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/utils/CoroutineUtils.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/utils/CoroutineUtils.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/utils/CoroutineUtils.kt
diff --git a/ns-sdk/src/main/java/info/nightscout/sdk/utils/ListUtils.kt b/core/ns-sdk/src/main/java/info/nightscout/sdk/utils/ListUtils.kt
similarity index 100%
rename from ns-sdk/src/main/java/info/nightscout/sdk/utils/ListUtils.kt
rename to core/ns-sdk/src/main/java/info/nightscout/sdk/utils/ListUtils.kt
diff --git a/core/utils/build.gradle b/core/utils/build.gradle
index f29b5bea19..be34aea2e7 100644
--- a/core/utils/build.gradle
+++ b/core/utils/build.gradle
@@ -19,7 +19,6 @@ android {
 
 dependencies {
 
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
 
     //Firebase
diff --git a/crowdin.yml b/crowdin.yml
index df47c1634c..0c54fa2130 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -21,20 +21,18 @@ files:
     translation: /plugins/configuration/src/main/res/values-%android_code%/strings.xml
   - source: /core/core-main/src/main/res/values/protection.xml
     translation: /core/core-main/src/main/res/values-%android_code%/protection.xml
-  - source: /core/core-main/src/main/res/values/validator.xml
-    translation: /core/core-main/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
+  - source: /core/graph/src/main/res/values/validator.xml
+    translation: /core/graph/src/main/res/values-%android_code%/validator.xml
+  - source: /core/interfaces/src/main/res/values/strings.xml
+    translation: /core/interfaces/src/main/res/values-%android_code%/strings.xml
   - source: /core/utils/src/main/res/values/strings.xml
     translation: /core/utils/src/main/res/values-%android_code%/strings.xml
   - source: /core/ui/src/main/res/values/strings.xml
     translation: /core/ui/src/main/res/values-%android_code%/strings.xml
-  - source: /core/graph/src/main/res/values/strings.xml
-    translation: /core/graph/src/main/res/values-%android_code%/strings.xml
   - source: /app-wear-shared/shared/src/main/res/values/strings.xml
     translation: /app-wear-shared/shared/src/main/res/values-%android_code%/strings.xml
-  - source: /app-wear-shared/rx/src/main/res/values/strings.xml
-    translation: /app-wear-shared/rx/src/main/res/values-%android_code%/strings.xml
+  - source: /app-wear-shared/shared-impl/src/main/res/values/strings.xml
+    translation: /app-wear-shared/shared-impl/src/main/res/values-%android_code%/strings.xml
   - source: /pump/combo/src/main/res/values/strings.xml
     translation: /pump/combo/src/main/res/values-%android_code%/strings.xml
   - source: /pump/combov2/src/main/res/values/strings.xml
diff --git a/implementation/build.gradle b/implementation/build.gradle
index e1050c0de3..ef3aa4f4d2 100644
--- a/implementation/build.gradle
+++ b/implementation/build.gradle
@@ -16,15 +16,14 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(path: ':graphview')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':plugins:automation')
-    implementation project(':interfaces')
     implementation project(':core:core-main')
     implementation project(':core:graph')
+    implementation project(':core:graphview')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
     implementation project(':ui')
diff --git a/insight/build.gradle b/insight/build.gradle
index 7484683df6..e1fb5bf550 100644
--- a/insight/build.gradle
+++ b/insight/build.gradle
@@ -27,10 +27,9 @@ android {
 
 dependencies {
 
+    implementation project(':core:interfaces')
     implementation project(':core:core-main')
     implementation project(':core:utils')
-    implementation project(':interfaces')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':pump:pump-common')
 
diff --git a/libraries/consumer-rules.pro b/libraries/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ns-sdk/.gitignore b/ns-sdk/.gitignore
deleted file mode 100644
index 42afabfd2a..0000000000
--- a/ns-sdk/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/ns-sdk/proguard-rules.pro b/ns-sdk/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/ns-sdk/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/aps/build.gradle b/plugins/aps/build.gradle
index 137cf8bce1..ccef8c0a88 100644
--- a/plugins/aps/build.gradle
+++ b/plugins/aps/build.gradle
@@ -16,14 +16,13 @@ android {
 }
 
 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:interfaces')
     implementation project(':core:utils')
     implementation project(':core:ui')
-    implementation project(':interfaces')
 
     api "androidx.appcompat:appcompat:$appcompat_version"
     api "androidx.swiperefreshlayout:swiperefreshlayout:$swipe_version"
diff --git a/plugins/automation/build.gradle b/plugins/automation/build.gradle
index 0950a142c7..03f11a21d5 100644
--- a/plugins/automation/build.gradle
+++ b/plugins/automation/build.gradle
@@ -17,15 +17,14 @@ android {
 }
 
 dependencies {
-    implementation project(':graphview')
+    implementation project(':core:graphview')
     implementation project(':core:core-main')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':interfaces')
+    implementation project(':core:interfaces')
 
     api "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
     api "com.google.android.gms:play-services-location:$play_services_location_version"
diff --git a/plugins/configuration/build.gradle b/plugins/configuration/build.gradle
index 8d21ec056c..90a51b94a5 100644
--- a/plugins/configuration/build.gradle
+++ b/plugins/configuration/build.gradle
@@ -17,11 +17,10 @@ android {
 
 
 dependencies {
-    implementation project(':interfaces')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
     implementation project(':core:ui')
 }
\ No newline at end of file
diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle
index 42602cba46..90c042dcba 100644
--- a/plugins/main/build.gradle
+++ b/plugins/main/build.gradle
@@ -16,17 +16,16 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':graphview')
     implementation project(':core:core-main')
     implementation project(':core:graph')
+    implementation project(':core:graphview')
+    implementation project(':core:interfaces')
+    implementation project(':core:ns-sdk')
     implementation project(':core:ui')
     implementation project(':core:utils')
-    implementation project(':interfaces')
-    implementation project(':ns-sdk')
 
     api "androidx.appcompat:appcompat:$appcompat_version"
     api "com.google.android.material:material:$material_version"
diff --git a/plugins/openhumans/build.gradle b/plugins/openhumans/build.gradle
index 926a911ac0..aafebafc62 100644
--- a/plugins/openhumans/build.gradle
+++ b/plugins/openhumans/build.gradle
@@ -19,8 +19,7 @@ android {
 dependencies {
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':interfaces')
-    implementation project(':app-wear-shared:rx')
+    implementation project(':core:interfaces')
     implementation project(':app-wear-shared:shared')
 
     api "com.squareup.okhttp3:okhttp:$okhttp3_version"
diff --git a/plugins/sensitivity/build.gradle b/plugins/sensitivity/build.gradle
index 69153664be..843f2d5be8 100644
--- a/plugins/sensitivity/build.gradle
+++ b/plugins/sensitivity/build.gradle
@@ -17,12 +17,11 @@ android {
 
 
 dependencies {
-    implementation project(':interfaces')
-    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:interfaces')
     implementation project(':core:utils')
     implementation project(':core:ui')
 }
\ No newline at end of file
diff --git a/pump/combo/build.gradle b/pump/combo/build.gradle
index 65352217a5..2835292613 100644
--- a/pump/combo/build.gradle
+++ b/pump/combo/build.gradle
@@ -16,12 +16,11 @@ android {
 }
 
 dependencies {
-    implementation project(':libraries')
+    implementation project(':core:libraries')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':interfaces')
 
     // RuffyScripter
     api 'com.google.guava:guava:31.1-jre'
diff --git a/pump/combov2/build.gradle b/pump/combov2/build.gradle
index 696a6fcf44..58be408fb4 100644
--- a/pump/combov2/build.gradle
+++ b/pump/combov2/build.gradle
@@ -10,12 +10,11 @@ apply from: "${project.rootDir}/core/core-main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
 
 dependencies {
-    implementation project(':libraries')
+    implementation project(':core:libraries')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':interfaces')
     implementation(project(":pump:combov2:comboctl"))
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version")
     // This is necessary to avoid errors like these which otherwise come up often at runtime:
diff --git a/pump/dana/build.gradle b/pump/dana/build.gradle
index f9a8287262..4aab1ad283 100644
--- a/pump/dana/build.gradle
+++ b/pump/dana/build.gradle
@@ -26,12 +26,11 @@ android {
 }
 
 dependencies {
-    implementation project(':libraries')
+    implementation project(':core:libraries')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':interfaces')
 
     api "androidx.room:room-ktx:$room_version"
     api "androidx.room:room-runtime:$room_version"
diff --git a/pump/danar/build.gradle b/pump/danar/build.gradle
index 61303f823e..9d5d36753b 100644
--- a/pump/danar/build.gradle
+++ b/pump/danar/build.gradle
@@ -16,11 +16,10 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':pump:dana')
-    implementation project(':interfaces')
 }
\ No newline at end of file
diff --git a/pump/danars/build.gradle b/pump/danars/build.gradle
index d5292eb455..0abbeb4b3b 100644
--- a/pump/danars/build.gradle
+++ b/pump/danars/build.gradle
@@ -32,10 +32,9 @@ android {
 
 dependencies {
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':pump:dana')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':interfaces')
 }
\ No newline at end of file
diff --git a/pump/diaconn/build.gradle b/pump/diaconn/build.gradle
index de93d0684e..05ddc81317 100644
--- a/pump/diaconn/build.gradle
+++ b/pump/diaconn/build.gradle
@@ -26,10 +26,9 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':libraries')
-    implementation project(':interfaces')
+    implementation project(':core:libraries')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
     implementation project(':core:core-main')
 
diff --git a/pump/eopatch/build.gradle b/pump/eopatch/build.gradle
index b1bc664eeb..37219704eb 100644
--- a/pump/eopatch/build.gradle
+++ b/pump/eopatch/build.gradle
@@ -21,15 +21,14 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':pump:eopatch-core')
-    implementation project(':libraries')
-    implementation project(':app-wear-shared:rx')
+    implementation project(':core:libraries')
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
     implementation project(':core:ui')
-    implementation project(':interfaces')
 
     //RxAndroidBle
     implementation "com.polidea.rxandroidble3:rxandroidble:1.17.0"
diff --git a/pump/medtronic/build.gradle b/pump/medtronic/build.gradle
index 9f1ae45f07..83970fb133 100644
--- a/pump/medtronic/build.gradle
+++ b/pump/medtronic/build.gradle
@@ -16,15 +16,14 @@ android {
 }
 
 dependencies {
-    implementation project(':libraries')
-    implementation project(':app-wear-shared:rx')
+    implementation project(':core:libraries')
     implementation project(':app-wear-shared:shared')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':pump:pump-common')
     implementation project(':pump:pump-core')
     implementation project(':pump:rileylink')
-    implementation project(':interfaces')
     implementation project(path: ':core:utils')
     testImplementation project(path: ':database:impl')
 }
diff --git a/pump/omnipod-common/build.gradle b/pump/omnipod-common/build.gradle
index fecebd7b2a..2d76dedaca 100644
--- a/pump/omnipod-common/build.gradle
+++ b/pump/omnipod-common/build.gradle
@@ -17,12 +17,11 @@ android {
 }
 
 dependencies {
-    implementation project(':libraries')
+    implementation project(':core:libraries')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':interfaces')
 
     api "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
     api "androidx.fragment:fragment-ktx:$fragmentktx_version"
diff --git a/pump/omnipod-dash/build.gradle b/pump/omnipod-dash/build.gradle
index c18f325187..723d1bcdb3 100644
--- a/pump/omnipod-dash/build.gradle
+++ b/pump/omnipod-dash/build.gradle
@@ -28,15 +28,14 @@ android {
 dependencies {
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':libraries')
+    implementation project(':core:libraries')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':pump:pump-common')
     implementation project(':pump:omnipod-common')
-    implementation project(':interfaces')
 
     api "androidx.room:room-ktx:$room_version"
     api "androidx.room:room-runtime:$room_version"
diff --git a/pump/omnipod-eros/build.gradle b/pump/omnipod-eros/build.gradle
index fd7eca4d58..bf9148c9ca 100644
--- a/pump/omnipod-eros/build.gradle
+++ b/pump/omnipod-eros/build.gradle
@@ -28,17 +28,16 @@ android {
 dependencies {
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':libraries')
+    implementation project(':core:libraries')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':pump:pump-common')
     implementation project(':pump:pump-core')
     implementation project(':pump:rileylink')
     implementation project(':pump:omnipod-common')
-    implementation project(':interfaces')
 
     api "androidx.room:room-ktx:$room_version"
     api "androidx.room:room-runtime:$room_version"
diff --git a/pump/pump-common/build.gradle b/pump/pump-common/build.gradle
index ae3686ebb9..d336da7c88 100644
--- a/pump/pump-common/build.gradle
+++ b/pump/pump-common/build.gradle
@@ -17,10 +17,9 @@ android {
 
 dependencies {
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
-    implementation project(':interfaces')
 
     implementation('com.thoughtworks.xstream:xstream:1.4.19') {
         exclude group: 'xmlpull', module: 'xmlpull'
diff --git a/pump/rileylink/build.gradle b/pump/rileylink/build.gradle
index a82aebc1d4..c838c611aa 100644
--- a/pump/rileylink/build.gradle
+++ b/pump/rileylink/build.gradle
@@ -16,11 +16,10 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':pump:pump-common')
     implementation project(':pump:pump-core')
-    implementation project(':interfaces')
 }
diff --git a/settings.gradle b/settings.gradle
index c40fe0fe1a..76e170b790 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,20 +1,19 @@
 include ':app'
 include ':wear'
-include ':database:entities'
-include ':database:impl'
-include ':core:core-main'
-include ':core:graph'
-include ':core:utils'
-include ':core:ui'
-include ':app-wear-shared:rx'
 include ':app-wear-shared:shared'
 include ':app-wear-shared:shared-impl'
-include ':graphview'
-include ':libraries'
-include ':ns-sdk'
+include ':core:core-main'
+include ':core:graphview'
+include ':core:graph'
+include ':core:interfaces'
+include ':core:libraries'
+include ':core:utils'
+include ':core:ui'
+include ':database:entities'
+include ':database:impl'
+include ':core:ns-sdk'
 include ':ui'
 include ':implementation'
-include ':interfaces'
 include ':plugins:aps'
 include ':plugins:automation'
 include ':plugins:configuration'
diff --git a/ui/build.gradle b/ui/build.gradle
index 30c99657c5..dc504acae1 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -16,14 +16,13 @@ android {
 }
 
 dependencies {
-    implementation project(':libraries')
-    implementation project(':graphview')
-    implementation project(':app-wear-shared:rx')
+    implementation project(':core:libraries')
+    implementation project(':core:graphview')
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':interfaces')
     implementation project(':core:core-main')
+    implementation project(':core:interfaces')
     implementation project(':core:graph')
     implementation project(':core:ui')
     implementation project(':core:utils')
diff --git a/wear/build.gradle b/wear/build.gradle
index 36bde03780..dd0bd706b8 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -95,7 +95,6 @@ allprojects {
 
 
 dependencies {
-    implementation project(':app-wear-shared:rx')
     implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:shared-impl')
 
@@ -112,9 +111,9 @@ dependencies {
     compileOnly "com.google.android.wearable:wearable:$wearable_version"
     implementation "com.google.android.support:wearable:$wearable_version"
     implementation "com.google.android.gms:play-services-wearable:$play_services_wearable_version"
-    implementation(files("${rootProject.rootDir}/libraries/libs/ustwo-clockwise-debug.aar"))
-    implementation(files("${rootProject.rootDir}/libraries/libs/wearpreferenceactivity-0.5.0.aar"))
-    implementation(files("${rootProject.rootDir}/libraries/libs/hellocharts-library-1.5.8.aar"))
+    implementation(files("${rootProject.rootDir}/core/libraries/libs/ustwo-clockwise-debug.aar"))
+    implementation(files("${rootProject.rootDir}/core/libraries/libs/wearpreferenceactivity-0.5.0.aar"))
+    implementation(files("${rootProject.rootDir}/core/libraries/libs/hellocharts-library-1.5.8.aar"))
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"