diff --git a/android/.gitignore b/uhabits-android/.gitignore
similarity index 100%
rename from android/.gitignore
rename to uhabits-android/.gitignore
diff --git a/android/android-pickers/.gitignore b/uhabits-android/android-pickers/.gitignore
similarity index 100%
rename from android/android-pickers/.gitignore
rename to uhabits-android/android-pickers/.gitignore
diff --git a/android/android-pickers/build.gradle b/uhabits-android/android-pickers/build.gradle
similarity index 100%
rename from android/android-pickers/build.gradle
rename to uhabits-android/android-pickers/build.gradle
diff --git a/android/android-pickers/proguard-rules.pro b/uhabits-android/android-pickers/proguard-rules.pro
similarity index 100%
rename from android/android-pickers/proguard-rules.pro
rename to uhabits-android/android-pickers/proguard-rules.pro
diff --git a/android/android-pickers/src/main/AndroidManifest.xml b/uhabits-android/android-pickers/src/main/AndroidManifest.xml
similarity index 100%
rename from android/android-pickers/src/main/AndroidManifest.xml
rename to uhabits-android/android-pickers/src/main/AndroidManifest.xml
diff --git a/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java b/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
rename to uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
diff --git a/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java b/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
rename to uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
diff --git a/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java b/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
rename to uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
diff --git a/android/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java b/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java
rename to uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java
diff --git a/android/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java b/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java
rename to uhabits-android/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/Utils.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/Utils.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/Utils.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/Utils.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
diff --git a/android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
similarity index 100%
rename from android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
rename to uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
diff --git a/android/android-pickers/src/main/res/color/date_picker_selector.xml b/uhabits-android/android-pickers/src/main/res/color/date_picker_selector.xml
similarity index 100%
rename from android/android-pickers/src/main/res/color/date_picker_selector.xml
rename to uhabits-android/android-pickers/src/main/res/color/date_picker_selector.xml
diff --git a/android/android-pickers/src/main/res/color/date_picker_year_selector.xml b/uhabits-android/android-pickers/src/main/res/color/date_picker_year_selector.xml
similarity index 100%
rename from android/android-pickers/src/main/res/color/date_picker_year_selector.xml
rename to uhabits-android/android-pickers/src/main/res/color/date_picker_year_selector.xml
diff --git a/android/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from android/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
rename to uhabits-android/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
diff --git a/android/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from android/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
rename to uhabits-android/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
diff --git a/android/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from android/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
rename to uhabits-android/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
diff --git a/android/android-pickers/src/main/res/drawable/color_picker_swatch.xml b/uhabits-android/android-pickers/src/main/res/drawable/color_picker_swatch.xml
similarity index 100%
rename from android/android-pickers/src/main/res/drawable/color_picker_swatch.xml
rename to uhabits-android/android-pickers/src/main/res/drawable/color_picker_swatch.xml
diff --git a/android/android-pickers/src/main/res/drawable/done_background_color.xml b/uhabits-android/android-pickers/src/main/res/drawable/done_background_color.xml
similarity index 100%
rename from android/android-pickers/src/main/res/drawable/done_background_color.xml
rename to uhabits-android/android-pickers/src/main/res/drawable/done_background_color.xml
diff --git a/android/android-pickers/src/main/res/drawable/done_background_color_dark.xml b/uhabits-android/android-pickers/src/main/res/drawable/done_background_color_dark.xml
similarity index 100%
rename from android/android-pickers/src/main/res/drawable/done_background_color_dark.xml
rename to uhabits-android/android-pickers/src/main/res/drawable/done_background_color_dark.xml
diff --git a/android/android-pickers/src/main/res/layout/color_picker_dialog.xml b/uhabits-android/android-pickers/src/main/res/layout/color_picker_dialog.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/color_picker_dialog.xml
rename to uhabits-android/android-pickers/src/main/res/layout/color_picker_dialog.xml
diff --git a/android/android-pickers/src/main/res/layout/color_picker_swatch.xml b/uhabits-android/android-pickers/src/main/res/layout/color_picker_swatch.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/color_picker_swatch.xml
rename to uhabits-android/android-pickers/src/main/res/layout/color_picker_swatch.xml
diff --git a/android/android-pickers/src/main/res/layout/date_picker_dialog.xml b/uhabits-android/android-pickers/src/main/res/layout/date_picker_dialog.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/date_picker_dialog.xml
rename to uhabits-android/android-pickers/src/main/res/layout/date_picker_dialog.xml
diff --git a/android/android-pickers/src/main/res/layout/date_picker_done_button.xml b/uhabits-android/android-pickers/src/main/res/layout/date_picker_done_button.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/date_picker_done_button.xml
rename to uhabits-android/android-pickers/src/main/res/layout/date_picker_done_button.xml
diff --git a/android/android-pickers/src/main/res/layout/date_picker_header_view.xml b/uhabits-android/android-pickers/src/main/res/layout/date_picker_header_view.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/date_picker_header_view.xml
rename to uhabits-android/android-pickers/src/main/res/layout/date_picker_header_view.xml
diff --git a/android/android-pickers/src/main/res/layout/date_picker_selected_date.xml b/uhabits-android/android-pickers/src/main/res/layout/date_picker_selected_date.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/date_picker_selected_date.xml
rename to uhabits-android/android-pickers/src/main/res/layout/date_picker_selected_date.xml
diff --git a/android/android-pickers/src/main/res/layout/date_picker_view_animator.xml b/uhabits-android/android-pickers/src/main/res/layout/date_picker_view_animator.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/date_picker_view_animator.xml
rename to uhabits-android/android-pickers/src/main/res/layout/date_picker_view_animator.xml
diff --git a/android/android-pickers/src/main/res/layout/time_header_label.xml b/uhabits-android/android-pickers/src/main/res/layout/time_header_label.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/time_header_label.xml
rename to uhabits-android/android-pickers/src/main/res/layout/time_header_label.xml
diff --git a/android/android-pickers/src/main/res/layout/time_picker_dialog.xml b/uhabits-android/android-pickers/src/main/res/layout/time_picker_dialog.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/time_picker_dialog.xml
rename to uhabits-android/android-pickers/src/main/res/layout/time_picker_dialog.xml
diff --git a/android/android-pickers/src/main/res/layout/year_label_text_view.xml b/uhabits-android/android-pickers/src/main/res/layout/year_label_text_view.xml
similarity index 100%
rename from android/android-pickers/src/main/res/layout/year_label_text_view.xml
rename to uhabits-android/android-pickers/src/main/res/layout/year_label_text_view.xml
diff --git a/android/android-pickers/src/main/res/values/pickers.xml b/uhabits-android/android-pickers/src/main/res/values/pickers.xml
similarity index 100%
rename from android/android-pickers/src/main/res/values/pickers.xml
rename to uhabits-android/android-pickers/src/main/res/values/pickers.xml
diff --git a/android/android-pickers/src/main/res/values/strings.xml b/uhabits-android/android-pickers/src/main/res/values/strings.xml
similarity index 100%
rename from android/android-pickers/src/main/res/values/strings.xml
rename to uhabits-android/android-pickers/src/main/res/values/strings.xml
diff --git a/android/build.gradle b/uhabits-android/build.gradle
similarity index 100%
rename from android/build.gradle
rename to uhabits-android/build.gradle
diff --git a/android/build.sh b/uhabits-android/build.sh
similarity index 100%
rename from android/build.sh
rename to uhabits-android/build.sh
diff --git a/android/gradle.properties b/uhabits-android/gradle.properties
similarity index 100%
rename from android/gradle.properties
rename to uhabits-android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/uhabits-android/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.jar
rename to uhabits-android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/uhabits-android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.properties
rename to uhabits-android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/gradlew b/uhabits-android/gradlew
similarity index 100%
rename from android/gradlew
rename to uhabits-android/gradlew
diff --git a/android/gradlew.bat b/uhabits-android/gradlew.bat
similarity index 100%
rename from android/gradlew.bat
rename to uhabits-android/gradlew.bat
diff --git a/android/play b/uhabits-android/play
similarity index 100%
rename from android/play
rename to uhabits-android/play
diff --git a/android/settings.gradle b/uhabits-android/settings.gradle
similarity index 100%
rename from android/settings.gradle
rename to uhabits-android/settings.gradle
diff --git a/android/tools/automator-log-converter-1.5.0.jar b/uhabits-android/tools/automator-log-converter-1.5.0.jar
similarity index 100%
rename from android/tools/automator-log-converter-1.5.0.jar
rename to uhabits-android/tools/automator-log-converter-1.5.0.jar
diff --git a/android/tools/coverage-badge/badge.py b/uhabits-android/tools/coverage-badge/badge.py
similarity index 100%
rename from android/tools/coverage-badge/badge.py
rename to uhabits-android/tools/coverage-badge/badge.py
diff --git a/android/tools/coverage-badge/templates/flat.svg b/uhabits-android/tools/coverage-badge/templates/flat.svg
similarity index 100%
rename from android/tools/coverage-badge/templates/flat.svg
rename to uhabits-android/tools/coverage-badge/templates/flat.svg
diff --git a/android/tools/test-butler-app-2.0.2.apk b/uhabits-android/tools/test-butler-app-2.0.2.apk
similarity index 100%
rename from android/tools/test-butler-app-2.0.2.apk
rename to uhabits-android/tools/test-butler-app-2.0.2.apk
diff --git a/android/uhabits-android/build.gradle b/uhabits-android/uhabits-android/build.gradle
similarity index 100%
rename from android/uhabits-android/build.gradle
rename to uhabits-android/uhabits-android/build.gradle
diff --git a/android/uhabits-android/lint.xml b/uhabits-android/uhabits-android/lint.xml
similarity index 100%
rename from android/uhabits-android/lint.xml
rename to uhabits-android/uhabits-android/lint.xml
diff --git a/android/uhabits-android/proguard-rules.txt b/uhabits-android/uhabits-android/proguard-rules.txt
similarity index 100%
rename from android/uhabits-android/proguard-rules.txt
rename to uhabits-android/uhabits-android/proguard-rules.txt
diff --git a/android/uhabits-android/src/androidTest/assets/fontawesome-webfont.ttf b/uhabits-android/uhabits-android/src/androidTest/assets/fontawesome-webfont.ttf
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/fontawesome-webfont.ttf
rename to uhabits-android/uhabits-android/src/androidTest/assets/fontawesome-webfont.ttf
diff --git a/android/uhabits-android/src/androidTest/assets/views/CanvasTest.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/CanvasTest.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/CanvasTest.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/CanvasTest.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/RingView/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/RingView/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/RingView/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/RingView/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/RingView/renderDifferentParams.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/RingView/renderDifferentParams.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/RingView/renderDifferentParams.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/RingView/renderDifferentParams.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderYearly.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderYearly.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderYearly.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderYearly.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/StreakChart/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/StreakChart/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderTransparent.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderTransparent.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderTransparent.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderTransparent.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render_offset.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render_offset.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render_offset.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render_offset.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_numerical.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_numerical.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_numerical.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_numerical.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/HintView/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HintView/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/HintView/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HintView/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_different_color.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_different_color.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_different_color.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_different_color.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_offset.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_offset.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_offset.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_offset.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_reversed.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_reversed.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_reversed.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_reversed.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/show/FrequencyCard/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/FrequencyCard/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/show/FrequencyCard/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/FrequencyCard/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/show/HistoryCard/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/HistoryCard/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/show/HistoryCard/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/HistoryCard/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render-empty-description.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render-empty-description.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render-empty-description.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render-empty-description.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/show/OverviewCard/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/OverviewCard/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/show/OverviewCard/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/OverviewCard/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/show/ScoreCard/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/ScoreCard/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/show/ScoreCard/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/ScoreCard/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/show/StreakCard/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/StreakCard/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/show/StreakCard/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/StreakCard/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/habits/show/SubtitleCard/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/SubtitleCard/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/habits/show/SubtitleCard/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/SubtitleCard/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/StreakWidget/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/StreakWidget/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/StreakWidget/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/StreakWidget/render.png
diff --git a/android/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png b/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png
similarity index 100%
rename from android/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png
rename to uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/platform/gui/AndroidCanvasTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/platform/gui/AndroidCanvasTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/platform/gui/AndroidCanvasTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/platform/gui/AndroidCanvasTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/BackupTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/BackupTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/BackupTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/BackupTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java b/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
similarity index 100%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
rename to uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
diff --git a/android/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/uhabits-android/src/main/AndroidManifest.xml
similarity index 100%
rename from android/uhabits-android/src/main/AndroidManifest.xml
rename to uhabits-android/uhabits-android/src/main/AndroidManifest.xml
diff --git a/android/uhabits-android/src/main/assets/cacert.pem b/uhabits-android/uhabits-android/src/main/assets/cacert.pem
similarity index 100%
rename from android/uhabits-android/src/main/assets/cacert.pem
rename to uhabits-android/uhabits-android/src/main/assets/cacert.pem
diff --git a/android/uhabits-android/src/main/assets/fontawesome-webfont.ttf b/uhabits-android/uhabits-android/src/main/assets/fontawesome-webfont.ttf
similarity index 100%
rename from android/uhabits-android/src/main/assets/fontawesome-webfont.ttf
rename to uhabits-android/uhabits-android/src/main/assets/fontawesome-webfont.ttf
diff --git a/android/uhabits-android/src/main/ic_launcher-web.png b/uhabits-android/uhabits-android/src/main/ic_launcher-web.png
similarity index 100%
rename from android/uhabits-android/src/main/ic_launcher-web.png
rename to uhabits-android/uhabits-android/src/main/ic_launcher-web.png
diff --git a/android/uhabits-android/src/main/ic_small_widget_preview-web.png b/uhabits-android/uhabits-android/src/main/ic_small_widget_preview-web.png
similarity index 100%
rename from android/uhabits-android/src/main/ic_small_widget_preview-web.png
rename to uhabits-android/uhabits-android/src/main/ic_small_widget_preview-web.png
diff --git a/android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidTestView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidTestView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidTestView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidTestView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/io/AndroidLogging.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/io/AndroidLogging.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/io/AndroidLogging.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/io/AndroidLogging.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java b/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
similarity index 100%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
rename to uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
diff --git a/android/uhabits-android/src/main/play/contact-email.txt b/uhabits-android/uhabits-android/src/main/play/contact-email.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/contact-email.txt
rename to uhabits-android/uhabits-android/src/main/play/contact-email.txt
diff --git a/android/uhabits-android/src/main/play/contact-website.txt b/uhabits-android/uhabits-android/src/main/play/contact-website.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/contact-website.txt
rename to uhabits-android/uhabits-android/src/main/play/contact-website.txt
diff --git a/android/uhabits-android/src/main/play/default-language.txt b/uhabits-android/uhabits-android/src/main/play/default-language.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/default-language.txt
rename to uhabits-android/uhabits-android/src/main/play/default-language.txt
diff --git a/android/uhabits-android/src/main/play/listings/ar-rSA/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ar-rSA/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ar-rSA/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ar-rSA/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ar-rSA/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ar-rSA/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ar-rSA/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ar-rSA/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ar/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ar/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ar/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ar/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ar/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ar/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ar/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ar/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ar/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/ar/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ar/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ar/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/ca-rES/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ca-rES/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ca-rES/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ca-rES/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ca-rES/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ca-rES/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ca-rES/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ca-rES/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ca/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ca/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ca/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ca/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ca/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ca/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ca/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ca/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ca/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/ca/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ca/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ca/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/cs-CZ/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/cs-CZ/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/cs-CZ/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/cs-CZ/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/cs-CZ/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/cs-CZ/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/cs-rCZ/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/cs-rCZ/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/cs-rCZ/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/cs-rCZ/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/cs-rCZ/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/cs-rCZ/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/cs-rCZ/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/cs-rCZ/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/de-DE/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/de-DE/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/de-DE/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/de-DE/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/de-DE/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/de-DE/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/de-DE/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/de-DE/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/de-DE/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/de-DE/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/de-DE/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/de-DE/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/de-rDE/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/de-rDE/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/de-rDE/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/de-rDE/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/de-rDE/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/de-rDE/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/de-rDE/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/de-rDE/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/en-US/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/en-US/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/en-US/graphics/feature-graphic/1.png b/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/feature-graphic/1.png
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/graphics/feature-graphic/1.png
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/feature-graphic/1.png
diff --git a/android/uhabits-android/src/main/play/listings/en-US/graphics/icon/1.png b/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/icon/1.png
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/graphics/icon/1.png
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/icon/1.png
diff --git a/android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png b/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png
diff --git a/android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png b/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png
diff --git a/android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png b/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png
diff --git a/android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png b/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png
diff --git a/android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png b/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png
diff --git a/android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png b/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png
diff --git a/android/uhabits-android/src/main/play/listings/en-US/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/en-US/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/en-US/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/en-US/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/en-US/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/en-US/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/eo-rUY/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/eo-rUY/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/eo-rUY/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/eo-rUY/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/es-ES/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/es-ES/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/es-ES/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/es-ES/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/es-ES/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/es-ES/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/es-ES/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/es-ES/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/es-ES/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/es-ES/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/es-ES/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/es-ES/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/es-rES/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/es-rES/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/es-rES/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/es-rES/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/es-rES/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/es-rES/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/es-rES/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/es-rES/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/eu-rES/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/eu-rES/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/eu-rES/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/eu-rES/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/eu-rES/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/eu-rES/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/eu-rES/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/eu-rES/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/fa-rIR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/fa-rIR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/fa-rIR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/fa-rIR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/fr-FR/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/fr-FR/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/fr-FR/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/fr-FR/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/fr-FR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/fr-FR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/fr-FR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/fr-FR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/fr-FR/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/fr-FR/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/fr-FR/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/fr-FR/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/fr-rFR/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/fr-rFR/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/fr-rFR/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/fr-rFR/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/fr-rFR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/fr-rFR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/fr-rFR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/fr-rFR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/hr/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/hr/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/hr/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/hr/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/hr/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/hr/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/hr/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/hr/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/hr/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/hr/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/hr/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/hr/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/id/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/id/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/id/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/id/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/id/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/id/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/id/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/id/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/id/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/id/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/id/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/id/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/in-rID/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/in-rID/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/in-rID/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/in-rID/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/in-rID/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/in-rID/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/in-rID/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/in-rID/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/it-IT/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/it-IT/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/it-IT/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/it-IT/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/it-IT/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/it-IT/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/it-IT/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/it-IT/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/it-IT/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/it-IT/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/it-IT/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/it-IT/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/it-rIT/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/it-rIT/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/it-rIT/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/it-rIT/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/it-rIT/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/it-rIT/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/it-rIT/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/it-rIT/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ja-JP/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ja-JP/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ja-JP/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ja-JP/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ja-JP/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ja-JP/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ja-JP/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ja-JP/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ja-JP/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/ja-JP/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ja-JP/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ja-JP/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/ja-rJP/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ja-rJP/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ja-rJP/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ja-rJP/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ko-KR/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ko-KR/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ko-KR/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ko-KR/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ko-KR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ko-KR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ko-KR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ko-KR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ko-KR/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/ko-KR/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ko-KR/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ko-KR/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/ko-rKR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ko-rKR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ko-rKR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ko-rKR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/nl-rNL/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/nl-rNL/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/nl-rNL/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/nl-rNL/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/nl-rNL/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/nl-rNL/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/nl-rNL/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/nl-rNL/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pl-PL/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pl-PL/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pl-PL/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pl-PL/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pl-PL/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pl-PL/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pl-PL/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pl-PL/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pl-PL/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/pl-PL/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pl-PL/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pl-PL/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/pl-rPL/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pl-rPL/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pl-rPL/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pl-rPL/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pl-rPL/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pl-rPL/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pl-rPL/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pl-rPL/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pt-BR/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pt-BR/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pt-BR/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pt-BR/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pt-BR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pt-BR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pt-BR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pt-BR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pt-BR/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/pt-BR/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pt-BR/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pt-BR/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/pt-rBR/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pt-rBR/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pt-rBR/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pt-rBR/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pt-rBR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pt-rBR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pt-rBR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pt-rBR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pt-rPT/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pt-rPT/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pt-rPT/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pt-rPT/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/pt-rPT/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/pt-rPT/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/pt-rPT/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/pt-rPT/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ru-RU/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ru-RU/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ru-RU/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ru-RU/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ru-RU/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ru-RU/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ru-RU/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ru-RU/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ru-RU/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/ru-RU/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ru-RU/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ru-RU/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/ru-rRU/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/ru-rRU/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/ru-rRU/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/ru-rRU/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sk-rSK/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sk-rSK/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sk-rSK/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sk-rSK/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sk-rSK/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sk-rSK/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sk-rSK/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sk-rSK/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sl/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sl/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sl/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sl/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sl/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sl/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sl/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sl/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sl/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/sl/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sl/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sl/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/sr/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sr/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sr/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sr/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sr/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sr/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sr/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sr/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sr/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/sr/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sr/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sr/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/sv-SE/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sv-SE/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sv-SE/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sv-SE/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sv-SE/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sv-SE/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sv-SE/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sv-SE/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sv-SE/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/sv-SE/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sv-SE/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sv-SE/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/sv-rSE/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sv-rSE/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sv-rSE/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sv-rSE/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/sv-rSE/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/sv-rSE/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/sv-rSE/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/sv-rSE/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/te-rIN/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/te-rIN/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/te-rIN/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/te-rIN/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/tr-TR/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/tr-TR/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/tr-TR/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/tr-TR/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/tr-TR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/tr-TR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/tr-TR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/tr-TR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/tr-TR/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/tr-TR/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/tr-TR/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/tr-TR/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/tr-rTR/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/tr-rTR/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/tr-rTR/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/tr-rTR/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/tr-rTR/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/tr-rTR/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/tr-rTR/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/tr-rTR/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/uk-rUA/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/uk-rUA/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/uk-rUA/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/uk-rUA/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/uk-rUA/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/uk-rUA/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/uk-rUA/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/uk-rUA/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/uk/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/uk/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/uk/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/uk/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/uk/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/uk/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/uk/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/uk/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/uk/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/uk/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/uk/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/uk/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/vi-rVN/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/vi-rVN/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/vi-rVN/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/vi-rVN/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/vi-rVN/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/vi-rVN/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/vi-rVN/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/vi-rVN/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-CN/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-CN/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-CN/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-CN/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-CN/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-CN/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-CN/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-CN/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-CN/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-CN/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-CN/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-CN/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-TW/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-TW/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-TW/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-TW/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-TW/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-TW/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-TW/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-TW/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-TW/title.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-TW/title.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-TW/title.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-TW/title.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-rTW/full-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-rTW/full-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-rTW/full-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-rTW/full-description.txt
diff --git a/android/uhabits-android/src/main/play/listings/zh-rTW/short-description.txt b/uhabits-android/uhabits-android/src/main/play/listings/zh-rTW/short-description.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/listings/zh-rTW/short-description.txt
rename to uhabits-android/uhabits-android/src/main/play/listings/zh-rTW/short-description.txt
diff --git a/android/uhabits-android/src/main/play/release-notes/en-US/default.txt b/uhabits-android/uhabits-android/src/main/play/release-notes/en-US/default.txt
similarity index 100%
rename from android/uhabits-android/src/main/play/release-notes/en-US/default.txt
rename to uhabits-android/uhabits-android/src/main/play/release-notes/en-US/default.txt
diff --git a/android/uhabits-android/src/main/res/anim/fade_in.xml b/uhabits-android/uhabits-android/src/main/res/anim/fade_in.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/anim/fade_in.xml
rename to uhabits-android/uhabits-android/src/main/res/anim/fade_in.xml
diff --git a/android/uhabits-android/src/main/res/anim/fade_out.xml b/uhabits-android/uhabits-android/src/main/res/anim/fade_out.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/anim/fade_out.xml
rename to uhabits-android/uhabits-android/src/main/res/anim/fade_out.xml
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png b/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png
diff --git a/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png b/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png
diff --git a/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png b/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png
diff --git a/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png b/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png
diff --git a/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png b/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png
diff --git a/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_target.png b/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_target.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_target.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_target.png
diff --git a/android/uhabits-android/src/main/res/drawable-v21/ripple.xml b/uhabits-android/uhabits-android/src/main/res/drawable-v21/ripple.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-v21/ripple.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable-v21/ripple.xml
diff --git a/android/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml b/uhabits-android/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml
diff --git a/android/uhabits-android/src/main/res/drawable-v21/selected_box.xml b/uhabits-android/uhabits-android/src/main/res/drawable-v21/selected_box.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-v21/selected_box.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable-v21/selected_box.xml
diff --git a/android/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml b/uhabits-android/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png b/uhabits-android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png
rename to uhabits-android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png
diff --git a/android/uhabits-android/src/main/res/drawable/bg_input_box.xml b/uhabits-android/uhabits-android/src/main/res/drawable/bg_input_box.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/bg_input_box.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/bg_input_box.xml
diff --git a/android/uhabits-android/src/main/res/drawable/bg_input_group.xml b/uhabits-android/uhabits-android/src/main/res/drawable/bg_input_group.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/bg_input_group.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/bg_input_group.xml
diff --git a/android/uhabits-android/src/main/res/drawable/card_amoled_background.xml b/uhabits-android/uhabits-android/src/main/res/drawable/card_amoled_background.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/card_amoled_background.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/card_amoled_background.xml
diff --git a/android/uhabits-android/src/main/res/drawable/card_dark_background.xml b/uhabits-android/uhabits-android/src/main/res/drawable/card_dark_background.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/card_dark_background.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/card_dark_background.xml
diff --git a/android/uhabits-android/src/main/res/drawable/card_light_background.xml b/uhabits-android/uhabits-android/src/main/res/drawable/card_light_background.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/card_light_background.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/card_light_background.xml
diff --git a/android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml b/uhabits-android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml
diff --git a/android/uhabits-android/src/main/res/drawable/ic_arrow_drop_down_dark.xml b/uhabits-android/uhabits-android/src/main/res/drawable/ic_arrow_drop_down_dark.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/ic_arrow_drop_down_dark.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/ic_arrow_drop_down_dark.xml
diff --git a/android/uhabits-android/src/main/res/drawable/intro_icon_1.png b/uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_1.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/intro_icon_1.png
rename to uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_1.png
diff --git a/android/uhabits-android/src/main/res/drawable/intro_icon_2.png b/uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_2.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/intro_icon_2.png
rename to uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_2.png
diff --git a/android/uhabits-android/src/main/res/drawable/intro_icon_4.png b/uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_4.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/intro_icon_4.png
rename to uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_4.png
diff --git a/android/uhabits-android/src/main/res/drawable/round_ripple.xml b/uhabits-android/uhabits-android/src/main/res/drawable/round_ripple.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/round_ripple.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/round_ripple.xml
diff --git a/android/uhabits-android/src/main/res/drawable/selected_box_amoled.xml b/uhabits-android/uhabits-android/src/main/res/drawable/selected_box_amoled.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/selected_box_amoled.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/selected_box_amoled.xml
diff --git a/android/uhabits-android/src/main/res/drawable/selected_box_dark.xml b/uhabits-android/uhabits-android/src/main/res/drawable/selected_box_dark.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/selected_box_dark.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/selected_box_dark.xml
diff --git a/android/uhabits-android/src/main/res/drawable/selected_box_light.xml b/uhabits-android/uhabits-android/src/main/res/drawable/selected_box_light.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/selected_box_light.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/selected_box_light.xml
diff --git a/android/uhabits-android/src/main/res/drawable/shadow.xml b/uhabits-android/uhabits-android/src/main/res/drawable/shadow.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/shadow.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/shadow.xml
diff --git a/android/uhabits-android/src/main/res/drawable/stripe.png b/uhabits-android/uhabits-android/src/main/res/drawable/stripe.png
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/stripe.png
rename to uhabits-android/uhabits-android/src/main/res/drawable/stripe.png
diff --git a/android/uhabits-android/src/main/res/drawable/widget_background.xml b/uhabits-android/uhabits-android/src/main/res/drawable/widget_background.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/widget_background.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/widget_background.xml
diff --git a/android/uhabits-android/src/main/res/drawable/widget_button_background.xml b/uhabits-android/uhabits-android/src/main/res/drawable/widget_button_background.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/drawable/widget_button_background.xml
rename to uhabits-android/uhabits-android/src/main/res/drawable/widget_button_background.xml
diff --git a/android/uhabits-android/src/main/res/layout/about.xml b/uhabits-android/uhabits-android/src/main/res/layout/about.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/about.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/about.xml
diff --git a/android/uhabits-android/src/main/res/layout/activity_edit_habit.xml b/uhabits-android/uhabits-android/src/main/res/layout/activity_edit_habit.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/activity_edit_habit.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/activity_edit_habit.xml
diff --git a/android/uhabits-android/src/main/res/layout/activity_sync.xml b/uhabits-android/uhabits-android/src/main/res/layout/activity_sync.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/activity_sync.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/activity_sync.xml
diff --git a/android/uhabits-android/src/main/res/layout/automation.xml b/uhabits-android/uhabits-android/src/main/res/layout/automation.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/automation.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/automation.xml
diff --git a/android/uhabits-android/src/main/res/layout/canvas_test.xml b/uhabits-android/uhabits-android/src/main/res/layout/canvas_test.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/canvas_test.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/canvas_test.xml
diff --git a/android/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml b/uhabits-android/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml
diff --git a/android/uhabits-android/src/main/res/layout/frequency_picker_dialog.xml b/uhabits-android/uhabits-android/src/main/res/layout/frequency_picker_dialog.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/frequency_picker_dialog.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/frequency_picker_dialog.xml
diff --git a/android/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml b/uhabits-android/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml
diff --git a/android/uhabits-android/src/main/res/layout/history_stackview_widget.xml b/uhabits-android/uhabits-android/src/main/res/layout/history_stackview_widget.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/history_stackview_widget.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/history_stackview_widget.xml
diff --git a/android/uhabits-android/src/main/res/layout/number_picker_dialog.xml b/uhabits-android/uhabits-android/src/main/res/layout/number_picker_dialog.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/number_picker_dialog.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/number_picker_dialog.xml
diff --git a/android/uhabits-android/src/main/res/layout/preference_category_custom.xml b/uhabits-android/uhabits-android/src/main/res/layout/preference_category_custom.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/preference_category_custom.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/preference_category_custom.xml
diff --git a/android/uhabits-android/src/main/res/layout/score_stackview_widget.xml b/uhabits-android/uhabits-android/src/main/res/layout/score_stackview_widget.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/score_stackview_widget.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/score_stackview_widget.xml
diff --git a/android/uhabits-android/src/main/res/layout/select_habit_type.xml b/uhabits-android/uhabits-android/src/main/res/layout/select_habit_type.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/select_habit_type.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/select_habit_type.xml
diff --git a/android/uhabits-android/src/main/res/layout/settings_activity.xml b/uhabits-android/uhabits-android/src/main/res/layout/settings_activity.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/settings_activity.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/settings_activity.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_bar.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_bar.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_bar.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_bar.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_frequency.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_frequency.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_frequency.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_frequency.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_history.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_history.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_history.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_history.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_notes.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_notes.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_notes.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_notes.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_overview.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_overview.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_overview.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_overview.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_score.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_score.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_score.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_score.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_streak.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_streak.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_streak.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_streak.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
diff --git a/android/uhabits-android/src/main/res/layout/show_habit_target.xml b/uhabits-android/uhabits-android/src/main/res/layout/show_habit_target.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/show_habit_target.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/show_habit_target.xml
diff --git a/android/uhabits-android/src/main/res/layout/streak_stackview_widget.xml b/uhabits-android/uhabits-android/src/main/res/layout/streak_stackview_widget.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/streak_stackview_widget.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/streak_stackview_widget.xml
diff --git a/android/uhabits-android/src/main/res/layout/target_stackview_widget.xml b/uhabits-android/uhabits-android/src/main/res/layout/target_stackview_widget.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/target_stackview_widget.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/target_stackview_widget.xml
diff --git a/android/uhabits-android/src/main/res/layout/toolbar.xml b/uhabits-android/uhabits-android/src/main/res/layout/toolbar.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/toolbar.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/toolbar.xml
diff --git a/android/uhabits-android/src/main/res/layout/widget_checkmark.xml b/uhabits-android/uhabits-android/src/main/res/layout/widget_checkmark.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/widget_checkmark.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/widget_checkmark.xml
diff --git a/android/uhabits-android/src/main/res/layout/widget_configure_activity.xml b/uhabits-android/uhabits-android/src/main/res/layout/widget_configure_activity.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/widget_configure_activity.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/widget_configure_activity.xml
diff --git a/android/uhabits-android/src/main/res/layout/widget_empty_activity.xml b/uhabits-android/uhabits-android/src/main/res/layout/widget_empty_activity.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/widget_empty_activity.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/widget_empty_activity.xml
diff --git a/android/uhabits-android/src/main/res/layout/widget_error.xml b/uhabits-android/uhabits-android/src/main/res/layout/widget_error.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/widget_error.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/widget_error.xml
diff --git a/android/uhabits-android/src/main/res/layout/widget_graph.xml b/uhabits-android/uhabits-android/src/main/res/layout/widget_graph.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/widget_graph.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/widget_graph.xml
diff --git a/android/uhabits-android/src/main/res/layout/widget_wrapper.xml b/uhabits-android/uhabits-android/src/main/res/layout/widget_wrapper.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/layout/widget_wrapper.xml
rename to uhabits-android/uhabits-android/src/main/res/layout/widget_wrapper.xml
diff --git a/android/uhabits-android/src/main/res/menu/list_habits.xml b/uhabits-android/uhabits-android/src/main/res/menu/list_habits.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/menu/list_habits.xml
rename to uhabits-android/uhabits-android/src/main/res/menu/list_habits.xml
diff --git a/android/uhabits-android/src/main/res/menu/list_habits_selection.xml b/uhabits-android/uhabits-android/src/main/res/menu/list_habits_selection.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/menu/list_habits_selection.xml
rename to uhabits-android/uhabits-android/src/main/res/menu/list_habits_selection.xml
diff --git a/android/uhabits-android/src/main/res/menu/show_habit.xml b/uhabits-android/uhabits-android/src/main/res/menu/show_habit.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/menu/show_habit.xml
rename to uhabits-android/uhabits-android/src/main/res/menu/show_habit.xml
diff --git a/android/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/uhabits-android/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to uhabits-android/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/uhabits-android/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png b/uhabits-android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/uhabits-android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png b/uhabits-android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/uhabits-android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/uhabits-android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/uhabits-android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/uhabits-android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/uhabits-android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to uhabits-android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/uhabits-android/src/main/res/values-af-rZA/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-af-rZA/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-af-rZA/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-af-rZA/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-ar-rSA/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-ar-rSA/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-ar-rSA/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-ar-rSA/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-bg-rBG/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-bg-rBG/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-bg-rBG/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-bg-rBG/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-ca-rES/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-ca-rES/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-ca-rES/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-ca-rES/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-cs-rCZ/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-da-rDK/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-da-rDK/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-da-rDK/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-da-rDK/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-de-rDE/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-de-rDE/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-de-rDE/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-de-rDE/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-el-rGR/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-el-rGR/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-el-rGR/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-el-rGR/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-eo-rUY/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-eo-rUY/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-eo-rUY/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-eo-rUY/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-es-rES/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-es-rES/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-es-rES/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-es-rES/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-eu-rES/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-eu-rES/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-eu-rES/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-eu-rES/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-fa-rIR/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-fa-rIR/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-fa-rIR/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-fa-rIR/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-fi-rFI/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-fi-rFI/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-fi-rFI/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-fi-rFI/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-fr-rFR/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-fr-rFR/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-fr-rFR/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-fr-rFR/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-hi-rIN/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-hi-rIN/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-hi-rIN/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-hi-rIN/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-hr-rHR/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-hr-rHR/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-hr-rHR/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-hr-rHR/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-hu-rHU/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-hu-rHU/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-hu-rHU/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-hu-rHU/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-in-rID/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-in-rID/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-in-rID/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-in-rID/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-it-rIT/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-it-rIT/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-it-rIT/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-it-rIT/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-iw-rIL/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-iw-rIL/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-iw-rIL/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-iw-rIL/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-ja-rJP/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-ja-rJP/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-ja-rJP/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-ja-rJP/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-ko-rKR/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-ko-rKR/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-ko-rKR/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-ko-rKR/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-nl-rNL/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-nl-rNL/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-nl-rNL/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-nl-rNL/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-no-rNO/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-no-rNO/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-no-rNO/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-no-rNO/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-pl-rPL/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-pl-rPL/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-pl-rPL/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-pl-rPL/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-pt-rBR/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-pt-rBR/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-pt-rBR/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-pt-rPT/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-pt-rPT/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-pt-rPT/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-ro-rRO/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-ro-rRO/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-ro-rRO/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-ro-rRO/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-ru-rRU/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-ru-rRU/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-ru-rRU/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-ru-rRU/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-sk-rSK/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-sk-rSK/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-sk-rSK/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-sk-rSK/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-sl-rSI/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-sl-rSI/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-sl-rSI/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-sl-rSI/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-sr-rSP/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-sr-rSP/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-sr-rSP/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-sr-rSP/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-sv-rSE/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-sv-rSE/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-sv-rSE/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-sv-rSE/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-ta-rIN/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-ta-rIN/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-ta-rIN/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-ta-rIN/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-te-rIN/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-te-rIN/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-te-rIN/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-te-rIN/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-tr-rTR/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-tr-rTR/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-tr-rTR/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-tr-rTR/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-ug-rCN/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-ug-rCN/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-ug-rCN/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-ug-rCN/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-uk-rUA/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-uk-rUA/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-uk-rUA/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-uk-rUA/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-v21/styles.xml b/uhabits-android/uhabits-android/src/main/res/values-v21/styles.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-v21/styles.xml
rename to uhabits-android/uhabits-android/src/main/res/values-v21/styles.xml
diff --git a/android/uhabits-android/src/main/res/values-v21/styles_list_habits.xml b/uhabits-android/uhabits-android/src/main/res/values-v21/styles_list_habits.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-v21/styles_list_habits.xml
rename to uhabits-android/uhabits-android/src/main/res/values-v21/styles_list_habits.xml
diff --git a/android/uhabits-android/src/main/res/values-vi-rVN/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-vi-rVN/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-vi-rVN/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-vi-rVN/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-zh-rCN/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-zh-rCN/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-zh-rCN/strings.xml
diff --git a/android/uhabits-android/src/main/res/values-zh-rTW/strings.xml b/uhabits-android/uhabits-android/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values-zh-rTW/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values-zh-rTW/strings.xml
diff --git a/android/uhabits-android/src/main/res/values/attrs.xml b/uhabits-android/uhabits-android/src/main/res/values/attrs.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/attrs.xml
rename to uhabits-android/uhabits-android/src/main/res/values/attrs.xml
diff --git a/android/uhabits-android/src/main/res/values/colors.xml b/uhabits-android/uhabits-android/src/main/res/values/colors.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/colors.xml
rename to uhabits-android/uhabits-android/src/main/res/values/colors.xml
diff --git a/android/uhabits-android/src/main/res/values/constants.xml b/uhabits-android/uhabits-android/src/main/res/values/constants.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/constants.xml
rename to uhabits-android/uhabits-android/src/main/res/values/constants.xml
diff --git a/android/uhabits-android/src/main/res/values/dimens.xml b/uhabits-android/uhabits-android/src/main/res/values/dimens.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/dimens.xml
rename to uhabits-android/uhabits-android/src/main/res/values/dimens.xml
diff --git a/android/uhabits-android/src/main/res/values/fontawesome.xml b/uhabits-android/uhabits-android/src/main/res/values/fontawesome.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/fontawesome.xml
rename to uhabits-android/uhabits-android/src/main/res/values/fontawesome.xml
diff --git a/android/uhabits-android/src/main/res/values/keys.xml b/uhabits-android/uhabits-android/src/main/res/values/keys.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/keys.xml
rename to uhabits-android/uhabits-android/src/main/res/values/keys.xml
diff --git a/android/uhabits-android/src/main/res/values/material_colors.xml b/uhabits-android/uhabits-android/src/main/res/values/material_colors.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/material_colors.xml
rename to uhabits-android/uhabits-android/src/main/res/values/material_colors.xml
diff --git a/android/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/uhabits-android/src/main/res/values/strings.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/strings.xml
rename to uhabits-android/uhabits-android/src/main/res/values/strings.xml
diff --git a/android/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/uhabits-android/src/main/res/values/styles.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/styles.xml
rename to uhabits-android/uhabits-android/src/main/res/values/styles.xml
diff --git a/android/uhabits-android/src/main/res/values/styles_dialog.xml b/uhabits-android/uhabits-android/src/main/res/values/styles_dialog.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/styles_dialog.xml
rename to uhabits-android/uhabits-android/src/main/res/values/styles_dialog.xml
diff --git a/android/uhabits-android/src/main/res/values/styles_list_habits.xml b/uhabits-android/uhabits-android/src/main/res/values/styles_list_habits.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/styles_list_habits.xml
rename to uhabits-android/uhabits-android/src/main/res/values/styles_list_habits.xml
diff --git a/android/uhabits-android/src/main/res/values/styles_show_habit.xml b/uhabits-android/uhabits-android/src/main/res/values/styles_show_habit.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/values/styles_show_habit.xml
rename to uhabits-android/uhabits-android/src/main/res/values/styles_show_habit.xml
diff --git a/android/uhabits-android/src/main/res/xml/file_paths.xml b/uhabits-android/uhabits-android/src/main/res/xml/file_paths.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/xml/file_paths.xml
rename to uhabits-android/uhabits-android/src/main/res/xml/file_paths.xml
diff --git a/android/uhabits-android/src/main/res/xml/preferences.xml b/uhabits-android/uhabits-android/src/main/res/xml/preferences.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/xml/preferences.xml
rename to uhabits-android/uhabits-android/src/main/res/xml/preferences.xml
diff --git a/android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml b/uhabits-android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
rename to uhabits-android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
diff --git a/android/uhabits-android/src/main/res/xml/widget_frequency_info.xml b/uhabits-android/uhabits-android/src/main/res/xml/widget_frequency_info.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/xml/widget_frequency_info.xml
rename to uhabits-android/uhabits-android/src/main/res/xml/widget_frequency_info.xml
diff --git a/android/uhabits-android/src/main/res/xml/widget_history_info.xml b/uhabits-android/uhabits-android/src/main/res/xml/widget_history_info.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/xml/widget_history_info.xml
rename to uhabits-android/uhabits-android/src/main/res/xml/widget_history_info.xml
diff --git a/android/uhabits-android/src/main/res/xml/widget_score_info.xml b/uhabits-android/uhabits-android/src/main/res/xml/widget_score_info.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/xml/widget_score_info.xml
rename to uhabits-android/uhabits-android/src/main/res/xml/widget_score_info.xml
diff --git a/android/uhabits-android/src/main/res/xml/widget_streak_info.xml b/uhabits-android/uhabits-android/src/main/res/xml/widget_streak_info.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/xml/widget_streak_info.xml
rename to uhabits-android/uhabits-android/src/main/res/xml/widget_streak_info.xml
diff --git a/android/uhabits-android/src/main/res/xml/widget_target_info.xml b/uhabits-android/uhabits-android/src/main/res/xml/widget_target_info.xml
similarity index 100%
rename from android/uhabits-android/src/main/res/xml/widget_target_info.xml
rename to uhabits-android/uhabits-android/src/main/res/xml/widget_target_info.xml
diff --git a/android/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java b/uhabits-android/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java
similarity index 100%
rename from android/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java
rename to uhabits-android/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java
diff --git a/android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java b/uhabits-android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
similarity index 100%
rename from android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
rename to uhabits-android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
diff --git a/core/assets/main/databases/template.db b/uhabits-core-legacy/assets/main/databases/template.db
similarity index 100%
rename from core/assets/main/databases/template.db
rename to uhabits-core-legacy/assets/main/databases/template.db
diff --git a/core/assets/main/fonts/FontAwesome.ttf b/uhabits-core-legacy/assets/main/fonts/FontAwesome.ttf
similarity index 100%
rename from core/assets/main/fonts/FontAwesome.ttf
rename to uhabits-core-legacy/assets/main/fonts/FontAwesome.ttf
diff --git a/core/assets/main/fonts/NotoSans-Bold.ttf b/uhabits-core-legacy/assets/main/fonts/NotoSans-Bold.ttf
similarity index 100%
rename from core/assets/main/fonts/NotoSans-Bold.ttf
rename to uhabits-core-legacy/assets/main/fonts/NotoSans-Bold.ttf
diff --git a/core/assets/main/fonts/NotoSans-Regular.ttf b/uhabits-core-legacy/assets/main/fonts/NotoSans-Regular.ttf
similarity index 100%
rename from core/assets/main/fonts/NotoSans-Regular.ttf
rename to uhabits-core-legacy/assets/main/fonts/NotoSans-Regular.ttf
diff --git a/core/assets/main/migrations/001.sql b/uhabits-core-legacy/assets/main/migrations/001.sql
similarity index 100%
rename from core/assets/main/migrations/001.sql
rename to uhabits-core-legacy/assets/main/migrations/001.sql
diff --git a/core/assets/main/migrations/002.sql b/uhabits-core-legacy/assets/main/migrations/002.sql
similarity index 100%
rename from core/assets/main/migrations/002.sql
rename to uhabits-core-legacy/assets/main/migrations/002.sql
diff --git a/core/assets/main/migrations/003.sql b/uhabits-core-legacy/assets/main/migrations/003.sql
similarity index 100%
rename from core/assets/main/migrations/003.sql
rename to uhabits-core-legacy/assets/main/migrations/003.sql
diff --git a/core/assets/main/migrations/004.sql b/uhabits-core-legacy/assets/main/migrations/004.sql
similarity index 100%
rename from core/assets/main/migrations/004.sql
rename to uhabits-core-legacy/assets/main/migrations/004.sql
diff --git a/core/assets/main/migrations/005.sql b/uhabits-core-legacy/assets/main/migrations/005.sql
similarity index 100%
rename from core/assets/main/migrations/005.sql
rename to uhabits-core-legacy/assets/main/migrations/005.sql
diff --git a/core/assets/main/migrations/006.sql b/uhabits-core-legacy/assets/main/migrations/006.sql
similarity index 100%
rename from core/assets/main/migrations/006.sql
rename to uhabits-core-legacy/assets/main/migrations/006.sql
diff --git a/core/assets/main/migrations/007.sql b/uhabits-core-legacy/assets/main/migrations/007.sql
similarity index 100%
rename from core/assets/main/migrations/007.sql
rename to uhabits-core-legacy/assets/main/migrations/007.sql
diff --git a/core/assets/main/migrations/008.sql b/uhabits-core-legacy/assets/main/migrations/008.sql
similarity index 100%
rename from core/assets/main/migrations/008.sql
rename to uhabits-core-legacy/assets/main/migrations/008.sql
diff --git a/core/assets/main/migrations/009.sql b/uhabits-core-legacy/assets/main/migrations/009.sql
similarity index 100%
rename from core/assets/main/migrations/009.sql
rename to uhabits-core-legacy/assets/main/migrations/009.sql
diff --git a/core/assets/main/migrations/010.sql b/uhabits-core-legacy/assets/main/migrations/010.sql
similarity index 100%
rename from core/assets/main/migrations/010.sql
rename to uhabits-core-legacy/assets/main/migrations/010.sql
diff --git a/core/assets/main/migrations/011.sql b/uhabits-core-legacy/assets/main/migrations/011.sql
similarity index 100%
rename from core/assets/main/migrations/011.sql
rename to uhabits-core-legacy/assets/main/migrations/011.sql
diff --git a/core/assets/main/migrations/012.sql b/uhabits-core-legacy/assets/main/migrations/012.sql
similarity index 100%
rename from core/assets/main/migrations/012.sql
rename to uhabits-core-legacy/assets/main/migrations/012.sql
diff --git a/core/assets/main/migrations/013.sql b/uhabits-core-legacy/assets/main/migrations/013.sql
similarity index 100%
rename from core/assets/main/migrations/013.sql
rename to uhabits-core-legacy/assets/main/migrations/013.sql
diff --git a/core/assets/main/migrations/014.sql b/uhabits-core-legacy/assets/main/migrations/014.sql
similarity index 100%
rename from core/assets/main/migrations/014.sql
rename to uhabits-core-legacy/assets/main/migrations/014.sql
diff --git a/core/assets/main/migrations/015.sql b/uhabits-core-legacy/assets/main/migrations/015.sql
similarity index 100%
rename from core/assets/main/migrations/015.sql
rename to uhabits-core-legacy/assets/main/migrations/015.sql
diff --git a/core/assets/main/migrations/016.sql b/uhabits-core-legacy/assets/main/migrations/016.sql
similarity index 100%
rename from core/assets/main/migrations/016.sql
rename to uhabits-core-legacy/assets/main/migrations/016.sql
diff --git a/core/assets/main/migrations/017.sql b/uhabits-core-legacy/assets/main/migrations/017.sql
similarity index 100%
rename from core/assets/main/migrations/017.sql
rename to uhabits-core-legacy/assets/main/migrations/017.sql
diff --git a/core/assets/main/migrations/018.sql b/uhabits-core-legacy/assets/main/migrations/018.sql
similarity index 100%
rename from core/assets/main/migrations/018.sql
rename to uhabits-core-legacy/assets/main/migrations/018.sql
diff --git a/core/assets/main/migrations/019.sql b/uhabits-core-legacy/assets/main/migrations/019.sql
similarity index 100%
rename from core/assets/main/migrations/019.sql
rename to uhabits-core-legacy/assets/main/migrations/019.sql
diff --git a/core/assets/main/migrations/020.sql b/uhabits-core-legacy/assets/main/migrations/020.sql
similarity index 100%
rename from core/assets/main/migrations/020.sql
rename to uhabits-core-legacy/assets/main/migrations/020.sql
diff --git a/core/assets/main/migrations/021.sql b/uhabits-core-legacy/assets/main/migrations/021.sql
similarity index 100%
rename from core/assets/main/migrations/021.sql
rename to uhabits-core-legacy/assets/main/migrations/021.sql
diff --git a/core/assets/main/migrations/022.sql b/uhabits-core-legacy/assets/main/migrations/022.sql
similarity index 100%
rename from core/assets/main/migrations/022.sql
rename to uhabits-core-legacy/assets/main/migrations/022.sql
diff --git a/core/assets/main/migrations/023.sql b/uhabits-core-legacy/assets/main/migrations/023.sql
similarity index 100%
rename from core/assets/main/migrations/023.sql
rename to uhabits-core-legacy/assets/main/migrations/023.sql
diff --git a/core/assets/test/components/BarChart/2-series.png b/uhabits-core-legacy/assets/test/components/BarChart/2-series.png
similarity index 100%
rename from core/assets/test/components/BarChart/2-series.png
rename to uhabits-core-legacy/assets/test/components/BarChart/2-series.png
diff --git a/core/assets/test/components/BarChart/axis-monthly.png b/uhabits-core-legacy/assets/test/components/BarChart/axis-monthly.png
similarity index 100%
rename from core/assets/test/components/BarChart/axis-monthly.png
rename to uhabits-core-legacy/assets/test/components/BarChart/axis-monthly.png
diff --git a/core/assets/test/components/BarChart/axis-weekly.png b/uhabits-core-legacy/assets/test/components/BarChart/axis-weekly.png
similarity index 100%
rename from core/assets/test/components/BarChart/axis-weekly.png
rename to uhabits-core-legacy/assets/test/components/BarChart/axis-weekly.png
diff --git a/core/assets/test/components/BarChart/axis-yearly.png b/uhabits-core-legacy/assets/test/components/BarChart/axis-yearly.png
similarity index 100%
rename from core/assets/test/components/BarChart/axis-yearly.png
rename to uhabits-core-legacy/assets/test/components/BarChart/axis-yearly.png
diff --git a/core/assets/test/components/BarChart/base.png b/uhabits-core-legacy/assets/test/components/BarChart/base.png
similarity index 100%
rename from core/assets/test/components/BarChart/base.png
rename to uhabits-core-legacy/assets/test/components/BarChart/base.png
diff --git a/core/assets/test/components/CalendarChart/base.png b/uhabits-core-legacy/assets/test/components/CalendarChart/base.png
similarity index 100%
rename from core/assets/test/components/CalendarChart/base.png
rename to uhabits-core-legacy/assets/test/components/CalendarChart/base.png
diff --git a/core/assets/test/components/CalendarChart/scroll.png b/uhabits-core-legacy/assets/test/components/CalendarChart/scroll.png
similarity index 100%
rename from core/assets/test/components/CalendarChart/scroll.png
rename to uhabits-core-legacy/assets/test/components/CalendarChart/scroll.png
diff --git a/core/assets/test/components/CanvasTest.png b/uhabits-core-legacy/assets/test/components/CanvasTest.png
similarity index 100%
rename from core/assets/test/components/CanvasTest.png
rename to uhabits-core-legacy/assets/test/components/CanvasTest.png
diff --git a/core/assets/test/components/CheckmarkButton/explicit.png b/uhabits-core-legacy/assets/test/components/CheckmarkButton/explicit.png
similarity index 100%
rename from core/assets/test/components/CheckmarkButton/explicit.png
rename to uhabits-core-legacy/assets/test/components/CheckmarkButton/explicit.png
diff --git a/core/assets/test/components/CheckmarkButton/implicit.png b/uhabits-core-legacy/assets/test/components/CheckmarkButton/implicit.png
similarity index 100%
rename from core/assets/test/components/CheckmarkButton/implicit.png
rename to uhabits-core-legacy/assets/test/components/CheckmarkButton/implicit.png
diff --git a/core/assets/test/components/CheckmarkButton/unchecked.png b/uhabits-core-legacy/assets/test/components/CheckmarkButton/unchecked.png
similarity index 100%
rename from core/assets/test/components/CheckmarkButton/unchecked.png
rename to uhabits-core-legacy/assets/test/components/CheckmarkButton/unchecked.png
diff --git a/core/assets/test/components/HabitListHeader/light.png b/uhabits-core-legacy/assets/test/components/HabitListHeader/light.png
similarity index 100%
rename from core/assets/test/components/HabitListHeader/light.png
rename to uhabits-core-legacy/assets/test/components/HabitListHeader/light.png
diff --git a/core/assets/test/components/NumberButton/render_above.png b/uhabits-core-legacy/assets/test/components/NumberButton/render_above.png
similarity index 100%
rename from core/assets/test/components/NumberButton/render_above.png
rename to uhabits-core-legacy/assets/test/components/NumberButton/render_above.png
diff --git a/core/assets/test/components/NumberButton/render_below.png b/uhabits-core-legacy/assets/test/components/NumberButton/render_below.png
similarity index 100%
rename from core/assets/test/components/NumberButton/render_below.png
rename to uhabits-core-legacy/assets/test/components/NumberButton/render_below.png
diff --git a/core/assets/test/components/NumberButton/render_zero.png b/uhabits-core-legacy/assets/test/components/NumberButton/render_zero.png
similarity index 100%
rename from core/assets/test/components/NumberButton/render_zero.png
rename to uhabits-core-legacy/assets/test/components/NumberButton/render_zero.png
diff --git a/core/assets/test/components/Ring/draw1.png b/uhabits-core-legacy/assets/test/components/Ring/draw1.png
similarity index 100%
rename from core/assets/test/components/Ring/draw1.png
rename to uhabits-core-legacy/assets/test/components/Ring/draw1.png
diff --git a/core/assets/test/hello.txt b/uhabits-core-legacy/assets/test/hello.txt
similarity index 100%
rename from core/assets/test/hello.txt
rename to uhabits-core-legacy/assets/test/hello.txt
diff --git a/core/build.gradle b/uhabits-core-legacy/build.gradle
similarity index 100%
rename from core/build.gradle
rename to uhabits-core-legacy/build.gradle
diff --git a/core/gradle.properties b/uhabits-core-legacy/gradle.properties
similarity index 100%
rename from core/gradle.properties
rename to uhabits-core-legacy/gradle.properties
diff --git a/core/gradle/wrapper/gradle-wrapper.jar b/uhabits-core-legacy/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from core/gradle/wrapper/gradle-wrapper.jar
rename to uhabits-core-legacy/gradle/wrapper/gradle-wrapper.jar
diff --git a/core/gradle/wrapper/gradle-wrapper.properties b/uhabits-core-legacy/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from core/gradle/wrapper/gradle-wrapper.properties
rename to uhabits-core-legacy/gradle/wrapper/gradle-wrapper.properties
diff --git a/core/gradlew b/uhabits-core-legacy/gradlew
similarity index 100%
rename from core/gradlew
rename to uhabits-core-legacy/gradlew
diff --git a/core/gradlew.bat b/uhabits-core-legacy/gradlew.bat
similarity index 100%
rename from core/gradlew.bat
rename to uhabits-core-legacy/gradlew.bat
diff --git a/core/settings.gradle b/uhabits-core-legacy/settings.gradle
similarity index 100%
rename from core/settings.gradle
rename to uhabits-core-legacy/settings.gradle
diff --git a/core/src/main/c_interop/sqlite3.def b/uhabits-core-legacy/src/main/c_interop/sqlite3.def
similarity index 100%
rename from core/src/main/c_interop/sqlite3.def
rename to uhabits-core-legacy/src/main/c_interop/sqlite3.def
diff --git a/core/src/main/common/org/isoron/platform/concurrency/Observable.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/concurrency/Observable.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/concurrency/Observable.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/concurrency/Observable.kt
diff --git a/core/src/main/common/org/isoron/platform/gui/Canvas.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/gui/Canvas.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/gui/Canvas.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/gui/Canvas.kt
diff --git a/core/src/main/common/org/isoron/platform/gui/Colors.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/gui/Colors.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/gui/Colors.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/gui/Colors.kt
diff --git a/core/src/main/common/org/isoron/platform/gui/Component.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/gui/Component.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/gui/Component.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/gui/Component.kt
diff --git a/core/src/main/common/org/isoron/platform/gui/FontAwesome.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/gui/FontAwesome.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/gui/FontAwesome.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/gui/FontAwesome.kt
diff --git a/core/src/main/common/org/isoron/platform/gui/Image.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/gui/Image.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/gui/Image.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/gui/Image.kt
diff --git a/core/src/main/common/org/isoron/platform/io/Database.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/io/Database.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/io/Database.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/io/Database.kt
diff --git a/core/src/main/common/org/isoron/platform/io/Files.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/io/Files.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/io/Files.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/io/Files.kt
diff --git a/core/src/main/common/org/isoron/platform/io/Log.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/io/Log.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/io/Log.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/io/Log.kt
diff --git a/core/src/main/common/org/isoron/platform/io/Strings.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/io/Strings.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/io/Strings.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/io/Strings.kt
diff --git a/core/src/main/common/org/isoron/platform/time/Dates.kt b/uhabits-core-legacy/src/main/common/org/isoron/platform/time/Dates.kt
similarity index 100%
rename from core/src/main/common/org/isoron/platform/time/Dates.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/platform/time/Dates.kt
diff --git a/core/src/main/common/org/isoron/uhabits/Config.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/Config.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/Config.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/Config.kt
diff --git a/core/src/main/common/org/isoron/uhabits/backend/Backend.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/backend/Backend.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/backend/Backend.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/backend/Backend.kt
diff --git a/core/src/main/common/org/isoron/uhabits/backend/MainScreenDataSource.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/backend/MainScreenDataSource.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/backend/MainScreenDataSource.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/backend/MainScreenDataSource.kt
diff --git a/core/src/main/common/org/isoron/uhabits/components/BarChart.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/BarChart.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/components/BarChart.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/BarChart.kt
diff --git a/core/src/main/common/org/isoron/uhabits/components/CalendarChart.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/CalendarChart.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/components/CalendarChart.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/CalendarChart.kt
diff --git a/core/src/main/common/org/isoron/uhabits/components/CheckmarkButton.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/CheckmarkButton.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/components/CheckmarkButton.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/CheckmarkButton.kt
diff --git a/core/src/main/common/org/isoron/uhabits/components/HabitListHeader.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/HabitListHeader.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/components/HabitListHeader.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/HabitListHeader.kt
diff --git a/core/src/main/common/org/isoron/uhabits/components/NumberButton.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/NumberButton.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/components/NumberButton.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/NumberButton.kt
diff --git a/core/src/main/common/org/isoron/uhabits/components/Ring.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/Ring.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/components/Ring.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/Ring.kt
diff --git a/core/src/main/common/org/isoron/uhabits/components/Themes.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/Themes.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/components/Themes.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/components/Themes.kt
diff --git a/core/src/main/common/org/isoron/uhabits/i18n/LocaleHelper.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/i18n/LocaleHelper.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/i18n/LocaleHelper.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/i18n/LocaleHelper.kt
diff --git a/core/src/main/common/org/isoron/uhabits/i18n/Strings.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/i18n/Strings.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/i18n/Strings.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/i18n/Strings.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/Checkmark.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Checkmark.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/Checkmark.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Checkmark.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/CheckmarkList.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/CheckmarkList.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/CheckmarkList.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/CheckmarkList.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/CheckmarkRepository.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/CheckmarkRepository.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/CheckmarkRepository.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/CheckmarkRepository.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/Frequency.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Frequency.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/Frequency.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Frequency.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/Habit.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Habit.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/Habit.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Habit.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/HabitRepository.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/HabitRepository.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/HabitRepository.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/HabitRepository.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/HabitType.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/HabitType.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/HabitType.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/HabitType.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/Preferences.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Preferences.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/Preferences.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Preferences.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/PreferencesRepository.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/PreferencesRepository.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/PreferencesRepository.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/PreferencesRepository.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/Score.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Score.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/Score.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Score.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/ScoreList.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/ScoreList.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/ScoreList.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/ScoreList.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/Streak.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Streak.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/Streak.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/Streak.kt
diff --git a/core/src/main/common/org/isoron/uhabits/models/StreakList.kt b/uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/StreakList.kt
similarity index 100%
rename from core/src/main/common/org/isoron/uhabits/models/StreakList.kt
rename to uhabits-core-legacy/src/main/common/org/isoron/uhabits/models/StreakList.kt
diff --git a/core/src/main/ios/org/isoron/platform/concurrency/UIDispatcher.kt b/uhabits-core-legacy/src/main/ios/org/isoron/platform/concurrency/UIDispatcher.kt
similarity index 100%
rename from core/src/main/ios/org/isoron/platform/concurrency/UIDispatcher.kt
rename to uhabits-core-legacy/src/main/ios/org/isoron/platform/concurrency/UIDispatcher.kt
diff --git a/core/src/main/ios/org/isoron/platform/gui/IosCanvas.kt b/uhabits-core-legacy/src/main/ios/org/isoron/platform/gui/IosCanvas.kt
similarity index 100%
rename from core/src/main/ios/org/isoron/platform/gui/IosCanvas.kt
rename to uhabits-core-legacy/src/main/ios/org/isoron/platform/gui/IosCanvas.kt
diff --git a/core/src/main/ios/org/isoron/platform/gui/IosImage.kt b/uhabits-core-legacy/src/main/ios/org/isoron/platform/gui/IosImage.kt
similarity index 100%
rename from core/src/main/ios/org/isoron/platform/gui/IosImage.kt
rename to uhabits-core-legacy/src/main/ios/org/isoron/platform/gui/IosImage.kt
diff --git a/core/src/main/ios/org/isoron/platform/io/IosDatabase.kt b/uhabits-core-legacy/src/main/ios/org/isoron/platform/io/IosDatabase.kt
similarity index 100%
rename from core/src/main/ios/org/isoron/platform/io/IosDatabase.kt
rename to uhabits-core-legacy/src/main/ios/org/isoron/platform/io/IosDatabase.kt
diff --git a/core/src/main/ios/org/isoron/platform/io/IosFiles.kt b/uhabits-core-legacy/src/main/ios/org/isoron/platform/io/IosFiles.kt
similarity index 100%
rename from core/src/main/ios/org/isoron/platform/io/IosFiles.kt
rename to uhabits-core-legacy/src/main/ios/org/isoron/platform/io/IosFiles.kt
diff --git a/core/src/main/ios/org/isoron/platform/io/Strings.kt b/uhabits-core-legacy/src/main/ios/org/isoron/platform/io/Strings.kt
similarity index 100%
rename from core/src/main/ios/org/isoron/platform/io/Strings.kt
rename to uhabits-core-legacy/src/main/ios/org/isoron/platform/io/Strings.kt
diff --git a/core/src/main/ios/org/isoron/platform/time/IosDates.kt b/uhabits-core-legacy/src/main/ios/org/isoron/platform/time/IosDates.kt
similarity index 100%
rename from core/src/main/ios/org/isoron/platform/time/IosDates.kt
rename to uhabits-core-legacy/src/main/ios/org/isoron/platform/time/IosDates.kt
diff --git a/core/src/main/ios/org/isoron/uhabits/IosLocaleHelper.kt b/uhabits-core-legacy/src/main/ios/org/isoron/uhabits/IosLocaleHelper.kt
similarity index 100%
rename from core/src/main/ios/org/isoron/uhabits/IosLocaleHelper.kt
rename to uhabits-core-legacy/src/main/ios/org/isoron/uhabits/IosLocaleHelper.kt
diff --git a/core/src/main/js/org/isoron/platform/gui/JsCanvas.kt b/uhabits-core-legacy/src/main/js/org/isoron/platform/gui/JsCanvas.kt
similarity index 100%
rename from core/src/main/js/org/isoron/platform/gui/JsCanvas.kt
rename to uhabits-core-legacy/src/main/js/org/isoron/platform/gui/JsCanvas.kt
diff --git a/core/src/main/js/org/isoron/platform/gui/JsImage.kt b/uhabits-core-legacy/src/main/js/org/isoron/platform/gui/JsImage.kt
similarity index 100%
rename from core/src/main/js/org/isoron/platform/gui/JsImage.kt
rename to uhabits-core-legacy/src/main/js/org/isoron/platform/gui/JsImage.kt
diff --git a/core/src/main/js/org/isoron/platform/io/JsDatabase.kt b/uhabits-core-legacy/src/main/js/org/isoron/platform/io/JsDatabase.kt
similarity index 100%
rename from core/src/main/js/org/isoron/platform/io/JsDatabase.kt
rename to uhabits-core-legacy/src/main/js/org/isoron/platform/io/JsDatabase.kt
diff --git a/core/src/main/js/org/isoron/platform/io/JsFiles.kt b/uhabits-core-legacy/src/main/js/org/isoron/platform/io/JsFiles.kt
similarity index 100%
rename from core/src/main/js/org/isoron/platform/io/JsFiles.kt
rename to uhabits-core-legacy/src/main/js/org/isoron/platform/io/JsFiles.kt
diff --git a/core/src/main/js/org/isoron/platform/io/JsStrings.kt b/uhabits-core-legacy/src/main/js/org/isoron/platform/io/JsStrings.kt
similarity index 100%
rename from core/src/main/js/org/isoron/platform/io/JsStrings.kt
rename to uhabits-core-legacy/src/main/js/org/isoron/platform/io/JsStrings.kt
diff --git a/core/src/main/js/org/isoron/platform/time/JsDates.kt b/uhabits-core-legacy/src/main/js/org/isoron/platform/time/JsDates.kt
similarity index 100%
rename from core/src/main/js/org/isoron/platform/time/JsDates.kt
rename to uhabits-core-legacy/src/main/js/org/isoron/platform/time/JsDates.kt
diff --git a/core/src/main/jvm/org/isoron/platform/gui/JavaCanvas.kt b/uhabits-core-legacy/src/main/jvm/org/isoron/platform/gui/JavaCanvas.kt
similarity index 100%
rename from core/src/main/jvm/org/isoron/platform/gui/JavaCanvas.kt
rename to uhabits-core-legacy/src/main/jvm/org/isoron/platform/gui/JavaCanvas.kt
diff --git a/core/src/main/jvm/org/isoron/platform/gui/JavaImage.kt b/uhabits-core-legacy/src/main/jvm/org/isoron/platform/gui/JavaImage.kt
similarity index 100%
rename from core/src/main/jvm/org/isoron/platform/gui/JavaImage.kt
rename to uhabits-core-legacy/src/main/jvm/org/isoron/platform/gui/JavaImage.kt
diff --git a/core/src/main/jvm/org/isoron/platform/io/JavaDatabase.kt b/uhabits-core-legacy/src/main/jvm/org/isoron/platform/io/JavaDatabase.kt
similarity index 100%
rename from core/src/main/jvm/org/isoron/platform/io/JavaDatabase.kt
rename to uhabits-core-legacy/src/main/jvm/org/isoron/platform/io/JavaDatabase.kt
diff --git a/core/src/main/jvm/org/isoron/platform/io/JavaFiles.kt b/uhabits-core-legacy/src/main/jvm/org/isoron/platform/io/JavaFiles.kt
similarity index 100%
rename from core/src/main/jvm/org/isoron/platform/io/JavaFiles.kt
rename to uhabits-core-legacy/src/main/jvm/org/isoron/platform/io/JavaFiles.kt
diff --git a/core/src/main/jvm/org/isoron/platform/io/Strings.kt b/uhabits-core-legacy/src/main/jvm/org/isoron/platform/io/Strings.kt
similarity index 100%
rename from core/src/main/jvm/org/isoron/platform/io/Strings.kt
rename to uhabits-core-legacy/src/main/jvm/org/isoron/platform/io/Strings.kt
diff --git a/core/src/main/jvm/org/isoron/platform/time/JavaDates.kt b/uhabits-core-legacy/src/main/jvm/org/isoron/platform/time/JavaDates.kt
similarity index 100%
rename from core/src/main/jvm/org/isoron/platform/time/JavaDates.kt
rename to uhabits-core-legacy/src/main/jvm/org/isoron/platform/time/JavaDates.kt
diff --git a/core/src/test/common/org/isoron/AsyncTests.kt b/uhabits-core-legacy/src/test/common/org/isoron/AsyncTests.kt
similarity index 100%
rename from core/src/test/common/org/isoron/AsyncTests.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/AsyncTests.kt
diff --git a/core/src/test/common/org/isoron/DependencyResolver.kt b/uhabits-core-legacy/src/test/common/org/isoron/DependencyResolver.kt
similarity index 100%
rename from core/src/test/common/org/isoron/DependencyResolver.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/DependencyResolver.kt
diff --git a/core/src/test/common/org/isoron/platform/concurrency/ObservableTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/platform/concurrency/ObservableTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/platform/concurrency/ObservableTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/platform/concurrency/ObservableTest.kt
diff --git a/core/src/test/common/org/isoron/platform/gui/CanvasTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/platform/gui/CanvasTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/platform/gui/CanvasTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/platform/gui/CanvasTest.kt
diff --git a/core/src/test/common/org/isoron/platform/io/DatabaseTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/platform/io/DatabaseTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/platform/io/DatabaseTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/platform/io/DatabaseTest.kt
diff --git a/core/src/test/common/org/isoron/platform/io/FilesTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/platform/io/FilesTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/platform/io/FilesTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/platform/io/FilesTest.kt
diff --git a/core/src/test/common/org/isoron/platform/io/StringsTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/platform/io/StringsTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/platform/io/StringsTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/platform/io/StringsTest.kt
diff --git a/core/src/test/common/org/isoron/platform/time/DatesTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/platform/time/DatesTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/platform/time/DatesTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/platform/time/DatesTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/BaseViewTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/BaseViewTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/BaseViewTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/BaseViewTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/components/BarChartTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/BarChartTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/components/BarChartTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/BarChartTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/components/CalendarChartTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/CalendarChartTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/components/CalendarChartTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/CalendarChartTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/components/CheckmarkButtonTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/CheckmarkButtonTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/components/CheckmarkButtonTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/CheckmarkButtonTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/components/HabitListHeaderTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/HabitListHeaderTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/components/HabitListHeaderTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/HabitListHeaderTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/components/NumberButtonTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/NumberButtonTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/components/NumberButtonTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/NumberButtonTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/components/RingTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/RingTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/components/RingTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/components/RingTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/models/CheckmarkListTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/CheckmarkListTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/models/CheckmarkListTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/CheckmarkListTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/models/CheckmarkRepositoryTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/CheckmarkRepositoryTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/models/CheckmarkRepositoryTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/CheckmarkRepositoryTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/models/HabitRepositoryTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/HabitRepositoryTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/models/HabitRepositoryTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/HabitRepositoryTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/models/PreferencesRepositoryTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/PreferencesRepositoryTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/models/PreferencesRepositoryTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/PreferencesRepositoryTest.kt
diff --git a/core/src/test/common/org/isoron/uhabits/models/ScoreListTest.kt b/uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/ScoreListTest.kt
similarity index 100%
rename from core/src/test/common/org/isoron/uhabits/models/ScoreListTest.kt
rename to uhabits-core-legacy/src/test/common/org/isoron/uhabits/models/ScoreListTest.kt
diff --git a/core/src/test/ios/org/isoron/DependencyResolver.kt b/uhabits-core-legacy/src/test/ios/org/isoron/DependencyResolver.kt
similarity index 100%
rename from core/src/test/ios/org/isoron/DependencyResolver.kt
rename to uhabits-core-legacy/src/test/ios/org/isoron/DependencyResolver.kt
diff --git a/core/src/test/ios/org/isoron/IosAsyncTests.kt b/uhabits-core-legacy/src/test/ios/org/isoron/IosAsyncTests.kt
similarity index 100%
rename from core/src/test/ios/org/isoron/IosAsyncTests.kt
rename to uhabits-core-legacy/src/test/ios/org/isoron/IosAsyncTests.kt
diff --git a/core/src/test/js/org/isoron/DependencyResolver.kt b/uhabits-core-legacy/src/test/js/org/isoron/DependencyResolver.kt
similarity index 100%
rename from core/src/test/js/org/isoron/DependencyResolver.kt
rename to uhabits-core-legacy/src/test/js/org/isoron/DependencyResolver.kt
diff --git a/core/src/test/js/org/isoron/JsAsyncTests.kt b/uhabits-core-legacy/src/test/js/org/isoron/JsAsyncTests.kt
similarity index 100%
rename from core/src/test/js/org/isoron/JsAsyncTests.kt
rename to uhabits-core-legacy/src/test/js/org/isoron/JsAsyncTests.kt
diff --git a/core/src/test/jvm/org/isoron/DependencyResolver.kt b/uhabits-core-legacy/src/test/jvm/org/isoron/DependencyResolver.kt
similarity index 100%
rename from core/src/test/jvm/org/isoron/DependencyResolver.kt
rename to uhabits-core-legacy/src/test/jvm/org/isoron/DependencyResolver.kt
diff --git a/core/src/test/jvm/org/isoron/JavaAsyncTests.kt b/uhabits-core-legacy/src/test/jvm/org/isoron/JavaAsyncTests.kt
similarity index 100%
rename from core/src/test/jvm/org/isoron/JavaAsyncTests.kt
rename to uhabits-core-legacy/src/test/jvm/org/isoron/JavaAsyncTests.kt
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/time/JavaDates.kt b/uhabits-core/src/jvmMain/java/org/isoron/platform/time/JavaDates.kt
similarity index 100%
rename from uhabits-core/src/jvmMain/java/org/isoron/time/JavaDates.kt
rename to uhabits-core/src/jvmMain/java/org/isoron/platform/time/JavaDates.kt
diff --git a/ios/Application/AppDelegate.swift b/uhabits-ios/Application/AppDelegate.swift
similarity index 100%
rename from ios/Application/AppDelegate.swift
rename to uhabits-ios/Application/AppDelegate.swift
diff --git a/ios/Application/Assets.xcassets/AppIcon.appiconset/Contents.json b/uhabits-ios/Application/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from ios/Application/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to uhabits-ios/Application/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/ios/Application/Assets.xcassets/AppIcon.appiconset/loop-120.png b/uhabits-ios/Application/Assets.xcassets/AppIcon.appiconset/loop-120.png
similarity index 100%
rename from ios/Application/Assets.xcassets/AppIcon.appiconset/loop-120.png
rename to uhabits-ios/Application/Assets.xcassets/AppIcon.appiconset/loop-120.png
diff --git a/ios/Application/Assets.xcassets/AppIcon.appiconset/loop-180.png b/uhabits-ios/Application/Assets.xcassets/AppIcon.appiconset/loop-180.png
similarity index 100%
rename from ios/Application/Assets.xcassets/AppIcon.appiconset/loop-180.png
rename to uhabits-ios/Application/Assets.xcassets/AppIcon.appiconset/loop-180.png
diff --git a/ios/Application/Assets.xcassets/Contents.json b/uhabits-ios/Application/Assets.xcassets/Contents.json
similarity index 100%
rename from ios/Application/Assets.xcassets/Contents.json
rename to uhabits-ios/Application/Assets.xcassets/Contents.json
diff --git a/ios/Application/Assets.xcassets/ic_more.imageset/Contents.json b/uhabits-ios/Application/Assets.xcassets/ic_more.imageset/Contents.json
similarity index 100%
rename from ios/Application/Assets.xcassets/ic_more.imageset/Contents.json
rename to uhabits-ios/Application/Assets.xcassets/ic_more.imageset/Contents.json
diff --git a/ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_1x.png b/uhabits-ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_1x.png
similarity index 100%
rename from ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_1x.png
rename to uhabits-ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_1x.png
diff --git a/ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_2x.png b/uhabits-ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_2x.png
similarity index 100%
rename from ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_2x.png
rename to uhabits-ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_2x.png
diff --git a/ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_3x.png b/uhabits-ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_3x.png
similarity index 100%
rename from ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_3x.png
rename to uhabits-ios/Application/Assets.xcassets/ic_more.imageset/baseline_more_horiz_black_24pt_3x.png
diff --git a/ios/Application/BridgingHeader.h b/uhabits-ios/Application/BridgingHeader.h
similarity index 100%
rename from ios/Application/BridgingHeader.h
rename to uhabits-ios/Application/BridgingHeader.h
diff --git a/ios/Application/Frontend/AboutScreenController.swift b/uhabits-ios/Application/Frontend/AboutScreenController.swift
similarity index 100%
rename from ios/Application/Frontend/AboutScreenController.swift
rename to uhabits-ios/Application/Frontend/AboutScreenController.swift
diff --git a/ios/Application/Frontend/DetailScreenController.swift b/uhabits-ios/Application/Frontend/DetailScreenController.swift
similarity index 100%
rename from ios/Application/Frontend/DetailScreenController.swift
rename to uhabits-ios/Application/Frontend/DetailScreenController.swift
diff --git a/ios/Application/Frontend/EditHabitController.swift b/uhabits-ios/Application/Frontend/EditHabitController.swift
similarity index 100%
rename from ios/Application/Frontend/EditHabitController.swift
rename to uhabits-ios/Application/Frontend/EditHabitController.swift
diff --git a/ios/Application/Frontend/MainScreenController.swift b/uhabits-ios/Application/Frontend/MainScreenController.swift
similarity index 100%
rename from ios/Application/Frontend/MainScreenController.swift
rename to uhabits-ios/Application/Frontend/MainScreenController.swift
diff --git a/ios/Application/Info.plist b/uhabits-ios/Application/Info.plist
similarity index 100%
rename from ios/Application/Info.plist
rename to uhabits-ios/Application/Info.plist
diff --git a/ios/Application/Launch.storyboard b/uhabits-ios/Application/Launch.storyboard
similarity index 100%
rename from ios/Application/Launch.storyboard
rename to uhabits-ios/Application/Launch.storyboard
diff --git a/ios/Application/Platform/ComponentView.swift b/uhabits-ios/Application/Platform/ComponentView.swift
similarity index 100%
rename from ios/Application/Platform/ComponentView.swift
rename to uhabits-ios/Application/Platform/ComponentView.swift
diff --git a/ios/Tests/Info.plist b/uhabits-ios/Tests/Info.plist
similarity index 100%
rename from ios/Tests/Info.plist
rename to uhabits-ios/Tests/Info.plist
diff --git a/ios/uhabits.xcodeproj/project.pbxproj b/uhabits-ios/uhabits.xcodeproj/project.pbxproj
similarity index 100%
rename from ios/uhabits.xcodeproj/project.pbxproj
rename to uhabits-ios/uhabits.xcodeproj/project.pbxproj
diff --git a/ios/uhabits.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/uhabits-ios/uhabits.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from ios/uhabits.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to uhabits-ios/uhabits.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ios/uhabits.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/uhabits-ios/uhabits.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from ios/uhabits.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to uhabits-ios/uhabits.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/ios/uhabits.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/uhabits-ios/uhabits.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 100%
rename from ios/uhabits.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
rename to uhabits-ios/uhabits.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/server/.gitignore b/uhabits-server/.gitignore
similarity index 100%
rename from server/.gitignore
rename to uhabits-server/.gitignore
diff --git a/server/Dockerfile b/uhabits-server/Dockerfile
similarity index 100%
rename from server/Dockerfile
rename to uhabits-server/Dockerfile
diff --git a/server/build.gradle b/uhabits-server/build.gradle
similarity index 100%
rename from server/build.gradle
rename to uhabits-server/build.gradle
diff --git a/server/gradle.properties b/uhabits-server/gradle.properties
similarity index 100%
rename from server/gradle.properties
rename to uhabits-server/gradle.properties
diff --git a/server/gradle/wrapper/gradle-wrapper.jar b/uhabits-server/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from server/gradle/wrapper/gradle-wrapper.jar
rename to uhabits-server/gradle/wrapper/gradle-wrapper.jar
diff --git a/server/gradle/wrapper/gradle-wrapper.properties b/uhabits-server/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from server/gradle/wrapper/gradle-wrapper.properties
rename to uhabits-server/gradle/wrapper/gradle-wrapper.properties
diff --git a/server/gradlew b/uhabits-server/gradlew
similarity index 100%
rename from server/gradlew
rename to uhabits-server/gradlew
diff --git a/server/gradlew.bat b/uhabits-server/gradlew.bat
similarity index 100%
rename from server/gradlew.bat
rename to uhabits-server/gradlew.bat
diff --git a/server/resources/application.conf b/uhabits-server/resources/application.conf
similarity index 100%
rename from server/resources/application.conf
rename to uhabits-server/resources/application.conf
diff --git a/server/resources/logback.xml b/uhabits-server/resources/logback.xml
similarity index 100%
rename from server/resources/logback.xml
rename to uhabits-server/resources/logback.xml
diff --git a/server/settings.gradle b/uhabits-server/settings.gradle
similarity index 100%
rename from server/settings.gradle
rename to uhabits-server/settings.gradle
diff --git a/server/src/org/isoron/uhabits/sync/SyncData.kt b/uhabits-server/src/org/isoron/uhabits/sync/SyncData.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/SyncData.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/SyncData.kt
diff --git a/server/src/org/isoron/uhabits/sync/SyncException.kt b/uhabits-server/src/org/isoron/uhabits/sync/SyncException.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/SyncException.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/SyncException.kt
diff --git a/server/src/org/isoron/uhabits/sync/app/LinkModule.kt b/uhabits-server/src/org/isoron/uhabits/sync/app/LinkModule.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/app/LinkModule.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/app/LinkModule.kt
diff --git a/server/src/org/isoron/uhabits/sync/app/MetricsModule.kt b/uhabits-server/src/org/isoron/uhabits/sync/app/MetricsModule.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/app/MetricsModule.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/app/MetricsModule.kt
diff --git a/server/src/org/isoron/uhabits/sync/app/RegistrationModule.kt b/uhabits-server/src/org/isoron/uhabits/sync/app/RegistrationModule.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/app/RegistrationModule.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/app/RegistrationModule.kt
diff --git a/server/src/org/isoron/uhabits/sync/app/StorageModule.kt b/uhabits-server/src/org/isoron/uhabits/sync/app/StorageModule.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/app/StorageModule.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/app/StorageModule.kt
diff --git a/server/src/org/isoron/uhabits/sync/app/SyncApplication.kt b/uhabits-server/src/org/isoron/uhabits/sync/app/SyncApplication.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/app/SyncApplication.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/app/SyncApplication.kt
diff --git a/server/src/org/isoron/uhabits/sync/links/Link.kt b/uhabits-server/src/org/isoron/uhabits/sync/links/Link.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/links/Link.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/links/Link.kt
diff --git a/server/src/org/isoron/uhabits/sync/links/LinkManager.kt b/uhabits-server/src/org/isoron/uhabits/sync/links/LinkManager.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/links/LinkManager.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/links/LinkManager.kt
diff --git a/server/src/org/isoron/uhabits/sync/repository/FileRepository.kt b/uhabits-server/src/org/isoron/uhabits/sync/repository/FileRepository.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/repository/FileRepository.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/repository/FileRepository.kt
diff --git a/server/src/org/isoron/uhabits/sync/repository/Repository.kt b/uhabits-server/src/org/isoron/uhabits/sync/repository/Repository.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/repository/Repository.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/repository/Repository.kt
diff --git a/server/src/org/isoron/uhabits/sync/server/AbstractSyncServer.kt b/uhabits-server/src/org/isoron/uhabits/sync/server/AbstractSyncServer.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/server/AbstractSyncServer.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/server/AbstractSyncServer.kt
diff --git a/server/src/org/isoron/uhabits/sync/server/RepositorySyncServer.kt b/uhabits-server/src/org/isoron/uhabits/sync/server/RepositorySyncServer.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/server/RepositorySyncServer.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/server/RepositorySyncServer.kt
diff --git a/server/src/org/isoron/uhabits/sync/utils/String.kt b/uhabits-server/src/org/isoron/uhabits/sync/utils/String.kt
similarity index 100%
rename from server/src/org/isoron/uhabits/sync/utils/String.kt
rename to uhabits-server/src/org/isoron/uhabits/sync/utils/String.kt
diff --git a/server/test/org/isoron/uhabits/sync/app/BaseApplicationTest.kt b/uhabits-server/test/org/isoron/uhabits/sync/app/BaseApplicationTest.kt
similarity index 100%
rename from server/test/org/isoron/uhabits/sync/app/BaseApplicationTest.kt
rename to uhabits-server/test/org/isoron/uhabits/sync/app/BaseApplicationTest.kt
diff --git a/server/test/org/isoron/uhabits/sync/app/LinksModuleTest.kt b/uhabits-server/test/org/isoron/uhabits/sync/app/LinksModuleTest.kt
similarity index 100%
rename from server/test/org/isoron/uhabits/sync/app/LinksModuleTest.kt
rename to uhabits-server/test/org/isoron/uhabits/sync/app/LinksModuleTest.kt
diff --git a/server/test/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt b/uhabits-server/test/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt
similarity index 100%
rename from server/test/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt
rename to uhabits-server/test/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt
diff --git a/server/test/org/isoron/uhabits/sync/app/StorageModuleTest.kt b/uhabits-server/test/org/isoron/uhabits/sync/app/StorageModuleTest.kt
similarity index 100%
rename from server/test/org/isoron/uhabits/sync/app/StorageModuleTest.kt
rename to uhabits-server/test/org/isoron/uhabits/sync/app/StorageModuleTest.kt
diff --git a/server/test/org/isoron/uhabits/sync/links/LinkManagerTest.kt b/uhabits-server/test/org/isoron/uhabits/sync/links/LinkManagerTest.kt
similarity index 100%
rename from server/test/org/isoron/uhabits/sync/links/LinkManagerTest.kt
rename to uhabits-server/test/org/isoron/uhabits/sync/links/LinkManagerTest.kt
diff --git a/server/test/org/isoron/uhabits/sync/repository/FileRepositoryTest.kt b/uhabits-server/test/org/isoron/uhabits/sync/repository/FileRepositoryTest.kt
similarity index 100%
rename from server/test/org/isoron/uhabits/sync/repository/FileRepositoryTest.kt
rename to uhabits-server/test/org/isoron/uhabits/sync/repository/FileRepositoryTest.kt
diff --git a/server/test/org/isoron/uhabits/sync/server/RepositorySyncServerTest.kt b/uhabits-server/test/org/isoron/uhabits/sync/server/RepositorySyncServerTest.kt
similarity index 100%
rename from server/test/org/isoron/uhabits/sync/server/RepositorySyncServerTest.kt
rename to uhabits-server/test/org/isoron/uhabits/sync/server/RepositorySyncServerTest.kt
diff --git a/web/.babelrc b/uhabits-web/.babelrc
similarity index 100%
rename from web/.babelrc
rename to uhabits-web/.babelrc
diff --git a/web/Makefile b/uhabits-web/Makefile
similarity index 100%
rename from web/Makefile
rename to uhabits-web/Makefile
diff --git a/web/package-lock.json b/uhabits-web/package-lock.json
similarity index 100%
rename from web/package-lock.json
rename to uhabits-web/package-lock.json
diff --git a/web/package.json b/uhabits-web/package.json
similarity index 100%
rename from web/package.json
rename to uhabits-web/package.json
diff --git a/web/src/main/index.js b/uhabits-web/src/main/index.js
similarity index 100%
rename from web/src/main/index.js
rename to uhabits-web/src/main/index.js
diff --git a/web/src/test/index.html b/uhabits-web/src/test/index.html
similarity index 100%
rename from web/src/test/index.html
rename to uhabits-web/src/test/index.html
diff --git a/web/src/test/index.js b/uhabits-web/src/test/index.js
similarity index 100%
rename from web/src/test/index.js
rename to uhabits-web/src/test/index.js