diff --git a/app-phone/.gitignore b/app/.gitignore
similarity index 100%
rename from app-phone/.gitignore
rename to app/.gitignore
diff --git a/app-phone/build.gradle b/app/build.gradle
similarity index 100%
rename from app-phone/build.gradle
rename to app/build.gradle
diff --git a/app-phone/proguard-rules-debug.pro b/app/proguard-rules-debug.pro
similarity index 100%
rename from app-phone/proguard-rules-debug.pro
rename to app/proguard-rules-debug.pro
diff --git a/app-phone/proguard/proguard-moshi.pro b/app/proguard/proguard-moshi.pro
similarity index 100%
rename from app-phone/proguard/proguard-moshi.pro
rename to app/proguard/proguard-moshi.pro
diff --git a/app-phone/proguard/proguard-rules.pro b/app/proguard/proguard-rules.pro
similarity index 100%
rename from app-phone/proguard/proguard-rules.pro
rename to app/proguard/proguard-rules.pro
diff --git a/app-phone/src/foss/java/eu/darken/capod/common/upgrade/UpgradeModule.kt b/app/src/foss/java/eu/darken/capod/common/upgrade/UpgradeModule.kt
similarity index 100%
rename from app-phone/src/foss/java/eu/darken/capod/common/upgrade/UpgradeModule.kt
rename to app/src/foss/java/eu/darken/capod/common/upgrade/UpgradeModule.kt
diff --git a/app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/FossCache.kt b/app/src/foss/java/eu/darken/capod/common/upgrade/core/FossCache.kt
similarity index 100%
rename from app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/FossCache.kt
rename to app/src/foss/java/eu/darken/capod/common/upgrade/core/FossCache.kt
diff --git a/app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/FossUpgrade.kt b/app/src/foss/java/eu/darken/capod/common/upgrade/core/FossUpgrade.kt
similarity index 100%
rename from app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/FossUpgrade.kt
rename to app/src/foss/java/eu/darken/capod/common/upgrade/core/FossUpgrade.kt
diff --git a/app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt b/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt
similarity index 100%
rename from app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt
rename to app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt
diff --git a/app-phone/src/foss/res/values-af-rZA/strings.xml b/app/src/foss/res/values-af-rZA/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-af-rZA/strings.xml
rename to app/src/foss/res/values-af-rZA/strings.xml
diff --git a/app-phone/src/foss/res/values-am/strings.xml b/app/src/foss/res/values-am/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-am/strings.xml
rename to app/src/foss/res/values-am/strings.xml
diff --git a/app-phone/src/foss/res/values-ar/strings.xml b/app/src/foss/res/values-ar/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ar/strings.xml
rename to app/src/foss/res/values-ar/strings.xml
diff --git a/app-phone/src/foss/res/values-az/strings.xml b/app/src/foss/res/values-az/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-az/strings.xml
rename to app/src/foss/res/values-az/strings.xml
diff --git a/app-phone/src/foss/res/values-be/strings.xml b/app/src/foss/res/values-be/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-be/strings.xml
rename to app/src/foss/res/values-be/strings.xml
diff --git a/app-phone/src/foss/res/values-bg/strings.xml b/app/src/foss/res/values-bg/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-bg/strings.xml
rename to app/src/foss/res/values-bg/strings.xml
diff --git a/app-phone/src/foss/res/values-bn-rBD/strings.xml b/app/src/foss/res/values-bn-rBD/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-bn-rBD/strings.xml
rename to app/src/foss/res/values-bn-rBD/strings.xml
diff --git a/app-phone/src/foss/res/values-ca/strings.xml b/app/src/foss/res/values-ca/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ca/strings.xml
rename to app/src/foss/res/values-ca/strings.xml
diff --git a/app-phone/src/foss/res/values-cs/strings.xml b/app/src/foss/res/values-cs/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-cs/strings.xml
rename to app/src/foss/res/values-cs/strings.xml
diff --git a/app-phone/src/foss/res/values-da/strings.xml b/app/src/foss/res/values-da/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-da/strings.xml
rename to app/src/foss/res/values-da/strings.xml
diff --git a/app-phone/src/foss/res/values-de/strings.xml b/app/src/foss/res/values-de/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-de/strings.xml
rename to app/src/foss/res/values-de/strings.xml
diff --git a/app-phone/src/foss/res/values-el/strings.xml b/app/src/foss/res/values-el/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-el/strings.xml
rename to app/src/foss/res/values-el/strings.xml
diff --git a/app-phone/src/foss/res/values-es-rAR/strings.xml b/app/src/foss/res/values-es-rAR/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-es-rAR/strings.xml
rename to app/src/foss/res/values-es-rAR/strings.xml
diff --git a/app-phone/src/foss/res/values-es-rMX/strings.xml b/app/src/foss/res/values-es-rMX/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-es-rMX/strings.xml
rename to app/src/foss/res/values-es-rMX/strings.xml
diff --git a/app-phone/src/foss/res/values-es/strings.xml b/app/src/foss/res/values-es/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-es/strings.xml
rename to app/src/foss/res/values-es/strings.xml
diff --git a/app-phone/src/foss/res/values-et-rEE/strings.xml b/app/src/foss/res/values-et-rEE/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-et-rEE/strings.xml
rename to app/src/foss/res/values-et-rEE/strings.xml
diff --git a/app-phone/src/foss/res/values-eu-rES/strings.xml b/app/src/foss/res/values-eu-rES/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-eu-rES/strings.xml
rename to app/src/foss/res/values-eu-rES/strings.xml
diff --git a/app-phone/src/foss/res/values-fa/strings.xml b/app/src/foss/res/values-fa/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-fa/strings.xml
rename to app/src/foss/res/values-fa/strings.xml
diff --git a/app-phone/src/foss/res/values-fi/strings.xml b/app/src/foss/res/values-fi/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-fi/strings.xml
rename to app/src/foss/res/values-fi/strings.xml
diff --git a/app-phone/src/foss/res/values-fil/strings.xml b/app/src/foss/res/values-fil/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-fil/strings.xml
rename to app/src/foss/res/values-fil/strings.xml
diff --git a/app-phone/src/foss/res/values-fr/strings.xml b/app/src/foss/res/values-fr/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-fr/strings.xml
rename to app/src/foss/res/values-fr/strings.xml
diff --git a/app-phone/src/foss/res/values-gl-rES/strings.xml b/app/src/foss/res/values-gl-rES/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-gl-rES/strings.xml
rename to app/src/foss/res/values-gl-rES/strings.xml
diff --git a/app-phone/src/foss/res/values-hi-rIN/strings.xml b/app/src/foss/res/values-hi-rIN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-hi-rIN/strings.xml
rename to app/src/foss/res/values-hi-rIN/strings.xml
diff --git a/app-phone/src/foss/res/values-hr/strings.xml b/app/src/foss/res/values-hr/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-hr/strings.xml
rename to app/src/foss/res/values-hr/strings.xml
diff --git a/app-phone/src/foss/res/values-hu/strings.xml b/app/src/foss/res/values-hu/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-hu/strings.xml
rename to app/src/foss/res/values-hu/strings.xml
diff --git a/app-phone/src/foss/res/values-hy-rAM/strings.xml b/app/src/foss/res/values-hy-rAM/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-hy-rAM/strings.xml
rename to app/src/foss/res/values-hy-rAM/strings.xml
diff --git a/app-phone/src/foss/res/values-in/strings.xml b/app/src/foss/res/values-in/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-in/strings.xml
rename to app/src/foss/res/values-in/strings.xml
diff --git a/app-phone/src/foss/res/values-is/strings.xml b/app/src/foss/res/values-is/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-is/strings.xml
rename to app/src/foss/res/values-is/strings.xml
diff --git a/app-phone/src/foss/res/values-it/strings.xml b/app/src/foss/res/values-it/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-it/strings.xml
rename to app/src/foss/res/values-it/strings.xml
diff --git a/app-phone/src/foss/res/values-iw/strings.xml b/app/src/foss/res/values-iw/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-iw/strings.xml
rename to app/src/foss/res/values-iw/strings.xml
diff --git a/app-phone/src/foss/res/values-ja/strings.xml b/app/src/foss/res/values-ja/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ja/strings.xml
rename to app/src/foss/res/values-ja/strings.xml
diff --git a/app-phone/src/foss/res/values-ka-rGE/strings.xml b/app/src/foss/res/values-ka-rGE/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ka-rGE/strings.xml
rename to app/src/foss/res/values-ka-rGE/strings.xml
diff --git a/app-phone/src/foss/res/values-km-rKH/strings.xml b/app/src/foss/res/values-km-rKH/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-km-rKH/strings.xml
rename to app/src/foss/res/values-km-rKH/strings.xml
diff --git a/app-phone/src/foss/res/values-kmr-rTR/strings.xml b/app/src/foss/res/values-kmr-rTR/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-kmr-rTR/strings.xml
rename to app/src/foss/res/values-kmr-rTR/strings.xml
diff --git a/app-phone/src/foss/res/values-kn-rIN/strings.xml b/app/src/foss/res/values-kn-rIN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-kn-rIN/strings.xml
rename to app/src/foss/res/values-kn-rIN/strings.xml
diff --git a/app-phone/src/foss/res/values-ko/strings.xml b/app/src/foss/res/values-ko/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ko/strings.xml
rename to app/src/foss/res/values-ko/strings.xml
diff --git a/app-phone/src/foss/res/values-ky-rKG/strings.xml b/app/src/foss/res/values-ky-rKG/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ky-rKG/strings.xml
rename to app/src/foss/res/values-ky-rKG/strings.xml
diff --git a/app-phone/src/foss/res/values-lo-rLA/strings.xml b/app/src/foss/res/values-lo-rLA/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-lo-rLA/strings.xml
rename to app/src/foss/res/values-lo-rLA/strings.xml
diff --git a/app-phone/src/foss/res/values-lt/strings.xml b/app/src/foss/res/values-lt/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-lt/strings.xml
rename to app/src/foss/res/values-lt/strings.xml
diff --git a/app-phone/src/foss/res/values-lv/strings.xml b/app/src/foss/res/values-lv/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-lv/strings.xml
rename to app/src/foss/res/values-lv/strings.xml
diff --git a/app-phone/src/foss/res/values-mk-rMK/strings.xml b/app/src/foss/res/values-mk-rMK/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-mk-rMK/strings.xml
rename to app/src/foss/res/values-mk-rMK/strings.xml
diff --git a/app-phone/src/foss/res/values-ml-rIN/strings.xml b/app/src/foss/res/values-ml-rIN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ml-rIN/strings.xml
rename to app/src/foss/res/values-ml-rIN/strings.xml
diff --git a/app-phone/src/foss/res/values-mn-rMN/strings.xml b/app/src/foss/res/values-mn-rMN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-mn-rMN/strings.xml
rename to app/src/foss/res/values-mn-rMN/strings.xml
diff --git a/app-phone/src/foss/res/values-mr-rIN/strings.xml b/app/src/foss/res/values-mr-rIN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-mr-rIN/strings.xml
rename to app/src/foss/res/values-mr-rIN/strings.xml
diff --git a/app-phone/src/foss/res/values-ms/strings.xml b/app/src/foss/res/values-ms/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ms/strings.xml
rename to app/src/foss/res/values-ms/strings.xml
diff --git a/app-phone/src/foss/res/values-my-rMM/strings.xml b/app/src/foss/res/values-my-rMM/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-my-rMM/strings.xml
rename to app/src/foss/res/values-my-rMM/strings.xml
diff --git a/app-phone/src/foss/res/values-ne-rNP/strings.xml b/app/src/foss/res/values-ne-rNP/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ne-rNP/strings.xml
rename to app/src/foss/res/values-ne-rNP/strings.xml
diff --git a/app-phone/src/foss/res/values-nl/strings.xml b/app/src/foss/res/values-nl/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-nl/strings.xml
rename to app/src/foss/res/values-nl/strings.xml
diff --git a/app-phone/src/foss/res/values-no/strings.xml b/app/src/foss/res/values-no/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-no/strings.xml
rename to app/src/foss/res/values-no/strings.xml
diff --git a/app-phone/src/foss/res/values-pl/strings.xml b/app/src/foss/res/values-pl/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-pl/strings.xml
rename to app/src/foss/res/values-pl/strings.xml
diff --git a/app-phone/src/foss/res/values-pt-rBR/strings.xml b/app/src/foss/res/values-pt-rBR/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-pt-rBR/strings.xml
rename to app/src/foss/res/values-pt-rBR/strings.xml
diff --git a/app-phone/src/foss/res/values-pt/strings.xml b/app/src/foss/res/values-pt/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-pt/strings.xml
rename to app/src/foss/res/values-pt/strings.xml
diff --git a/app-phone/src/foss/res/values-rm/strings.xml b/app/src/foss/res/values-rm/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-rm/strings.xml
rename to app/src/foss/res/values-rm/strings.xml
diff --git a/app-phone/src/foss/res/values-ro/strings.xml b/app/src/foss/res/values-ro/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ro/strings.xml
rename to app/src/foss/res/values-ro/strings.xml
diff --git a/app-phone/src/foss/res/values-ru/strings.xml b/app/src/foss/res/values-ru/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ru/strings.xml
rename to app/src/foss/res/values-ru/strings.xml
diff --git a/app-phone/src/foss/res/values-sc-rIT/strings.xml b/app/src/foss/res/values-sc-rIT/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-sc-rIT/strings.xml
rename to app/src/foss/res/values-sc-rIT/strings.xml
diff --git a/app-phone/src/foss/res/values-si-rLK/strings.xml b/app/src/foss/res/values-si-rLK/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-si-rLK/strings.xml
rename to app/src/foss/res/values-si-rLK/strings.xml
diff --git a/app-phone/src/foss/res/values-sk/strings.xml b/app/src/foss/res/values-sk/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-sk/strings.xml
rename to app/src/foss/res/values-sk/strings.xml
diff --git a/app-phone/src/foss/res/values-sl/strings.xml b/app/src/foss/res/values-sl/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-sl/strings.xml
rename to app/src/foss/res/values-sl/strings.xml
diff --git a/app-phone/src/foss/res/values-sq-rAL/strings.xml b/app/src/foss/res/values-sq-rAL/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-sq-rAL/strings.xml
rename to app/src/foss/res/values-sq-rAL/strings.xml
diff --git a/app-phone/src/foss/res/values-sr/strings.xml b/app/src/foss/res/values-sr/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-sr/strings.xml
rename to app/src/foss/res/values-sr/strings.xml
diff --git a/app-phone/src/foss/res/values-sv/strings.xml b/app/src/foss/res/values-sv/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-sv/strings.xml
rename to app/src/foss/res/values-sv/strings.xml
diff --git a/app-phone/src/foss/res/values-sw/strings.xml b/app/src/foss/res/values-sw/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-sw/strings.xml
rename to app/src/foss/res/values-sw/strings.xml
diff --git a/app-phone/src/foss/res/values-ta-rIN/strings.xml b/app/src/foss/res/values-ta-rIN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ta-rIN/strings.xml
rename to app/src/foss/res/values-ta-rIN/strings.xml
diff --git a/app-phone/src/foss/res/values-te-rIN/strings.xml b/app/src/foss/res/values-te-rIN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-te-rIN/strings.xml
rename to app/src/foss/res/values-te-rIN/strings.xml
diff --git a/app-phone/src/foss/res/values-th/strings.xml b/app/src/foss/res/values-th/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-th/strings.xml
rename to app/src/foss/res/values-th/strings.xml
diff --git a/app-phone/src/foss/res/values-tr/strings.xml b/app/src/foss/res/values-tr/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-tr/strings.xml
rename to app/src/foss/res/values-tr/strings.xml
diff --git a/app-phone/src/foss/res/values-uk/strings.xml b/app/src/foss/res/values-uk/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-uk/strings.xml
rename to app/src/foss/res/values-uk/strings.xml
diff --git a/app-phone/src/foss/res/values-ur-rIN/strings.xml b/app/src/foss/res/values-ur-rIN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-ur-rIN/strings.xml
rename to app/src/foss/res/values-ur-rIN/strings.xml
diff --git a/app-phone/src/foss/res/values-uz/strings.xml b/app/src/foss/res/values-uz/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-uz/strings.xml
rename to app/src/foss/res/values-uz/strings.xml
diff --git a/app-phone/src/foss/res/values-vi/strings.xml b/app/src/foss/res/values-vi/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-vi/strings.xml
rename to app/src/foss/res/values-vi/strings.xml
diff --git a/app-phone/src/foss/res/values-zh-rCN/strings.xml b/app/src/foss/res/values-zh-rCN/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-zh-rCN/strings.xml
rename to app/src/foss/res/values-zh-rCN/strings.xml
diff --git a/app-phone/src/foss/res/values-zh-rHK/strings.xml b/app/src/foss/res/values-zh-rHK/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-zh-rHK/strings.xml
rename to app/src/foss/res/values-zh-rHK/strings.xml
diff --git a/app-phone/src/foss/res/values-zh-rTW/strings.xml b/app/src/foss/res/values-zh-rTW/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-zh-rTW/strings.xml
rename to app/src/foss/res/values-zh-rTW/strings.xml
diff --git a/app-phone/src/foss/res/values-zu/strings.xml b/app/src/foss/res/values-zu/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values-zu/strings.xml
rename to app/src/foss/res/values-zu/strings.xml
diff --git a/app-phone/src/foss/res/values/strings.xml b/app/src/foss/res/values/strings.xml
similarity index 100%
rename from app-phone/src/foss/res/values/strings.xml
rename to app/src/foss/res/values/strings.xml
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/UpgradeModule.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/UpgradeModule.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/UpgradeModule.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/UpgradeModule.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingCache.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingCache.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingCache.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingCache.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingExtensions.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingExtensions.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingExtensions.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingExtensions.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/CapodSku.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/CapodSku.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/CapodSku.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/CapodSku.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnection.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnection.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnection.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnection.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientException.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientException.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientException.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientException.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientExtensions.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientExtensions.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientExtensions.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientExtensions.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/GplayServiceUnavailableException.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/GplayServiceUnavailableException.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/GplayServiceUnavailableException.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/GplayServiceUnavailableException.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/AvailableSku.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/AvailableSku.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/AvailableSku.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/AvailableSku.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingData.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingData.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingData.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingData.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt
diff --git a/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/Sku.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/Sku.kt
similarity index 100%
rename from app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/Sku.kt
rename to app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/Sku.kt
diff --git a/app-phone/src/gplay/res/values-af-rZA/strings.xml b/app/src/gplay/res/values-af-rZA/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-af-rZA/strings.xml
rename to app/src/gplay/res/values-af-rZA/strings.xml
diff --git a/app-phone/src/gplay/res/values-am/strings.xml b/app/src/gplay/res/values-am/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-am/strings.xml
rename to app/src/gplay/res/values-am/strings.xml
diff --git a/app-phone/src/gplay/res/values-ar/strings.xml b/app/src/gplay/res/values-ar/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ar/strings.xml
rename to app/src/gplay/res/values-ar/strings.xml
diff --git a/app-phone/src/gplay/res/values-az/strings.xml b/app/src/gplay/res/values-az/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-az/strings.xml
rename to app/src/gplay/res/values-az/strings.xml
diff --git a/app-phone/src/gplay/res/values-be/strings.xml b/app/src/gplay/res/values-be/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-be/strings.xml
rename to app/src/gplay/res/values-be/strings.xml
diff --git a/app-phone/src/gplay/res/values-bg/strings.xml b/app/src/gplay/res/values-bg/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-bg/strings.xml
rename to app/src/gplay/res/values-bg/strings.xml
diff --git a/app-phone/src/gplay/res/values-bn-rBD/strings.xml b/app/src/gplay/res/values-bn-rBD/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-bn-rBD/strings.xml
rename to app/src/gplay/res/values-bn-rBD/strings.xml
diff --git a/app-phone/src/gplay/res/values-ca/strings.xml b/app/src/gplay/res/values-ca/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ca/strings.xml
rename to app/src/gplay/res/values-ca/strings.xml
diff --git a/app-phone/src/gplay/res/values-cs/strings.xml b/app/src/gplay/res/values-cs/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-cs/strings.xml
rename to app/src/gplay/res/values-cs/strings.xml
diff --git a/app-phone/src/gplay/res/values-da/strings.xml b/app/src/gplay/res/values-da/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-da/strings.xml
rename to app/src/gplay/res/values-da/strings.xml
diff --git a/app-phone/src/gplay/res/values-de/strings.xml b/app/src/gplay/res/values-de/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-de/strings.xml
rename to app/src/gplay/res/values-de/strings.xml
diff --git a/app-phone/src/gplay/res/values-el/strings.xml b/app/src/gplay/res/values-el/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-el/strings.xml
rename to app/src/gplay/res/values-el/strings.xml
diff --git a/app-phone/src/gplay/res/values-es-rAR/strings.xml b/app/src/gplay/res/values-es-rAR/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-es-rAR/strings.xml
rename to app/src/gplay/res/values-es-rAR/strings.xml
diff --git a/app-phone/src/gplay/res/values-es-rMX/strings.xml b/app/src/gplay/res/values-es-rMX/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-es-rMX/strings.xml
rename to app/src/gplay/res/values-es-rMX/strings.xml
diff --git a/app-phone/src/gplay/res/values-es/strings.xml b/app/src/gplay/res/values-es/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-es/strings.xml
rename to app/src/gplay/res/values-es/strings.xml
diff --git a/app-phone/src/gplay/res/values-et-rEE/strings.xml b/app/src/gplay/res/values-et-rEE/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-et-rEE/strings.xml
rename to app/src/gplay/res/values-et-rEE/strings.xml
diff --git a/app-phone/src/gplay/res/values-eu-rES/strings.xml b/app/src/gplay/res/values-eu-rES/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-eu-rES/strings.xml
rename to app/src/gplay/res/values-eu-rES/strings.xml
diff --git a/app-phone/src/gplay/res/values-fa/strings.xml b/app/src/gplay/res/values-fa/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-fa/strings.xml
rename to app/src/gplay/res/values-fa/strings.xml
diff --git a/app-phone/src/gplay/res/values-fi/strings.xml b/app/src/gplay/res/values-fi/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-fi/strings.xml
rename to app/src/gplay/res/values-fi/strings.xml
diff --git a/app-phone/src/gplay/res/values-fil/strings.xml b/app/src/gplay/res/values-fil/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-fil/strings.xml
rename to app/src/gplay/res/values-fil/strings.xml
diff --git a/app-phone/src/gplay/res/values-fr/strings.xml b/app/src/gplay/res/values-fr/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-fr/strings.xml
rename to app/src/gplay/res/values-fr/strings.xml
diff --git a/app-phone/src/gplay/res/values-gl-rES/strings.xml b/app/src/gplay/res/values-gl-rES/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-gl-rES/strings.xml
rename to app/src/gplay/res/values-gl-rES/strings.xml
diff --git a/app-phone/src/gplay/res/values-hi-rIN/strings.xml b/app/src/gplay/res/values-hi-rIN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-hi-rIN/strings.xml
rename to app/src/gplay/res/values-hi-rIN/strings.xml
diff --git a/app-phone/src/gplay/res/values-hr/strings.xml b/app/src/gplay/res/values-hr/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-hr/strings.xml
rename to app/src/gplay/res/values-hr/strings.xml
diff --git a/app-phone/src/gplay/res/values-hu/strings.xml b/app/src/gplay/res/values-hu/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-hu/strings.xml
rename to app/src/gplay/res/values-hu/strings.xml
diff --git a/app-phone/src/gplay/res/values-hy-rAM/strings.xml b/app/src/gplay/res/values-hy-rAM/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-hy-rAM/strings.xml
rename to app/src/gplay/res/values-hy-rAM/strings.xml
diff --git a/app-phone/src/gplay/res/values-in/strings.xml b/app/src/gplay/res/values-in/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-in/strings.xml
rename to app/src/gplay/res/values-in/strings.xml
diff --git a/app-phone/src/gplay/res/values-is/strings.xml b/app/src/gplay/res/values-is/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-is/strings.xml
rename to app/src/gplay/res/values-is/strings.xml
diff --git a/app-phone/src/gplay/res/values-it/strings.xml b/app/src/gplay/res/values-it/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-it/strings.xml
rename to app/src/gplay/res/values-it/strings.xml
diff --git a/app-phone/src/gplay/res/values-iw/strings.xml b/app/src/gplay/res/values-iw/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-iw/strings.xml
rename to app/src/gplay/res/values-iw/strings.xml
diff --git a/app-phone/src/gplay/res/values-ja/strings.xml b/app/src/gplay/res/values-ja/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ja/strings.xml
rename to app/src/gplay/res/values-ja/strings.xml
diff --git a/app-phone/src/gplay/res/values-ka-rGE/strings.xml b/app/src/gplay/res/values-ka-rGE/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ka-rGE/strings.xml
rename to app/src/gplay/res/values-ka-rGE/strings.xml
diff --git a/app-phone/src/gplay/res/values-km-rKH/strings.xml b/app/src/gplay/res/values-km-rKH/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-km-rKH/strings.xml
rename to app/src/gplay/res/values-km-rKH/strings.xml
diff --git a/app-phone/src/gplay/res/values-kmr-rTR/strings.xml b/app/src/gplay/res/values-kmr-rTR/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-kmr-rTR/strings.xml
rename to app/src/gplay/res/values-kmr-rTR/strings.xml
diff --git a/app-phone/src/gplay/res/values-kn-rIN/strings.xml b/app/src/gplay/res/values-kn-rIN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-kn-rIN/strings.xml
rename to app/src/gplay/res/values-kn-rIN/strings.xml
diff --git a/app-phone/src/gplay/res/values-ko/strings.xml b/app/src/gplay/res/values-ko/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ko/strings.xml
rename to app/src/gplay/res/values-ko/strings.xml
diff --git a/app-phone/src/gplay/res/values-ky-rKG/strings.xml b/app/src/gplay/res/values-ky-rKG/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ky-rKG/strings.xml
rename to app/src/gplay/res/values-ky-rKG/strings.xml
diff --git a/app-phone/src/gplay/res/values-lo-rLA/strings.xml b/app/src/gplay/res/values-lo-rLA/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-lo-rLA/strings.xml
rename to app/src/gplay/res/values-lo-rLA/strings.xml
diff --git a/app-phone/src/gplay/res/values-lt/strings.xml b/app/src/gplay/res/values-lt/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-lt/strings.xml
rename to app/src/gplay/res/values-lt/strings.xml
diff --git a/app-phone/src/gplay/res/values-lv/strings.xml b/app/src/gplay/res/values-lv/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-lv/strings.xml
rename to app/src/gplay/res/values-lv/strings.xml
diff --git a/app-phone/src/gplay/res/values-mk-rMK/strings.xml b/app/src/gplay/res/values-mk-rMK/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-mk-rMK/strings.xml
rename to app/src/gplay/res/values-mk-rMK/strings.xml
diff --git a/app-phone/src/gplay/res/values-ml-rIN/strings.xml b/app/src/gplay/res/values-ml-rIN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ml-rIN/strings.xml
rename to app/src/gplay/res/values-ml-rIN/strings.xml
diff --git a/app-phone/src/gplay/res/values-mn-rMN/strings.xml b/app/src/gplay/res/values-mn-rMN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-mn-rMN/strings.xml
rename to app/src/gplay/res/values-mn-rMN/strings.xml
diff --git a/app-phone/src/gplay/res/values-mr-rIN/strings.xml b/app/src/gplay/res/values-mr-rIN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-mr-rIN/strings.xml
rename to app/src/gplay/res/values-mr-rIN/strings.xml
diff --git a/app-phone/src/gplay/res/values-ms/strings.xml b/app/src/gplay/res/values-ms/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ms/strings.xml
rename to app/src/gplay/res/values-ms/strings.xml
diff --git a/app-phone/src/gplay/res/values-my-rMM/strings.xml b/app/src/gplay/res/values-my-rMM/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-my-rMM/strings.xml
rename to app/src/gplay/res/values-my-rMM/strings.xml
diff --git a/app-phone/src/gplay/res/values-ne-rNP/strings.xml b/app/src/gplay/res/values-ne-rNP/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ne-rNP/strings.xml
rename to app/src/gplay/res/values-ne-rNP/strings.xml
diff --git a/app-phone/src/gplay/res/values-nl/strings.xml b/app/src/gplay/res/values-nl/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-nl/strings.xml
rename to app/src/gplay/res/values-nl/strings.xml
diff --git a/app-phone/src/gplay/res/values-no/strings.xml b/app/src/gplay/res/values-no/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-no/strings.xml
rename to app/src/gplay/res/values-no/strings.xml
diff --git a/app-phone/src/gplay/res/values-pl/strings.xml b/app/src/gplay/res/values-pl/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-pl/strings.xml
rename to app/src/gplay/res/values-pl/strings.xml
diff --git a/app-phone/src/gplay/res/values-pt-rBR/strings.xml b/app/src/gplay/res/values-pt-rBR/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-pt-rBR/strings.xml
rename to app/src/gplay/res/values-pt-rBR/strings.xml
diff --git a/app-phone/src/gplay/res/values-pt/strings.xml b/app/src/gplay/res/values-pt/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-pt/strings.xml
rename to app/src/gplay/res/values-pt/strings.xml
diff --git a/app-phone/src/gplay/res/values-rm/strings.xml b/app/src/gplay/res/values-rm/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-rm/strings.xml
rename to app/src/gplay/res/values-rm/strings.xml
diff --git a/app-phone/src/gplay/res/values-ro/strings.xml b/app/src/gplay/res/values-ro/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ro/strings.xml
rename to app/src/gplay/res/values-ro/strings.xml
diff --git a/app-phone/src/gplay/res/values-ru/strings.xml b/app/src/gplay/res/values-ru/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ru/strings.xml
rename to app/src/gplay/res/values-ru/strings.xml
diff --git a/app-phone/src/gplay/res/values-sc-rIT/strings.xml b/app/src/gplay/res/values-sc-rIT/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-sc-rIT/strings.xml
rename to app/src/gplay/res/values-sc-rIT/strings.xml
diff --git a/app-phone/src/gplay/res/values-si-rLK/strings.xml b/app/src/gplay/res/values-si-rLK/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-si-rLK/strings.xml
rename to app/src/gplay/res/values-si-rLK/strings.xml
diff --git a/app-phone/src/gplay/res/values-sk/strings.xml b/app/src/gplay/res/values-sk/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-sk/strings.xml
rename to app/src/gplay/res/values-sk/strings.xml
diff --git a/app-phone/src/gplay/res/values-sl/strings.xml b/app/src/gplay/res/values-sl/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-sl/strings.xml
rename to app/src/gplay/res/values-sl/strings.xml
diff --git a/app-phone/src/gplay/res/values-sq-rAL/strings.xml b/app/src/gplay/res/values-sq-rAL/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-sq-rAL/strings.xml
rename to app/src/gplay/res/values-sq-rAL/strings.xml
diff --git a/app-phone/src/gplay/res/values-sr/strings.xml b/app/src/gplay/res/values-sr/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-sr/strings.xml
rename to app/src/gplay/res/values-sr/strings.xml
diff --git a/app-phone/src/gplay/res/values-sv/strings.xml b/app/src/gplay/res/values-sv/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-sv/strings.xml
rename to app/src/gplay/res/values-sv/strings.xml
diff --git a/app-phone/src/gplay/res/values-sw/strings.xml b/app/src/gplay/res/values-sw/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-sw/strings.xml
rename to app/src/gplay/res/values-sw/strings.xml
diff --git a/app-phone/src/gplay/res/values-ta-rIN/strings.xml b/app/src/gplay/res/values-ta-rIN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ta-rIN/strings.xml
rename to app/src/gplay/res/values-ta-rIN/strings.xml
diff --git a/app-phone/src/gplay/res/values-te-rIN/strings.xml b/app/src/gplay/res/values-te-rIN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-te-rIN/strings.xml
rename to app/src/gplay/res/values-te-rIN/strings.xml
diff --git a/app-phone/src/gplay/res/values-th/strings.xml b/app/src/gplay/res/values-th/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-th/strings.xml
rename to app/src/gplay/res/values-th/strings.xml
diff --git a/app-phone/src/gplay/res/values-tr/strings.xml b/app/src/gplay/res/values-tr/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-tr/strings.xml
rename to app/src/gplay/res/values-tr/strings.xml
diff --git a/app-phone/src/gplay/res/values-uk/strings.xml b/app/src/gplay/res/values-uk/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-uk/strings.xml
rename to app/src/gplay/res/values-uk/strings.xml
diff --git a/app-phone/src/gplay/res/values-ur-rIN/strings.xml b/app/src/gplay/res/values-ur-rIN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-ur-rIN/strings.xml
rename to app/src/gplay/res/values-ur-rIN/strings.xml
diff --git a/app-phone/src/gplay/res/values-uz/strings.xml b/app/src/gplay/res/values-uz/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-uz/strings.xml
rename to app/src/gplay/res/values-uz/strings.xml
diff --git a/app-phone/src/gplay/res/values-vi/strings.xml b/app/src/gplay/res/values-vi/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-vi/strings.xml
rename to app/src/gplay/res/values-vi/strings.xml
diff --git a/app-phone/src/gplay/res/values-zh-rCN/strings.xml b/app/src/gplay/res/values-zh-rCN/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-zh-rCN/strings.xml
rename to app/src/gplay/res/values-zh-rCN/strings.xml
diff --git a/app-phone/src/gplay/res/values-zh-rHK/strings.xml b/app/src/gplay/res/values-zh-rHK/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-zh-rHK/strings.xml
rename to app/src/gplay/res/values-zh-rHK/strings.xml
diff --git a/app-phone/src/gplay/res/values-zh-rTW/strings.xml b/app/src/gplay/res/values-zh-rTW/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-zh-rTW/strings.xml
rename to app/src/gplay/res/values-zh-rTW/strings.xml
diff --git a/app-phone/src/gplay/res/values-zu/strings.xml b/app/src/gplay/res/values-zu/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values-zu/strings.xml
rename to app/src/gplay/res/values-zu/strings.xml
diff --git a/app-phone/src/gplay/res/values/strings.xml b/app/src/gplay/res/values/strings.xml
similarity index 100%
rename from app-phone/src/gplay/res/values/strings.xml
rename to app/src/gplay/res/values/strings.xml
diff --git a/app-phone/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from app-phone/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/app-phone/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
similarity index 100%
rename from app-phone/src/main/ic_launcher-playstore.png
rename to app/src/main/ic_launcher-playstore.png
diff --git a/app-phone/src/main/java/eu/darken/capod/App.kt b/app/src/main/java/eu/darken/capod/App.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/App.kt
rename to app/src/main/java/eu/darken/capod/App.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt b/app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt
rename to app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/BuildWrap.kt b/app/src/main/java/eu/darken/capod/common/BuildWrap.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/BuildWrap.kt
rename to app/src/main/java/eu/darken/capod/common/BuildWrap.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt b/app/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/ClipboardHelper.kt b/app/src/main/java/eu/darken/capod/common/ClipboardHelper.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/ClipboardHelper.kt
rename to app/src/main/java/eu/darken/capod/common/ClipboardHelper.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/ColorExtensions.kt b/app/src/main/java/eu/darken/capod/common/ColorExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/ColorExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/ColorExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/ContextExtensions.kt b/app/src/main/java/eu/darken/capod/common/ContextExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/ContextExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/ContextExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/EmailTool.kt b/app/src/main/java/eu/darken/capod/common/EmailTool.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/EmailTool.kt
rename to app/src/main/java/eu/darken/capod/common/EmailTool.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/InstallId.kt b/app/src/main/java/eu/darken/capod/common/InstallId.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/InstallId.kt
rename to app/src/main/java/eu/darken/capod/common/InstallId.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt b/app/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/MediaControl.kt b/app/src/main/java/eu/darken/capod/common/MediaControl.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/MediaControl.kt
rename to app/src/main/java/eu/darken/capod/common/MediaControl.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt b/app/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt
rename to app/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/SystemClockWrap.kt b/app/src/main/java/eu/darken/capod/common/SystemClockWrap.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/SystemClockWrap.kt
rename to app/src/main/java/eu/darken/capod/common/SystemClockWrap.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/UIConverter.kt b/app/src/main/java/eu/darken/capod/common/UIConverter.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/UIConverter.kt
rename to app/src/main/java/eu/darken/capod/common/UIConverter.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/WebpageTool.kt b/app/src/main/java/eu/darken/capod/common/WebpageTool.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/WebpageTool.kt
rename to app/src/main/java/eu/darken/capod/common/WebpageTool.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt
rename to app/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt
rename to app/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt
rename to app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt
rename to app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt
rename to app/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt b/app/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/compression/Zipper.kt b/app/src/main/java/eu/darken/capod/common/compression/Zipper.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/compression/Zipper.kt
rename to app/src/main/java/eu/darken/capod/common/compression/Zipper.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt b/app/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt
rename to app/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt b/app/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt
rename to app/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt b/app/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt
rename to app/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt b/app/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt
rename to app/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt b/app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt
rename to app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/Bugs.kt b/app/src/main/java/eu/darken/capod/common/debug/Bugs.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/Bugs.kt
rename to app/src/main/java/eu/darken/capod/common/debug/Bugs.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt b/app/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt
rename to app/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt b/app/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt
rename to app/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt b/app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt
rename to app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt b/app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt
rename to app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt b/app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt
rename to app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt b/app/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt
rename to app/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt b/app/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt
rename to app/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt b/app/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt b/app/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt
rename to app/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt
rename to app/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt
rename to app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt
rename to app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt
rename to app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt
rename to app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt b/app/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt
rename to app/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt b/app/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt
rename to app/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/error/LocalizedError.kt b/app/src/main/java/eu/darken/capod/common/error/LocalizedError.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/error/LocalizedError.kt
rename to app/src/main/java/eu/darken/capod/common/error/LocalizedError.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt b/app/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt b/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt
rename to app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt b/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt b/app/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt b/app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt b/app/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt
rename to app/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/BindableVH.kt b/app/src/main/java/eu/darken/capod/common/lists/BindableVH.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/BindableVH.kt
rename to app/src/main/java/eu/darken/capod/common/lists/BindableVH.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt b/app/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt
rename to app/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/ListItem.kt b/app/src/main/java/eu/darken/capod/common/lists/ListItem.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/ListItem.kt
rename to app/src/main/java/eu/darken/capod/common/lists/ListItem.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt b/app/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt b/app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt
rename to app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt b/app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt b/app/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt
rename to app/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt b/app/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt
rename to app/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt
rename to app/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt
rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt
rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt
rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt
rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt
rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt b/app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt
rename to app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt b/app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt
rename to app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/permissions/Permission.kt b/app/src/main/java/eu/darken/capod/common/permissions/Permission.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/permissions/Permission.kt
rename to app/src/main/java/eu/darken/capod/common/permissions/Permission.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt
rename to app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt
rename to app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt
rename to app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt b/app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt
rename to app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt b/app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt
rename to app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt b/app/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt
rename to app/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/preferences/Settings.kt b/app/src/main/java/eu/darken/capod/common/preferences/Settings.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/preferences/Settings.kt
rename to app/src/main/java/eu/darken/capod/common/preferences/Settings.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt b/app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt b/app/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt
rename to app/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt b/app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt
rename to app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/Activity2.kt b/app/src/main/java/eu/darken/capod/common/uix/Activity2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/Activity2.kt
rename to app/src/main/java/eu/darken/capod/common/uix/Activity2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/BottomSheetDialogFragment2.kt b/app/src/main/java/eu/darken/capod/common/uix/BottomSheetDialogFragment2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/BottomSheetDialogFragment2.kt
rename to app/src/main/java/eu/darken/capod/common/uix/BottomSheetDialogFragment2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/Fragment2.kt b/app/src/main/java/eu/darken/capod/common/uix/Fragment2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/Fragment2.kt
rename to app/src/main/java/eu/darken/capod/common/uix/Fragment2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/Fragment3.kt b/app/src/main/java/eu/darken/capod/common/uix/Fragment3.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/Fragment3.kt
rename to app/src/main/java/eu/darken/capod/common/uix/Fragment3.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt b/app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt
rename to app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/Service2.kt b/app/src/main/java/eu/darken/capod/common/uix/Service2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/Service2.kt
rename to app/src/main/java/eu/darken/capod/common/uix/Service2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt b/app/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt
rename to app/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt b/app/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt
rename to app/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt b/app/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt
rename to app/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt b/app/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt
rename to app/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt b/app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt
rename to app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt b/app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt b/app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt b/app/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt
rename to app/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt b/app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt
rename to app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/core/MonitorMode.kt b/app/src/main/java/eu/darken/capod/main/core/MonitorMode.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/core/MonitorMode.kt
rename to app/src/main/java/eu/darken/capod/main/core/MonitorMode.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/core/PermissionTool.kt b/app/src/main/java/eu/darken/capod/main/core/PermissionTool.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/core/PermissionTool.kt
rename to app/src/main/java/eu/darken/capod/main/core/PermissionTool.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/core/ScannerMode.kt b/app/src/main/java/eu/darken/capod/main/core/ScannerMode.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/core/ScannerMode.kt
rename to app/src/main/java/eu/darken/capod/main/core/ScannerMode.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/MainActivity.kt b/app/src/main/java/eu/darken/capod/main/ui/MainActivity.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/MainActivity.kt
rename to app/src/main/java/eu/darken/capod/main/ui/MainActivity.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt b/app/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt
rename to app/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragment.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/BluetoothDisabledVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/BluetoothDisabledVH.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/BluetoothDisabledVH.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/cards/BluetoothDisabledVH.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/MissingMainDeviceVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/MissingMainDeviceVH.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/MissingMainDeviceVH.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/cards/MissingMainDeviceVH.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/PermissionCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/PermissionCardVH.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/PermissionCardVH.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/cards/PermissionCardVH.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt
rename to app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragmentVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragmentVM.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragment.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragmentVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragmentVM.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/ModelSelectionDialogFactory.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/ModelSelectionDialogFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/ModelSelectionDialogFactory.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/general/ModelSelectionDialogFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt b/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt b/app/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt b/app/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt
rename to app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt
rename to app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt
rename to app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt
rename to app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/HasCase.kt b/app/src/main/java/eu/darken/capod/pods/core/HasCase.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/HasCase.kt
rename to app/src/main/java/eu/darken/capod/pods/core/HasCase.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt b/app/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt
rename to app/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt b/app/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt
rename to app/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt b/app/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt
rename to app/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt b/app/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt
rename to app/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt b/app/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt
rename to app/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt b/app/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt
rename to app/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt b/app/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt
rename to app/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/PodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
rename to app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt b/app/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt
rename to app/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/PodFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/PodFactory.kt
rename to app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt
rename to app/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/Twsi99999.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/Twsi99999.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/Twsi99999.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/Twsi99999.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsPro.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsPro.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsPro.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt
rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
rename to app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt
rename to app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/ReactionHub.kt b/app/src/main/java/eu/darken/capod/reaction/ReactionHub.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/ReactionHub.kt
rename to app/src/main/java/eu/darken/capod/reaction/ReactionHub.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt b/app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt
rename to app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt b/app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt
rename to app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt b/app/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt
rename to app/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt b/app/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt
rename to app/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpPodViewFactory.kt b/app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpPodViewFactory.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpPodViewFactory.kt
rename to app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpPodViewFactory.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt b/app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt
rename to app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt b/app/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt
rename to app/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt b/app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt
rename to app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt
diff --git a/app-phone/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt b/app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt
similarity index 100%
rename from app-phone/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt
rename to app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt
diff --git a/app-phone/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from app-phone/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_add_24.xml b/app/src/main/res/drawable/ic_baseline_add_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_add_24.xml
rename to app/src/main/res/drawable/ic_baseline_add_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_apps_24.xml b/app/src/main/res/drawable/ic_baseline_apps_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_apps_24.xml
rename to app/src/main/res/drawable/ic_baseline_apps_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_arrow_back_24.xml
rename to app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml b/app/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml
rename to app/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_bluetooth_searching_24.xml b/app/src/main/res/drawable/ic_baseline_bluetooth_searching_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_bluetooth_searching_24.xml
rename to app/src/main/res/drawable/ic_baseline_bluetooth_searching_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_book_24.xml b/app/src/main/res/drawable/ic_baseline_book_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_book_24.xml
rename to app/src/main/res/drawable/ic_baseline_book_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_bug_report_24.xml b/app/src/main/res/drawable/ic_baseline_bug_report_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_bug_report_24.xml
rename to app/src/main/res/drawable/ic_baseline_bug_report_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_chat_24.xml b/app/src/main/res/drawable/ic_baseline_chat_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_chat_24.xml
rename to app/src/main/res/drawable/ic_baseline_chat_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_close_24.xml b/app/src/main/res/drawable/ic_baseline_close_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_close_24.xml
rename to app/src/main/res/drawable/ic_baseline_close_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_data_array_24.xml b/app/src/main/res/drawable/ic_baseline_data_array_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_data_array_24.xml
rename to app/src/main/res/drawable/ic_baseline_data_array_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_ghost_24.xml b/app/src/main/res/drawable/ic_baseline_ghost_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_ghost_24.xml
rename to app/src/main/res/drawable/ic_baseline_ghost_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_grid_view_24.xml b/app/src/main/res/drawable/ic_baseline_grid_view_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_grid_view_24.xml
rename to app/src/main/res/drawable/ic_baseline_grid_view_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_heart_24.xml b/app/src/main/res/drawable/ic_baseline_heart_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_heart_24.xml
rename to app/src/main/res/drawable/ic_baseline_heart_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_looks_one_24.xml b/app/src/main/res/drawable/ic_baseline_looks_one_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_looks_one_24.xml
rename to app/src/main/res/drawable/ic_baseline_looks_one_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_monitor_24.xml b/app/src/main/res/drawable/ic_baseline_monitor_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_monitor_24.xml
rename to app/src/main/res/drawable/ic_baseline_monitor_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_pause_circle_24.xml b/app/src/main/res/drawable/ic_baseline_pause_circle_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_pause_circle_24.xml
rename to app/src/main/res/drawable/ic_baseline_pause_circle_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_play_circle_24.xml b/app/src/main/res/drawable/ic_baseline_play_circle_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_play_circle_24.xml
rename to app/src/main/res/drawable/ic_baseline_play_circle_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_question_mark_24.xml b/app/src/main/res/drawable/ic_baseline_question_mark_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_question_mark_24.xml
rename to app/src/main/res/drawable/ic_baseline_question_mark_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_refresh_24.xml b/app/src/main/res/drawable/ic_baseline_refresh_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_refresh_24.xml
rename to app/src/main/res/drawable/ic_baseline_refresh_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_settings_24.xml b/app/src/main/res/drawable/ic_baseline_settings_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_settings_24.xml
rename to app/src/main/res/drawable/ic_baseline_settings_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml b/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml
rename to app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml b/app/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml
rename to app/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_signal_cellular_alt_24.xml b/app/src/main/res/drawable/ic_baseline_signal_cellular_alt_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_signal_cellular_alt_24.xml
rename to app/src/main/res/drawable/ic_baseline_signal_cellular_alt_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_stars_24.xml b/app/src/main/res/drawable/ic_baseline_stars_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_stars_24.xml
rename to app/src/main/res/drawable/ic_baseline_stars_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_support_agent_24.xml b/app/src/main/res/drawable/ic_baseline_support_agent_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_support_agent_24.xml
rename to app/src/main/res/drawable/ic_baseline_support_agent_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_text_snippet_24.xml b/app/src/main/res/drawable/ic_baseline_text_snippet_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_text_snippet_24.xml
rename to app/src/main/res/drawable/ic_baseline_text_snippet_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_translate_24.xml b/app/src/main/res/drawable/ic_baseline_translate_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_translate_24.xml
rename to app/src/main/res/drawable/ic_baseline_translate_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_widgets_24.xml b/app/src/main/res/drawable/ic_baseline_widgets_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_widgets_24.xml
rename to app/src/main/res/drawable/ic_baseline_widgets_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_baseline_workspaces_24.xml b/app/src/main/res/drawable/ic_baseline_workspaces_24.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_baseline_workspaces_24.xml
rename to app/src/main/res/drawable/ic_baseline_workspaces_24.xml
diff --git a/app-phone/src/main/res/drawable/ic_card_text_onsurface.xml b/app/src/main/res/drawable/ic_card_text_onsurface.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_card_text_onsurface.xml
rename to app/src/main/res/drawable/ic_card_text_onsurface.xml
diff --git a/app-phone/src/main/res/drawable/ic_changelog_onsurface.xml b/app/src/main/res/drawable/ic_changelog_onsurface.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_changelog_onsurface.xml
rename to app/src/main/res/drawable/ic_changelog_onsurface.xml
diff --git a/app-phone/src/main/res/drawable/ic_discord_onsurface.xml b/app/src/main/res/drawable/ic_discord_onsurface.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_discord_onsurface.xml
rename to app/src/main/res/drawable/ic_discord_onsurface.xml
diff --git a/app-phone/src/main/res/drawable/ic_email_onsurface.xml b/app/src/main/res/drawable/ic_email_onsurface.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_email_onsurface.xml
rename to app/src/main/res/drawable/ic_email_onsurface.xml
diff --git a/app-phone/src/main/res/drawable/ic_github_onsurface.xml b/app/src/main/res/drawable/ic_github_onsurface.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_github_onsurface.xml
rename to app/src/main/res/drawable/ic_github_onsurface.xml
diff --git a/app-phone/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_heart.xml
rename to app/src/main/res/drawable/ic_heart.xml
diff --git a/app-phone/src/main/res/drawable/ic_id_onsurface.xml b/app/src/main/res/drawable/ic_id_onsurface.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_id_onsurface.xml
rename to app/src/main/res/drawable/ic_id_onsurface.xml
diff --git a/app-phone/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_launcher_background.xml
rename to app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app-phone/src/main/res/drawable/ic_notification_device_status_icon.xml b/app/src/main/res/drawable/ic_notification_device_status_icon.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_notification_device_status_icon.xml
rename to app/src/main/res/drawable/ic_notification_device_status_icon.xml
diff --git a/app-phone/src/main/res/drawable/ic_octocat_onsurface.xml b/app/src/main/res/drawable/ic_octocat_onsurface.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_octocat_onsurface.xml
rename to app/src/main/res/drawable/ic_octocat_onsurface.xml
diff --git a/app-phone/src/main/res/drawable/ic_spider_thread_onsurface.xml b/app/src/main/res/drawable/ic_spider_thread_onsurface.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_spider_thread_onsurface.xml
rename to app/src/main/res/drawable/ic_spider_thread_onsurface.xml
diff --git a/app-phone/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/ic_twitter.xml
rename to app/src/main/res/drawable/ic_twitter.xml
diff --git a/app-phone/src/main/res/drawable/splash_graphic.xml b/app/src/main/res/drawable/splash_graphic.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/splash_graphic.xml
rename to app/src/main/res/drawable/splash_graphic.xml
diff --git a/app-phone/src/main/res/drawable/splash_graphic2.xml b/app/src/main/res/drawable/splash_graphic2.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/splash_graphic2.xml
rename to app/src/main/res/drawable/splash_graphic2.xml
diff --git a/app-phone/src/main/res/drawable/splash_screen.xml b/app/src/main/res/drawable/splash_screen.xml
similarity index 100%
rename from app-phone/src/main/res/drawable/splash_screen.xml
rename to app/src/main/res/drawable/splash_screen.xml
diff --git a/app-phone/src/main/res/layout/debug_recording_activity.xml b/app/src/main/res/layout/debug_recording_activity.xml
similarity index 100%
rename from app-phone/src/main/res/layout/debug_recording_activity.xml
rename to app/src/main/res/layout/debug_recording_activity.xml
diff --git a/app-phone/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
similarity index 100%
rename from app-phone/src/main/res/layout/main_activity.xml
rename to app/src/main/res/layout/main_activity.xml
diff --git a/app-phone/src/main/res/layout/main_fragment.xml b/app/src/main/res/layout/main_fragment.xml
similarity index 100%
rename from app-phone/src/main/res/layout/main_fragment.xml
rename to app/src/main/res/layout/main_fragment.xml
diff --git a/app-phone/src/main/res/layout/monitor_notification_dual_pods_small.xml b/app/src/main/res/layout/monitor_notification_dual_pods_small.xml
similarity index 100%
rename from app-phone/src/main/res/layout/monitor_notification_dual_pods_small.xml
rename to app/src/main/res/layout/monitor_notification_dual_pods_small.xml
diff --git a/app-phone/src/main/res/layout/monitor_notification_single_pods_small.xml b/app/src/main/res/layout/monitor_notification_single_pods_small.xml
similarity index 100%
rename from app-phone/src/main/res/layout/monitor_notification_single_pods_small.xml
rename to app/src/main/res/layout/monitor_notification_single_pods_small.xml
diff --git a/app-phone/src/main/res/layout/monitor_notification_unknown_device_small.xml b/app/src/main/res/layout/monitor_notification_unknown_device_small.xml
similarity index 100%
rename from app-phone/src/main/res/layout/monitor_notification_unknown_device_small.xml
rename to app/src/main/res/layout/monitor_notification_unknown_device_small.xml
diff --git a/app-phone/src/main/res/layout/overview_bluetooth_disabled_item.xml b/app/src/main/res/layout/overview_bluetooth_disabled_item.xml
similarity index 100%
rename from app-phone/src/main/res/layout/overview_bluetooth_disabled_item.xml
rename to app/src/main/res/layout/overview_bluetooth_disabled_item.xml
diff --git a/app-phone/src/main/res/layout/overview_nomaindevice_item.xml b/app/src/main/res/layout/overview_nomaindevice_item.xml
similarity index 100%
rename from app-phone/src/main/res/layout/overview_nomaindevice_item.xml
rename to app/src/main/res/layout/overview_nomaindevice_item.xml
diff --git a/app-phone/src/main/res/layout/overview_permission_item.xml b/app/src/main/res/layout/overview_permission_item.xml
similarity index 100%
rename from app-phone/src/main/res/layout/overview_permission_item.xml
rename to app/src/main/res/layout/overview_permission_item.xml
diff --git a/app-phone/src/main/res/layout/overview_pods_dual_item.xml b/app/src/main/res/layout/overview_pods_dual_item.xml
similarity index 100%
rename from app-phone/src/main/res/layout/overview_pods_dual_item.xml
rename to app/src/main/res/layout/overview_pods_dual_item.xml
diff --git a/app-phone/src/main/res/layout/overview_pods_single_item.xml b/app/src/main/res/layout/overview_pods_single_item.xml
similarity index 100%
rename from app-phone/src/main/res/layout/overview_pods_single_item.xml
rename to app/src/main/res/layout/overview_pods_single_item.xml
diff --git a/app-phone/src/main/res/layout/overview_pods_unknown_item.xml b/app/src/main/res/layout/overview_pods_unknown_item.xml
similarity index 100%
rename from app-phone/src/main/res/layout/overview_pods_unknown_item.xml
rename to app/src/main/res/layout/overview_pods_unknown_item.xml
diff --git a/app-phone/src/main/res/layout/popup_notification_dual_pods.xml b/app/src/main/res/layout/popup_notification_dual_pods.xml
similarity index 100%
rename from app-phone/src/main/res/layout/popup_notification_dual_pods.xml
rename to app/src/main/res/layout/popup_notification_dual_pods.xml
diff --git a/app-phone/src/main/res/layout/popup_notification_single_pods.xml b/app/src/main/res/layout/popup_notification_single_pods.xml
similarity index 100%
rename from app-phone/src/main/res/layout/popup_notification_single_pods.xml
rename to app/src/main/res/layout/popup_notification_single_pods.xml
diff --git a/app-phone/src/main/res/layout/popup_window_container_layout.xml b/app/src/main/res/layout/popup_window_container_layout.xml
similarity index 100%
rename from app-phone/src/main/res/layout/popup_window_container_layout.xml
rename to app/src/main/res/layout/popup_window_container_layout.xml
diff --git a/app-phone/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
similarity index 100%
rename from app-phone/src/main/res/layout/settings_fragment.xml
rename to app/src/main/res/layout/settings_fragment.xml
diff --git a/app-phone/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
similarity index 100%
rename from app-phone/src/main/res/menu/main.xml
rename to app/src/main/res/menu/main.xml
diff --git a/app-phone/src/main/res/menu/menu_settings_index.xml b/app/src/main/res/menu/menu_settings_index.xml
similarity index 100%
rename from app-phone/src/main/res/menu/menu_settings_index.xml
rename to app/src/main/res/menu/menu_settings_index.xml
diff --git a/app-phone/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app-phone/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app-phone/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app-phone/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-phone/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app-phone/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/app-phone/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app-phone/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app-phone/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app-phone/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/app-phone/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app-phone/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app-phone/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app-phone/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/app-phone/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app-phone/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app-phone/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app-phone/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
similarity index 100%
rename from app-phone/src/main/res/navigation/nav_graph.xml
rename to app/src/main/res/navigation/nav_graph.xml
diff --git a/app-phone/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-af-rZA/strings.xml
rename to app/src/main/res/values-af-rZA/strings.xml
diff --git a/app-phone/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-am/strings.xml
rename to app/src/main/res/values-am/strings.xml
diff --git a/app-phone/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ar/strings.xml
rename to app/src/main/res/values-ar/strings.xml
diff --git a/app-phone/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-az/strings.xml
rename to app/src/main/res/values-az/strings.xml
diff --git a/app-phone/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-be/strings.xml
rename to app/src/main/res/values-be/strings.xml
diff --git a/app-phone/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-bg/strings.xml
rename to app/src/main/res/values-bg/strings.xml
diff --git a/app-phone/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-bn-rBD/strings.xml
rename to app/src/main/res/values-bn-rBD/strings.xml
diff --git a/app-phone/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ca/strings.xml
rename to app/src/main/res/values-ca/strings.xml
diff --git a/app-phone/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-cs/strings.xml
rename to app/src/main/res/values-cs/strings.xml
diff --git a/app-phone/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-da/strings.xml
rename to app/src/main/res/values-da/strings.xml
diff --git a/app-phone/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-de/strings.xml
rename to app/src/main/res/values-de/strings.xml
diff --git a/app-phone/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-el/strings.xml
rename to app/src/main/res/values-el/strings.xml
diff --git a/app-phone/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-es-rAR/strings.xml
rename to app/src/main/res/values-es-rAR/strings.xml
diff --git a/app-phone/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-es-rMX/strings.xml
rename to app/src/main/res/values-es-rMX/strings.xml
diff --git a/app-phone/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-es/strings.xml
rename to app/src/main/res/values-es/strings.xml
diff --git a/app-phone/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-et-rEE/strings.xml
rename to app/src/main/res/values-et-rEE/strings.xml
diff --git a/app-phone/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-eu-rES/strings.xml
rename to app/src/main/res/values-eu-rES/strings.xml
diff --git a/app-phone/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-fa/strings.xml
rename to app/src/main/res/values-fa/strings.xml
diff --git a/app-phone/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-fi/strings.xml
rename to app/src/main/res/values-fi/strings.xml
diff --git a/app-phone/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-fil/strings.xml
rename to app/src/main/res/values-fil/strings.xml
diff --git a/app-phone/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-fr/strings.xml
rename to app/src/main/res/values-fr/strings.xml
diff --git a/app-phone/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-gl-rES/strings.xml
rename to app/src/main/res/values-gl-rES/strings.xml
diff --git a/app-phone/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-hi-rIN/strings.xml
rename to app/src/main/res/values-hi-rIN/strings.xml
diff --git a/app-phone/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-hr/strings.xml
rename to app/src/main/res/values-hr/strings.xml
diff --git a/app-phone/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-hu/strings.xml
rename to app/src/main/res/values-hu/strings.xml
diff --git a/app-phone/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-hy-rAM/strings.xml
rename to app/src/main/res/values-hy-rAM/strings.xml
diff --git a/app-phone/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-in/strings.xml
rename to app/src/main/res/values-in/strings.xml
diff --git a/app-phone/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-is/strings.xml
rename to app/src/main/res/values-is/strings.xml
diff --git a/app-phone/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-it/strings.xml
rename to app/src/main/res/values-it/strings.xml
diff --git a/app-phone/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-iw/strings.xml
rename to app/src/main/res/values-iw/strings.xml
diff --git a/app-phone/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ja/strings.xml
rename to app/src/main/res/values-ja/strings.xml
diff --git a/app-phone/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ka-rGE/strings.xml
rename to app/src/main/res/values-ka-rGE/strings.xml
diff --git a/app-phone/src/main/res/values-km-rKH/strings.xml b/app/src/main/res/values-km-rKH/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-km-rKH/strings.xml
rename to app/src/main/res/values-km-rKH/strings.xml
diff --git a/app-phone/src/main/res/values-kmr-rTR/strings.xml b/app/src/main/res/values-kmr-rTR/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-kmr-rTR/strings.xml
rename to app/src/main/res/values-kmr-rTR/strings.xml
diff --git a/app-phone/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-kn-rIN/strings.xml
rename to app/src/main/res/values-kn-rIN/strings.xml
diff --git a/app-phone/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ko/strings.xml
rename to app/src/main/res/values-ko/strings.xml
diff --git a/app-phone/src/main/res/values-ky-rKG/strings.xml b/app/src/main/res/values-ky-rKG/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ky-rKG/strings.xml
rename to app/src/main/res/values-ky-rKG/strings.xml
diff --git a/app-phone/src/main/res/values-lo-rLA/strings.xml b/app/src/main/res/values-lo-rLA/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-lo-rLA/strings.xml
rename to app/src/main/res/values-lo-rLA/strings.xml
diff --git a/app-phone/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-lt/strings.xml
rename to app/src/main/res/values-lt/strings.xml
diff --git a/app-phone/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-lv/strings.xml
rename to app/src/main/res/values-lv/strings.xml
diff --git a/app-phone/src/main/res/values-mk-rMK/strings.xml b/app/src/main/res/values-mk-rMK/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-mk-rMK/strings.xml
rename to app/src/main/res/values-mk-rMK/strings.xml
diff --git a/app-phone/src/main/res/values-ml-rIN/strings.xml b/app/src/main/res/values-ml-rIN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ml-rIN/strings.xml
rename to app/src/main/res/values-ml-rIN/strings.xml
diff --git a/app-phone/src/main/res/values-mn-rMN/strings.xml b/app/src/main/res/values-mn-rMN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-mn-rMN/strings.xml
rename to app/src/main/res/values-mn-rMN/strings.xml
diff --git a/app-phone/src/main/res/values-mr-rIN/strings.xml b/app/src/main/res/values-mr-rIN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-mr-rIN/strings.xml
rename to app/src/main/res/values-mr-rIN/strings.xml
diff --git a/app-phone/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ms/strings.xml
rename to app/src/main/res/values-ms/strings.xml
diff --git a/app-phone/src/main/res/values-my-rMM/strings.xml b/app/src/main/res/values-my-rMM/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-my-rMM/strings.xml
rename to app/src/main/res/values-my-rMM/strings.xml
diff --git a/app-phone/src/main/res/values-ne-rNP/strings.xml b/app/src/main/res/values-ne-rNP/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ne-rNP/strings.xml
rename to app/src/main/res/values-ne-rNP/strings.xml
diff --git a/app-phone/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from app-phone/src/main/res/values-night/themes.xml
rename to app/src/main/res/values-night/themes.xml
diff --git a/app-phone/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-nl/strings.xml
rename to app/src/main/res/values-nl/strings.xml
diff --git a/app-phone/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-no/strings.xml
rename to app/src/main/res/values-no/strings.xml
diff --git a/app-phone/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-pl/strings.xml
rename to app/src/main/res/values-pl/strings.xml
diff --git a/app-phone/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-pt-rBR/strings.xml
rename to app/src/main/res/values-pt-rBR/strings.xml
diff --git a/app-phone/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-pt/strings.xml
rename to app/src/main/res/values-pt/strings.xml
diff --git a/app-phone/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-rm/strings.xml
rename to app/src/main/res/values-rm/strings.xml
diff --git a/app-phone/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ro/strings.xml
rename to app/src/main/res/values-ro/strings.xml
diff --git a/app-phone/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ru/strings.xml
rename to app/src/main/res/values-ru/strings.xml
diff --git a/app-phone/src/main/res/values-sc-rIT/strings.xml b/app/src/main/res/values-sc-rIT/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-sc-rIT/strings.xml
rename to app/src/main/res/values-sc-rIT/strings.xml
diff --git a/app-phone/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-si-rLK/strings.xml
rename to app/src/main/res/values-si-rLK/strings.xml
diff --git a/app-phone/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-sk/strings.xml
rename to app/src/main/res/values-sk/strings.xml
diff --git a/app-phone/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-sl/strings.xml
rename to app/src/main/res/values-sl/strings.xml
diff --git a/app-phone/src/main/res/values-sq-rAL/strings.xml b/app/src/main/res/values-sq-rAL/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-sq-rAL/strings.xml
rename to app/src/main/res/values-sq-rAL/strings.xml
diff --git a/app-phone/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-sr/strings.xml
rename to app/src/main/res/values-sr/strings.xml
diff --git a/app-phone/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-sv/strings.xml
rename to app/src/main/res/values-sv/strings.xml
diff --git a/app-phone/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-sw/strings.xml
rename to app/src/main/res/values-sw/strings.xml
diff --git a/app-phone/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ta-rIN/strings.xml
rename to app/src/main/res/values-ta-rIN/strings.xml
diff --git a/app-phone/src/main/res/values-te-rIN/strings.xml b/app/src/main/res/values-te-rIN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-te-rIN/strings.xml
rename to app/src/main/res/values-te-rIN/strings.xml
diff --git a/app-phone/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-th/strings.xml
rename to app/src/main/res/values-th/strings.xml
diff --git a/app-phone/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-tr/strings.xml
rename to app/src/main/res/values-tr/strings.xml
diff --git a/app-phone/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-uk/strings.xml
rename to app/src/main/res/values-uk/strings.xml
diff --git a/app-phone/src/main/res/values-ur-rIN/strings.xml b/app/src/main/res/values-ur-rIN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-ur-rIN/strings.xml
rename to app/src/main/res/values-ur-rIN/strings.xml
diff --git a/app-phone/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-uz/strings.xml
rename to app/src/main/res/values-uz/strings.xml
diff --git a/app-phone/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-vi/strings.xml
rename to app/src/main/res/values-vi/strings.xml
diff --git a/app-phone/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-zh-rCN/strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
diff --git a/app-phone/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-zh-rHK/strings.xml
rename to app/src/main/res/values-zh-rHK/strings.xml
diff --git a/app-phone/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-zh-rTW/strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml
diff --git a/app-phone/src/main/res/values-zu/strings.xml b/app/src/main/res/values-zu/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values-zu/strings.xml
rename to app/src/main/res/values-zu/strings.xml
diff --git a/app-phone/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
similarity index 100%
rename from app-phone/src/main/res/values/attrs.xml
rename to app/src/main/res/values/attrs.xml
diff --git a/app-phone/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from app-phone/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/app-phone/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from app-phone/src/main/res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/app-phone/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from app-phone/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/app-phone/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from app-phone/src/main/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/app-phone/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
similarity index 100%
rename from app-phone/src/main/res/values/themes.xml
rename to app/src/main/res/values/themes.xml
diff --git a/app-phone/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml
similarity index 100%
rename from app-phone/src/main/res/xml/file_provider_paths.xml
rename to app/src/main/res/xml/file_provider_paths.xml
diff --git a/app-phone/src/main/res/xml/preferences_acknowledgements.xml b/app/src/main/res/xml/preferences_acknowledgements.xml
similarity index 100%
rename from app-phone/src/main/res/xml/preferences_acknowledgements.xml
rename to app/src/main/res/xml/preferences_acknowledgements.xml
diff --git a/app-phone/src/main/res/xml/preferences_debug.xml b/app/src/main/res/xml/preferences_debug.xml
similarity index 100%
rename from app-phone/src/main/res/xml/preferences_debug.xml
rename to app/src/main/res/xml/preferences_debug.xml
diff --git a/app-phone/src/main/res/xml/preferences_general.xml b/app/src/main/res/xml/preferences_general.xml
similarity index 100%
rename from app-phone/src/main/res/xml/preferences_general.xml
rename to app/src/main/res/xml/preferences_general.xml
diff --git a/app-phone/src/main/res/xml/preferences_index.xml b/app/src/main/res/xml/preferences_index.xml
similarity index 100%
rename from app-phone/src/main/res/xml/preferences_index.xml
rename to app/src/main/res/xml/preferences_index.xml
diff --git a/app-phone/src/main/res/xml/preferences_reactions.xml b/app/src/main/res/xml/preferences_reactions.xml
similarity index 100%
rename from app-phone/src/main/res/xml/preferences_reactions.xml
rename to app/src/main/res/xml/preferences_reactions.xml
diff --git a/app-phone/src/main/res/xml/preferences_support.xml b/app/src/main/res/xml/preferences_support.xml
similarity index 100%
rename from app-phone/src/main/res/xml/preferences_support.xml
rename to app/src/main/res/xml/preferences_support.xml
diff --git a/app-phone/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt b/app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt
rename to app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt b/app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt
rename to app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt b/app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt
rename to app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/misc/Twsi99999Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/misc/Twsi99999Test.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/misc/Twsi99999Test.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/misc/Twsi99999Test.kt
diff --git a/app-phone/src/test/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsProTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsProTest.kt
similarity index 100%
rename from app-phone/src/test/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsProTest.kt
rename to app/src/test/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsProTest.kt
diff --git a/app-phone/src/test/java/testhelper/BaseTest.kt b/app/src/test/java/testhelper/BaseTest.kt
similarity index 100%
rename from app-phone/src/test/java/testhelper/BaseTest.kt
rename to app/src/test/java/testhelper/BaseTest.kt
diff --git a/app-phone/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt b/app/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt
similarity index 100%
rename from app-phone/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt
rename to app/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt
diff --git a/app-phone/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt b/app/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt
similarity index 100%
rename from app-phone/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt
rename to app/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt
diff --git a/app-phone/src/test/java/testhelper/coroutine/TestExtensions.kt b/app/src/test/java/testhelper/coroutine/TestExtensions.kt
similarity index 100%
rename from app-phone/src/test/java/testhelper/coroutine/TestExtensions.kt
rename to app/src/test/java/testhelper/coroutine/TestExtensions.kt
diff --git a/app-phone/src/test/java/testhelper/flow/FlowTest.kt b/app/src/test/java/testhelper/flow/FlowTest.kt
similarity index 100%
rename from app-phone/src/test/java/testhelper/flow/FlowTest.kt
rename to app/src/test/java/testhelper/flow/FlowTest.kt
diff --git a/app-phone/src/test/java/testhelper/json/JsonExtensions.kt b/app/src/test/java/testhelper/json/JsonExtensions.kt
similarity index 100%
rename from app-phone/src/test/java/testhelper/json/JsonExtensions.kt
rename to app/src/test/java/testhelper/json/JsonExtensions.kt
diff --git a/app-phone/src/test/java/testhelper/livedata/InstantExecutorExtension.kt b/app/src/test/java/testhelper/livedata/InstantExecutorExtension.kt
similarity index 100%
rename from app-phone/src/test/java/testhelper/livedata/InstantExecutorExtension.kt
rename to app/src/test/java/testhelper/livedata/InstantExecutorExtension.kt
diff --git a/app-phone/src/test/java/testhelper/preferences/MockSharedPreferencesTest.kt b/app/src/test/java/testhelper/preferences/MockSharedPreferencesTest.kt
similarity index 100%
rename from app-phone/src/test/java/testhelper/preferences/MockSharedPreferencesTest.kt
rename to app/src/test/java/testhelper/preferences/MockSharedPreferencesTest.kt
diff --git a/app-phone/src/testShared/java/testhelpers/BaseTestInstrumentation.kt b/app/src/testShared/java/testhelpers/BaseTestInstrumentation.kt
similarity index 100%
rename from app-phone/src/testShared/java/testhelpers/BaseTestInstrumentation.kt
rename to app/src/testShared/java/testhelpers/BaseTestInstrumentation.kt
diff --git a/app-phone/src/testShared/java/testhelpers/IsAUnitTest.kt b/app/src/testShared/java/testhelpers/IsAUnitTest.kt
similarity index 100%
rename from app-phone/src/testShared/java/testhelpers/IsAUnitTest.kt
rename to app/src/testShared/java/testhelpers/IsAUnitTest.kt
diff --git a/app-phone/src/testShared/java/testhelpers/logging/JUnitLogger.kt b/app/src/testShared/java/testhelpers/logging/JUnitLogger.kt
similarity index 100%
rename from app-phone/src/testShared/java/testhelpers/logging/JUnitLogger.kt
rename to app/src/testShared/java/testhelpers/logging/JUnitLogger.kt
diff --git a/app-phone/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt b/app/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt
similarity index 100%
rename from app-phone/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt
rename to app/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt
diff --git a/app-phone/src/testShared/java/testhelpers/preferences/MockSharedPreferences.kt b/app/src/testShared/java/testhelpers/preferences/MockSharedPreferences.kt
similarity index 100%
rename from app-phone/src/testShared/java/testhelpers/preferences/MockSharedPreferences.kt
rename to app/src/testShared/java/testhelpers/preferences/MockSharedPreferences.kt
diff --git a/crowdin.yaml b/crowdin.yaml
index eb0b98a1..9e09a7b3 100644
--- a/crowdin.yaml
+++ b/crowdin.yaml
@@ -4,9 +4,9 @@
 
 "files": [
   {
-    "source": "/app-phone/src/main/res/values/strings.xml",
+    "source": "/app/src/main/res/values/strings.xml",
     "dest": "/strings.xml",
-    "translation": "/app-phone/src/main/res/values-%android_code%/%original_file_name%",
+    "translation": "/app/src/main/res/values-%android_code%/%original_file_name%",
     #    "update_option" : "update_without_changes",
     "languages_mapping": &stringmapping {
       "android_code": {
@@ -83,9 +83,9 @@
       }
     }
   }, {
-    "source": "/app-phone/src/gplay/res/values/strings.xml",
+    "source": "/app/src/gplay/res/values/strings.xml",
     "dest": "/strings-gplay.xml",
-    "translation": "/app-phone/src/gplay/res/values-%android_code%/strings.xml",
+    "translation": "/app/src/gplay/res/values-%android_code%/strings.xml",
     #    "update_option" : "update_without_changes",
     "languages_mapping": &stringmapping {
       "android_code": {
@@ -162,9 +162,9 @@
       }
     }
   }, {
-    "source": "/app-phone/src/foss/res/values/strings.xml",
+    "source": "/app/src/foss/res/values/strings.xml",
     "dest": "/strings-foss.xml",
-    "translation": "/app-phone/src/foss/res/values-%android_code%/strings.xml",
+    "translation": "/app/src/foss/res/values-%android_code%/strings.xml",
     #    "update_option" : "update_without_changes",
     "languages_mapping": &stringmapping {
       "android_code": {
diff --git a/settings.gradle b/settings.gradle
index ba44d233..7b11aedf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = "Companion App for AirPods"
-include ':app-phone'
+include ':app'
 include ':app-wearos'
 include ':app-common'