diff --git a/legacy/.gitignore b/android/.gitignore
similarity index 100%
rename from legacy/.gitignore
rename to android/.gitignore
diff --git a/legacy/CHANGELOG.md b/android/CHANGELOG.md
similarity index 100%
rename from legacy/CHANGELOG.md
rename to android/CHANGELOG.md
diff --git a/legacy/LICENSE.txt b/android/LICENSE.txt
similarity index 100%
rename from legacy/LICENSE.txt
rename to android/LICENSE.txt
diff --git a/legacy/NOTICE.md b/android/NOTICE.md
similarity index 100%
rename from legacy/NOTICE.md
rename to android/NOTICE.md
diff --git a/legacy/README.md b/android/README.md
similarity index 100%
rename from legacy/README.md
rename to android/README.md
diff --git a/legacy/android-base/.gitignore b/android/android-base/.gitignore
similarity index 100%
rename from legacy/android-base/.gitignore
rename to android/android-base/.gitignore
diff --git a/legacy/android-base/build.gradle b/android/android-base/build.gradle
similarity index 100%
rename from legacy/android-base/build.gradle
rename to android/android-base/build.gradle
diff --git a/legacy/android-base/proguard-rules.pro b/android/android-base/proguard-rules.pro
similarity index 100%
rename from legacy/android-base/proguard-rules.pro
rename to android/android-base/proguard-rules.pro
diff --git a/legacy/android-base/src/main/AndroidManifest.xml b/android/android-base/src/main/AndroidManifest.xml
similarity index 100%
rename from legacy/android-base/src/main/AndroidManifest.xml
rename to android/android-base/src/main/AndroidManifest.xml
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java b/android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java
rename to android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java b/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java
rename to android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/AppContext.java b/android/android-base/src/main/java/org/isoron/androidbase/AppContext.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/AppContext.java
rename to android/android-base/src/main/java/org/isoron/androidbase/AppContext.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/AppContextModule.java b/android/android-base/src/main/java/org/isoron/androidbase/AppContextModule.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/AppContextModule.java
rename to android/android-base/src/main/java/org/isoron/androidbase/AppContextModule.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java b/android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java
rename to android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java b/android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java
rename to android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/ActivityContext.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/ActivityContext.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/ActivityContext.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/ActivityContext.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/ActivityContextModule.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/ActivityContextModule.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/ActivityContextModule.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/ActivityContextModule.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/ActivityScope.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/ActivityScope.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/ActivityScope.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/ActivityScope.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivityModule.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivityModule.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivityModule.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivityModule.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java b/android/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java
rename to android/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/utils/ColorUtils.java b/android/android-base/src/main/java/org/isoron/androidbase/utils/ColorUtils.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/utils/ColorUtils.java
rename to android/android-base/src/main/java/org/isoron/androidbase/utils/ColorUtils.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java b/android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java
rename to android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java b/android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java
rename to android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java
diff --git a/legacy/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java b/android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java
similarity index 100%
rename from legacy/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java
rename to android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java
diff --git a/legacy/android-base/src/main/res/values/base.xml b/android/android-base/src/main/res/values/base.xml
similarity index 100%
rename from legacy/android-base/src/main/res/values/base.xml
rename to android/android-base/src/main/res/values/base.xml
diff --git a/legacy/android-base/src/main/res/values/material_colors.xml b/android/android-base/src/main/res/values/material_colors.xml
similarity index 100%
rename from legacy/android-base/src/main/res/values/material_colors.xml
rename to android/android-base/src/main/res/values/material_colors.xml
diff --git a/legacy/android-pickers/.gitignore b/android/android-pickers/.gitignore
similarity index 100%
rename from legacy/android-pickers/.gitignore
rename to android/android-pickers/.gitignore
diff --git a/legacy/android-pickers/build.gradle b/android/android-pickers/build.gradle
similarity index 100%
rename from legacy/android-pickers/build.gradle
rename to android/android-pickers/build.gradle
diff --git a/legacy/android-pickers/proguard-rules.pro b/android/android-pickers/proguard-rules.pro
similarity index 100%
rename from legacy/android-pickers/proguard-rules.pro
rename to android/android-pickers/proguard-rules.pro
diff --git a/legacy/android-pickers/src/main/AndroidManifest.xml b/android/android-pickers/src/main/AndroidManifest.xml
similarity index 100%
rename from legacy/android-pickers/src/main/AndroidManifest.xml
rename to android/android-pickers/src/main/AndroidManifest.xml
diff --git a/legacy/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java b/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
rename to android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
diff --git a/legacy/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java b/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
rename to android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
diff --git a/legacy/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java b/android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
rename to android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
diff --git a/legacy/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java b/android/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java
rename to android/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java
diff --git a/legacy/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java b/android/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java
rename to android/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java b/android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java b/android/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/Utils.java b/android/android-pickers/src/main/java/com/android/datetimepicker/Utils.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/Utils.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/Utils.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java b/android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java b/android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
diff --git a/legacy/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
similarity index 100%
rename from legacy/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
rename to android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
diff --git a/legacy/android-pickers/src/main/res/color/date_picker_selector.xml b/android/android-pickers/src/main/res/color/date_picker_selector.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/color/date_picker_selector.xml
rename to android/android-pickers/src/main/res/color/date_picker_selector.xml
diff --git a/legacy/android-pickers/src/main/res/color/date_picker_year_selector.xml b/android/android-pickers/src/main/res/color/date_picker_year_selector.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/color/date_picker_year_selector.xml
rename to android/android-pickers/src/main/res/color/date_picker_year_selector.xml
diff --git a/legacy/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/android/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from legacy/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
rename to android/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
diff --git a/legacy/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/android/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from legacy/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
rename to android/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
diff --git a/legacy/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/android/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from legacy/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
rename to android/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
diff --git a/legacy/android-pickers/src/main/res/drawable/color_picker_swatch.xml b/android/android-pickers/src/main/res/drawable/color_picker_swatch.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/drawable/color_picker_swatch.xml
rename to android/android-pickers/src/main/res/drawable/color_picker_swatch.xml
diff --git a/legacy/android-pickers/src/main/res/drawable/done_background_color.xml b/android/android-pickers/src/main/res/drawable/done_background_color.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/drawable/done_background_color.xml
rename to android/android-pickers/src/main/res/drawable/done_background_color.xml
diff --git a/legacy/android-pickers/src/main/res/drawable/done_background_color_dark.xml b/android/android-pickers/src/main/res/drawable/done_background_color_dark.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/drawable/done_background_color_dark.xml
rename to android/android-pickers/src/main/res/drawable/done_background_color_dark.xml
diff --git a/legacy/android-pickers/src/main/res/layout/color_picker_dialog.xml b/android/android-pickers/src/main/res/layout/color_picker_dialog.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/color_picker_dialog.xml
rename to android/android-pickers/src/main/res/layout/color_picker_dialog.xml
diff --git a/legacy/android-pickers/src/main/res/layout/color_picker_swatch.xml b/android/android-pickers/src/main/res/layout/color_picker_swatch.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/color_picker_swatch.xml
rename to android/android-pickers/src/main/res/layout/color_picker_swatch.xml
diff --git a/legacy/android-pickers/src/main/res/layout/date_picker_dialog.xml b/android/android-pickers/src/main/res/layout/date_picker_dialog.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/date_picker_dialog.xml
rename to android/android-pickers/src/main/res/layout/date_picker_dialog.xml
diff --git a/legacy/android-pickers/src/main/res/layout/date_picker_done_button.xml b/android/android-pickers/src/main/res/layout/date_picker_done_button.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/date_picker_done_button.xml
rename to android/android-pickers/src/main/res/layout/date_picker_done_button.xml
diff --git a/legacy/android-pickers/src/main/res/layout/date_picker_header_view.xml b/android/android-pickers/src/main/res/layout/date_picker_header_view.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/date_picker_header_view.xml
rename to android/android-pickers/src/main/res/layout/date_picker_header_view.xml
diff --git a/legacy/android-pickers/src/main/res/layout/date_picker_selected_date.xml b/android/android-pickers/src/main/res/layout/date_picker_selected_date.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/date_picker_selected_date.xml
rename to android/android-pickers/src/main/res/layout/date_picker_selected_date.xml
diff --git a/legacy/android-pickers/src/main/res/layout/date_picker_view_animator.xml b/android/android-pickers/src/main/res/layout/date_picker_view_animator.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/date_picker_view_animator.xml
rename to android/android-pickers/src/main/res/layout/date_picker_view_animator.xml
diff --git a/legacy/android-pickers/src/main/res/layout/time_header_label.xml b/android/android-pickers/src/main/res/layout/time_header_label.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/time_header_label.xml
rename to android/android-pickers/src/main/res/layout/time_header_label.xml
diff --git a/legacy/android-pickers/src/main/res/layout/time_picker_dialog.xml b/android/android-pickers/src/main/res/layout/time_picker_dialog.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/time_picker_dialog.xml
rename to android/android-pickers/src/main/res/layout/time_picker_dialog.xml
diff --git a/legacy/android-pickers/src/main/res/layout/year_label_text_view.xml b/android/android-pickers/src/main/res/layout/year_label_text_view.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/layout/year_label_text_view.xml
rename to android/android-pickers/src/main/res/layout/year_label_text_view.xml
diff --git a/legacy/android-pickers/src/main/res/values/pickers.xml b/android/android-pickers/src/main/res/values/pickers.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/values/pickers.xml
rename to android/android-pickers/src/main/res/values/pickers.xml
diff --git a/legacy/android-pickers/src/main/res/values/strings.xml b/android/android-pickers/src/main/res/values/strings.xml
similarity index 100%
rename from legacy/android-pickers/src/main/res/values/strings.xml
rename to android/android-pickers/src/main/res/values/strings.xml
diff --git a/legacy/build.gradle b/android/build.gradle
similarity index 100%
rename from legacy/build.gradle
rename to android/build.gradle
diff --git a/legacy/build.sh b/android/build.sh
similarity index 100%
rename from legacy/build.sh
rename to android/build.sh
diff --git a/legacy/gradle.properties b/android/gradle.properties
similarity index 100%
rename from legacy/gradle.properties
rename to android/gradle.properties
diff --git a/legacy/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from legacy/gradle/wrapper/gradle-wrapper.jar
rename to android/gradle/wrapper/gradle-wrapper.jar
diff --git a/legacy/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from legacy/gradle/wrapper/gradle-wrapper.properties
rename to android/gradle/wrapper/gradle-wrapper.properties
diff --git a/legacy/gradlew b/android/gradlew
similarity index 100%
rename from legacy/gradlew
rename to android/gradlew
diff --git a/legacy/gradlew.bat b/android/gradlew.bat
similarity index 100%
rename from legacy/gradlew.bat
rename to android/gradlew.bat
diff --git a/legacy/screenshots/original/uhabits1.png b/android/screenshots/original/uhabits1.png
similarity index 100%
rename from legacy/screenshots/original/uhabits1.png
rename to android/screenshots/original/uhabits1.png
diff --git a/legacy/screenshots/original/uhabits2.png b/android/screenshots/original/uhabits2.png
similarity index 100%
rename from legacy/screenshots/original/uhabits2.png
rename to android/screenshots/original/uhabits2.png
diff --git a/legacy/screenshots/original/uhabits3.png b/android/screenshots/original/uhabits3.png
similarity index 100%
rename from legacy/screenshots/original/uhabits3.png
rename to android/screenshots/original/uhabits3.png
diff --git a/legacy/screenshots/original/uhabits4.png b/android/screenshots/original/uhabits4.png
similarity index 100%
rename from legacy/screenshots/original/uhabits4.png
rename to android/screenshots/original/uhabits4.png
diff --git a/legacy/screenshots/original/uhabits5.png b/android/screenshots/original/uhabits5.png
similarity index 100%
rename from legacy/screenshots/original/uhabits5.png
rename to android/screenshots/original/uhabits5.png
diff --git a/legacy/screenshots/original/uhabits6.png b/android/screenshots/original/uhabits6.png
similarity index 100%
rename from legacy/screenshots/original/uhabits6.png
rename to android/screenshots/original/uhabits6.png
diff --git a/legacy/screenshots/original/wear1.png b/android/screenshots/original/wear1.png
similarity index 100%
rename from legacy/screenshots/original/wear1.png
rename to android/screenshots/original/wear1.png
diff --git a/legacy/screenshots/tasker/tasker_01.png b/android/screenshots/tasker/tasker_01.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_01.png
rename to android/screenshots/tasker/tasker_01.png
diff --git a/legacy/screenshots/tasker/tasker_02.png b/android/screenshots/tasker/tasker_02.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_02.png
rename to android/screenshots/tasker/tasker_02.png
diff --git a/legacy/screenshots/tasker/tasker_03.png b/android/screenshots/tasker/tasker_03.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_03.png
rename to android/screenshots/tasker/tasker_03.png
diff --git a/legacy/screenshots/tasker/tasker_04.png b/android/screenshots/tasker/tasker_04.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_04.png
rename to android/screenshots/tasker/tasker_04.png
diff --git a/legacy/screenshots/tasker/tasker_05.png b/android/screenshots/tasker/tasker_05.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_05.png
rename to android/screenshots/tasker/tasker_05.png
diff --git a/legacy/screenshots/tasker/tasker_06.png b/android/screenshots/tasker/tasker_06.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_06.png
rename to android/screenshots/tasker/tasker_06.png
diff --git a/legacy/screenshots/tasker/tasker_07.png b/android/screenshots/tasker/tasker_07.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_07.png
rename to android/screenshots/tasker/tasker_07.png
diff --git a/legacy/screenshots/tasker/tasker_08.png b/android/screenshots/tasker/tasker_08.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_08.png
rename to android/screenshots/tasker/tasker_08.png
diff --git a/legacy/screenshots/tasker/tasker_09.png b/android/screenshots/tasker/tasker_09.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_09.png
rename to android/screenshots/tasker/tasker_09.png
diff --git a/legacy/screenshots/tasker/tasker_10.png b/android/screenshots/tasker/tasker_10.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_10.png
rename to android/screenshots/tasker/tasker_10.png
diff --git a/legacy/screenshots/tasker/tasker_11.png b/android/screenshots/tasker/tasker_11.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_11.png
rename to android/screenshots/tasker/tasker_11.png
diff --git a/legacy/screenshots/tasker/tasker_12.png b/android/screenshots/tasker/tasker_12.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_12.png
rename to android/screenshots/tasker/tasker_12.png
diff --git a/legacy/screenshots/tasker/tasker_13.png b/android/screenshots/tasker/tasker_13.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_13.png
rename to android/screenshots/tasker/tasker_13.png
diff --git a/legacy/screenshots/tasker/tasker_14.png b/android/screenshots/tasker/tasker_14.png
similarity index 100%
rename from legacy/screenshots/tasker/tasker_14.png
rename to android/screenshots/tasker/tasker_14.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_01.png b/android/screenshots/tasker/thumbs/tasker_01.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_01.png
rename to android/screenshots/tasker/thumbs/tasker_01.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_02.png b/android/screenshots/tasker/thumbs/tasker_02.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_02.png
rename to android/screenshots/tasker/thumbs/tasker_02.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_03.png b/android/screenshots/tasker/thumbs/tasker_03.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_03.png
rename to android/screenshots/tasker/thumbs/tasker_03.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_04.png b/android/screenshots/tasker/thumbs/tasker_04.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_04.png
rename to android/screenshots/tasker/thumbs/tasker_04.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_05.png b/android/screenshots/tasker/thumbs/tasker_05.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_05.png
rename to android/screenshots/tasker/thumbs/tasker_05.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_06.png b/android/screenshots/tasker/thumbs/tasker_06.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_06.png
rename to android/screenshots/tasker/thumbs/tasker_06.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_07.png b/android/screenshots/tasker/thumbs/tasker_07.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_07.png
rename to android/screenshots/tasker/thumbs/tasker_07.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_08.png b/android/screenshots/tasker/thumbs/tasker_08.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_08.png
rename to android/screenshots/tasker/thumbs/tasker_08.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_09.png b/android/screenshots/tasker/thumbs/tasker_09.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_09.png
rename to android/screenshots/tasker/thumbs/tasker_09.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_10.png b/android/screenshots/tasker/thumbs/tasker_10.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_10.png
rename to android/screenshots/tasker/thumbs/tasker_10.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_11.png b/android/screenshots/tasker/thumbs/tasker_11.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_11.png
rename to android/screenshots/tasker/thumbs/tasker_11.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_12.png b/android/screenshots/tasker/thumbs/tasker_12.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_12.png
rename to android/screenshots/tasker/thumbs/tasker_12.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_13.png b/android/screenshots/tasker/thumbs/tasker_13.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_13.png
rename to android/screenshots/tasker/thumbs/tasker_13.png
diff --git a/legacy/screenshots/tasker/thumbs/tasker_14.png b/android/screenshots/tasker/thumbs/tasker_14.png
similarity index 100%
rename from legacy/screenshots/tasker/thumbs/tasker_14.png
rename to android/screenshots/tasker/thumbs/tasker_14.png
diff --git a/legacy/screenshots/thumbs/uhabits1.png b/android/screenshots/thumbs/uhabits1.png
similarity index 100%
rename from legacy/screenshots/thumbs/uhabits1.png
rename to android/screenshots/thumbs/uhabits1.png
diff --git a/legacy/screenshots/thumbs/uhabits2.png b/android/screenshots/thumbs/uhabits2.png
similarity index 100%
rename from legacy/screenshots/thumbs/uhabits2.png
rename to android/screenshots/thumbs/uhabits2.png
diff --git a/legacy/screenshots/thumbs/uhabits3.png b/android/screenshots/thumbs/uhabits3.png
similarity index 100%
rename from legacy/screenshots/thumbs/uhabits3.png
rename to android/screenshots/thumbs/uhabits3.png
diff --git a/legacy/screenshots/thumbs/uhabits4.png b/android/screenshots/thumbs/uhabits4.png
similarity index 100%
rename from legacy/screenshots/thumbs/uhabits4.png
rename to android/screenshots/thumbs/uhabits4.png
diff --git a/legacy/screenshots/thumbs/uhabits5.png b/android/screenshots/thumbs/uhabits5.png
similarity index 100%
rename from legacy/screenshots/thumbs/uhabits5.png
rename to android/screenshots/thumbs/uhabits5.png
diff --git a/legacy/screenshots/thumbs/uhabits6.png b/android/screenshots/thumbs/uhabits6.png
similarity index 100%
rename from legacy/screenshots/thumbs/uhabits6.png
rename to android/screenshots/thumbs/uhabits6.png
diff --git a/legacy/settings.gradle b/android/settings.gradle
similarity index 100%
rename from legacy/settings.gradle
rename to android/settings.gradle
diff --git a/legacy/tools/automator-log-converter-1.5.0.jar b/android/tools/automator-log-converter-1.5.0.jar
similarity index 100%
rename from legacy/tools/automator-log-converter-1.5.0.jar
rename to android/tools/automator-log-converter-1.5.0.jar
diff --git a/legacy/tools/coverage-badge/badge.py b/android/tools/coverage-badge/badge.py
similarity index 100%
rename from legacy/tools/coverage-badge/badge.py
rename to android/tools/coverage-badge/badge.py
diff --git a/legacy/tools/coverage-badge/templates/flat.svg b/android/tools/coverage-badge/templates/flat.svg
similarity index 100%
rename from legacy/tools/coverage-badge/templates/flat.svg
rename to android/tools/coverage-badge/templates/flat.svg
diff --git a/legacy/tools/test-butler-app-1.3.1.apk b/android/tools/test-butler-app-1.3.1.apk
similarity index 100%
rename from legacy/tools/test-butler-app-1.3.1.apk
rename to android/tools/test-butler-app-1.3.1.apk
diff --git a/legacy/uhabits-android/build.gradle b/android/uhabits-android/build.gradle
similarity index 100%
rename from legacy/uhabits-android/build.gradle
rename to android/uhabits-android/build.gradle
diff --git a/legacy/uhabits-android/lint.xml b/android/uhabits-android/lint.xml
similarity index 100%
rename from legacy/uhabits-android/lint.xml
rename to android/uhabits-android/lint.xml
diff --git a/legacy/uhabits-android/proguard-rules.txt b/android/uhabits-android/proguard-rules.txt
similarity index 100%
rename from legacy/uhabits-android/proguard-rules.txt
rename to android/uhabits-android/proguard-rules.txt
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/BarChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/FrequencyChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/RingView/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/RingView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/RingView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/RingView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/RingView/renderDifferentParams.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/RingView/renderDifferentParams.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/RingView/renderDifferentParams.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/RingView/renderDifferentParams.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderYearly.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderYearly.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderYearly.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderYearly.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_explicit_check.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_explicit_check.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_explicit_check.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_explicit_check.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_implicit_check.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_implicit_check.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_implicit_check.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_implicit_check.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_unchecked.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_unchecked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_unchecked.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkButtonView/render_unchecked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_different_color.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_different_color.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_different_color.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_different_color.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_offset.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_offset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_offset.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_offset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_reversed.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_reversed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_reversed.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/CheckmarkPanelView/render_reversed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_changed.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_changed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_changed.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_changed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_numerical.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_numerical.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_numerical.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_numerical.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_selected.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_selected.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_selected.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HabitCardView/render_selected.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HeaderView/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HeaderView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HeaderView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HeaderView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HeaderView/render_reverse.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HeaderView/render_reverse.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HeaderView/render_reverse.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HeaderView/render_reverse.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HintView/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HintView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/HintView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/HintView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_above.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_above.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_above.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_above.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_below.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_below.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_below.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_below.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_zero.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_zero.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_zero.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberButtonView/render_zero.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_different_color.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_different_color.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_different_color.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_different_color.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_offset.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_offset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_offset.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_offset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_reversed.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_reversed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_reversed.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/list/NumberPanelView/render_reversed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/FrequencyCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/show/FrequencyCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/FrequencyCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/show/FrequencyCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/OverviewCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/show/OverviewCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/OverviewCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/show/OverviewCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/SubtitleCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/habits/show/SubtitleCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/habits/show/SubtitleCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/habits/show/SubtitleCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/checked.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/checked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/checked.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/checked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/implicitly_checked.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/implicitly_checked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/implicitly_checked.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/implicitly_checked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/large_size.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/large_size.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/large_size.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/large_size.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/unchecked.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/unchecked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/unchecked.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/CheckmarkWidgetView/unchecked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/FrequencyWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/FrequencyWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/FrequencyWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/FrequencyWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/HistoryWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/HistoryWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/HistoryWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/HistoryWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/ScoreWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/ScoreWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/ScoreWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/ScoreWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/BarChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/FrequencyChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/HistoryChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/RingView/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/RingView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/RingView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/RingView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/RingView/renderDifferentParams.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/RingView/renderDifferentParams.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/RingView/renderDifferentParams.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/RingView/renderDifferentParams.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderMonthly.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderMonthly.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderMonthly.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderMonthly.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderYearly.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderYearly.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderYearly.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/ScoreChart/renderYearly.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/renderSmallSize.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/renderSmallSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/renderSmallSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/renderSmallSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/common/StreakChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_explicit_check.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_explicit_check.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_explicit_check.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_explicit_check.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_implicit_check.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_implicit_check.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_implicit_check.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_implicit_check.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_unchecked.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_unchecked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_unchecked.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_unchecked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_different_color.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_different_color.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_different_color.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_different_color.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_offset.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_offset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_offset.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_offset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_reversed.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_reversed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_reversed.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render_reversed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_changed.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_changed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_changed.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_changed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_numerical.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_numerical.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_numerical.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_numerical.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_selected.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_selected.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_selected.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_selected.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HeaderView/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HeaderView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HeaderView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HeaderView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HeaderView/render_reverse.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HeaderView/render_reverse.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HeaderView/render_reverse.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HeaderView/render_reverse.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HintView/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HintView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/HintView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/HintView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_above.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_above.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_above.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_above.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_below.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_below.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_below.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_below.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_zero.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_zero.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_zero.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_zero.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_different_color.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_different_color.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_different_color.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_different_color.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_offset.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_offset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_offset.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_offset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_reversed.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_reversed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_reversed.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/list/NumberPanelView/render_reversed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/FrequencyCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/show/FrequencyCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/FrequencyCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/show/FrequencyCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/HistoryCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/show/HistoryCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/HistoryCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/show/HistoryCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/OverviewCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/show/OverviewCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/OverviewCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/show/OverviewCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/ScoreCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/show/ScoreCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/ScoreCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/show/ScoreCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/StreakCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/show/StreakCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/StreakCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/show/StreakCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/SubtitleCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/habits/show/SubtitleCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/habits/show/SubtitleCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/habits/show/SubtitleCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/checked.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/checked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/checked.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/checked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/implicitly_checked.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/implicitly_checked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/implicitly_checked.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/implicitly_checked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/large_size.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/large_size.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/large_size.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/large_size.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/unchecked.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/unchecked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/unchecked.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/unchecked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/FrequencyWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/FrequencyWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/FrequencyWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/FrequencyWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/HistoryWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/HistoryWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/HistoryWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/HistoryWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/ScoreWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/ScoreWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/ScoreWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/ScoreWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/StreakWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v21/widgets/StreakWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v21/widgets/StreakWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v21/widgets/StreakWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/BarChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/FrequencyChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/HistoryChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/RingView/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/RingView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/RingView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/RingView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/RingView/renderDifferentParams.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/RingView/renderDifferentParams.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/RingView/renderDifferentParams.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/RingView/renderDifferentParams.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderDataOffset.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderDataOffset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderDataOffset.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderDataOffset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderDifferentSize.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderDifferentSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderDifferentSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderDifferentSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderMonthly.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderMonthly.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderMonthly.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderMonthly.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderYearly.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderYearly.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderYearly.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/ScoreChart/renderYearly.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/renderSmallSize.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/renderSmallSize.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/renderSmallSize.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/renderSmallSize.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/renderTransparent.png b/android/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/renderTransparent.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/renderTransparent.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/common/StreakChart/renderTransparent.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_explicit_check.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_explicit_check.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_explicit_check.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_explicit_check.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_unchecked.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_unchecked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_unchecked.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_unchecked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_different_color.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_different_color.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_different_color.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_different_color.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_offset.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_offset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_offset.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_offset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_reversed.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_reversed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_reversed.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render_reversed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_changed.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_changed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_changed.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_changed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_numerical.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_numerical.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_numerical.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_numerical.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_selected.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_selected.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_selected.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_selected.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HeaderView/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HeaderView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HeaderView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HeaderView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HeaderView/render_reverse.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HeaderView/render_reverse.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HeaderView/render_reverse.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HeaderView/render_reverse.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HintView/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HintView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/HintView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HintView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_above.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_above.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_above.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_above.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_below.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_below.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_below.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_below.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_zero.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_zero.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_zero.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberButtonView/render_zero.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_different_color.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_different_color.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_different_color.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_different_color.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_offset.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_offset.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_offset.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_offset.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_reversed.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_reversed.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_reversed.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/list/NumberPanelView/render_reversed.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/FrequencyCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/FrequencyCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/FrequencyCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/show/FrequencyCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/HistoryCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/HistoryCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/HistoryCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/show/HistoryCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/OverviewCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/OverviewCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/OverviewCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/show/OverviewCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/ScoreCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/ScoreCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/ScoreCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/show/ScoreCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/StreakCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/StreakCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/StreakCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/show/StreakCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/SubtitleCard/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/SubtitleCard/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/habits/show/SubtitleCard/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/habits/show/SubtitleCard/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/checked.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/checked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/checked.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/checked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/implicitly_checked.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/implicitly_checked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/implicitly_checked.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/implicitly_checked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/large_size.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/large_size.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/large_size.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/large_size.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/unchecked.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/unchecked.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/unchecked.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/CheckmarkWidgetView/unchecked.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/FrequencyWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/FrequencyWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/FrequencyWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/FrequencyWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/HistoryWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/HistoryWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/HistoryWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/HistoryWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/ScoreWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/ScoreWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/ScoreWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/ScoreWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/StreakWidget/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/widgets/StreakWidget/render.png
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/assets/views-v26/widgets/StreakWidget/render.png
rename to android/uhabits-android/src/androidTest/assets/views-v26/widgets/StreakWidget/render.png
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.kt
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.kt
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.kt
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.kt
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.kt
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.kt
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/integration/SavedStateTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/integration/SavedStateTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/integration/SavedStateTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/integration/SavedStateTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
diff --git a/legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
similarity index 100%
rename from legacy/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
diff --git a/legacy/uhabits-android/src/main/AndroidManifest.xml b/android/uhabits-android/src/main/AndroidManifest.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/AndroidManifest.xml
rename to android/uhabits-android/src/main/AndroidManifest.xml
diff --git a/legacy/uhabits-android/src/main/assets/cacert.pem b/android/uhabits-android/src/main/assets/cacert.pem
similarity index 100%
rename from legacy/uhabits-android/src/main/assets/cacert.pem
rename to android/uhabits-android/src/main/assets/cacert.pem
diff --git a/legacy/uhabits-android/src/main/assets/fontawesome-webfont.ttf b/android/uhabits-android/src/main/assets/fontawesome-webfont.ttf
similarity index 100%
rename from legacy/uhabits-android/src/main/assets/fontawesome-webfont.ttf
rename to android/uhabits-android/src/main/assets/fontawesome-webfont.ttf
diff --git a/legacy/uhabits-android/src/main/ic_launcher-web.png b/android/uhabits-android/src/main/ic_launcher-web.png
similarity index 100%
rename from legacy/uhabits-android/src/main/ic_launcher-web.png
rename to android/uhabits-android/src/main/ic_launcher-web.png
diff --git a/legacy/uhabits-android/src/main/ic_small_widget_preview-web.png b/android/uhabits-android/src/main/ic_small_widget_preview-web.png
similarity index 100%
rename from legacy/uhabits-android/src/main/ic_small_widget_preview-web.png
rename to android/uhabits-android/src/main/ic_small_widget_preview-web.png
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/HabitLogger.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsModule.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitModule.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitModule.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitModule.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitModule.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivity.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityComponent.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityModule.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityModule.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityModule.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsActivityModule.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutModule.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutModule.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutModule.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutModule.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ExampleEditText.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ExampleEditText.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ExampleEditText.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ExampleEditText.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ConnectivityReceiver.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ConnectivityReceiver.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ConnectivityReceiver.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ConnectivityReceiver.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/sync/Event.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncService.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncService.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncService.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncService.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateUtils.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateUtils.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateUtils.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateUtils.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java
diff --git a/legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
similarity index 100%
rename from legacy/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_light.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_light.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_light.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_light.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_light.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_light.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_light.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_light.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_light.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_light.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_black.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_black.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_white.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_white.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_black.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_black.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_white.png
rename to android/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_light.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_light.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_light.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_light.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_light.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_light.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_light.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_light.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_light.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_light.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_black.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_black.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_white.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_white.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_black.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_black.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_white.png
rename to android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png b/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png
rename to android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png b/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png
rename to android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png b/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png
rename to android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png b/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png
rename to android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png b/android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png
rename to android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-v21/ripple.xml b/android/uhabits-android/src/main/res/drawable-v21/ripple.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-v21/ripple.xml
rename to android/uhabits-android/src/main/res/drawable-v21/ripple.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml b/android/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml
rename to android/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable-v21/selected_box.xml b/android/uhabits-android/src/main/res/drawable-v21/selected_box.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-v21/selected_box.xml
rename to android/uhabits-android/src/main/res/drawable-v21/selected_box.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml b/android/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml
rename to android/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_light.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_light.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_light.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_light.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_light.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_light.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_light.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_light.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_light.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_light.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_black.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_black.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_white.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_white.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_black.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_black.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_white.png
rename to android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_light.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_light.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_light.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_light.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_light.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_light.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_light.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_light.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_light.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_light.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_black.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_black.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_white.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_white.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_black.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_black.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_white.png
rename to android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_add_light.png b/android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_add_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_add_light.png
rename to android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_add_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png b/android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png
rename to android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_light.png b/android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_light.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_light.png
rename to android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_light.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_black.png b/android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_black.png
rename to android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_white.png b/android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_white.png
rename to android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_black.png b/android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_black.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_black.png
rename to android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_black.png
diff --git a/legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_white.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_white.png
rename to android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_white.png
diff --git a/legacy/uhabits-android/src/main/res/drawable/card_amoled_background.xml b/android/uhabits-android/src/main/res/drawable/card_amoled_background.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/card_amoled_background.xml
rename to android/uhabits-android/src/main/res/drawable/card_amoled_background.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/card_dark_background.xml b/android/uhabits-android/src/main/res/drawable/card_dark_background.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/card_dark_background.xml
rename to android/uhabits-android/src/main/res/drawable/card_dark_background.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/card_light_background.xml b/android/uhabits-android/src/main/res/drawable/card_light_background.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/card_light_background.xml
rename to android/uhabits-android/src/main/res/drawable/card_light_background.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/color_picker_swatch.xml b/android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/color_picker_swatch.xml
rename to android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/done_background_color.xml b/android/uhabits-android/src/main/res/drawable/done_background_color.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/done_background_color.xml
rename to android/uhabits-android/src/main/res/drawable/done_background_color.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/done_background_color_dark.xml b/android/uhabits-android/src/main/res/drawable/done_background_color_dark.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/done_background_color_dark.xml
rename to android/uhabits-android/src/main/res/drawable/done_background_color_dark.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/intro_icon_1.png b/android/uhabits-android/src/main/res/drawable/intro_icon_1.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/intro_icon_1.png
rename to android/uhabits-android/src/main/res/drawable/intro_icon_1.png
diff --git a/legacy/uhabits-android/src/main/res/drawable/intro_icon_2.png b/android/uhabits-android/src/main/res/drawable/intro_icon_2.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/intro_icon_2.png
rename to android/uhabits-android/src/main/res/drawable/intro_icon_2.png
diff --git a/legacy/uhabits-android/src/main/res/drawable/intro_icon_4.png b/android/uhabits-android/src/main/res/drawable/intro_icon_4.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/intro_icon_4.png
rename to android/uhabits-android/src/main/res/drawable/intro_icon_4.png
diff --git a/legacy/uhabits-android/src/main/res/drawable/selected_box_amoled.xml b/android/uhabits-android/src/main/res/drawable/selected_box_amoled.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/selected_box_amoled.xml
rename to android/uhabits-android/src/main/res/drawable/selected_box_amoled.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/selected_box_dark.xml b/android/uhabits-android/src/main/res/drawable/selected_box_dark.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/selected_box_dark.xml
rename to android/uhabits-android/src/main/res/drawable/selected_box_dark.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/selected_box_light.xml b/android/uhabits-android/src/main/res/drawable/selected_box_light.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/selected_box_light.xml
rename to android/uhabits-android/src/main/res/drawable/selected_box_light.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/shadow.xml b/android/uhabits-android/src/main/res/drawable/shadow.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/shadow.xml
rename to android/uhabits-android/src/main/res/drawable/shadow.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/stripe.png b/android/uhabits-android/src/main/res/drawable/stripe.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/stripe.png
rename to android/uhabits-android/src/main/res/drawable/stripe.png
diff --git a/legacy/uhabits-android/src/main/res/drawable/widget_background.xml b/android/uhabits-android/src/main/res/drawable/widget_background.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/widget_background.xml
rename to android/uhabits-android/src/main/res/drawable/widget_background.xml
diff --git a/legacy/uhabits-android/src/main/res/drawable/widget_button_background.xml b/android/uhabits-android/src/main/res/drawable/widget_button_background.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/drawable/widget_button_background.xml
rename to android/uhabits-android/src/main/res/drawable/widget_button_background.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/about.xml b/android/uhabits-android/src/main/res/layout/about.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/about.xml
rename to android/uhabits-android/src/main/res/layout/about.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/automation.xml b/android/uhabits-android/src/main/res/layout/automation.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/automation.xml
rename to android/uhabits-android/src/main/res/layout/automation.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml b/android/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml
rename to android/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/edit_habit.xml b/android/uhabits-android/src/main/res/layout/edit_habit.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/edit_habit.xml
rename to android/uhabits-android/src/main/res/layout/edit_habit.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/edit_habit_frequency.xml b/android/uhabits-android/src/main/res/layout/edit_habit_frequency.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/edit_habit_frequency.xml
rename to android/uhabits-android/src/main/res/layout/edit_habit_frequency.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/edit_habit_name.xml b/android/uhabits-android/src/main/res/layout/edit_habit_name.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/edit_habit_name.xml
rename to android/uhabits-android/src/main/res/layout/edit_habit_name.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/edit_habit_reminder.xml b/android/uhabits-android/src/main/res/layout/edit_habit_reminder.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/edit_habit_reminder.xml
rename to android/uhabits-android/src/main/res/layout/edit_habit_reminder.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/edit_habit_target.xml b/android/uhabits-android/src/main/res/layout/edit_habit_target.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/edit_habit_target.xml
rename to android/uhabits-android/src/main/res/layout/edit_habit_target.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/filter.xml b/android/uhabits-android/src/main/res/layout/filter.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/filter.xml
rename to android/uhabits-android/src/main/res/layout/filter.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml b/android/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml
rename to android/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/habit_checkbox_list_item.xml b/android/uhabits-android/src/main/res/layout/habit_checkbox_list_item.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/habit_checkbox_list_item.xml
rename to android/uhabits-android/src/main/res/layout/habit_checkbox_list_item.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/history_stackview_widget.xml b/android/uhabits-android/src/main/res/layout/history_stackview_widget.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/history_stackview_widget.xml
rename to android/uhabits-android/src/main/res/layout/history_stackview_widget.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/list_habits_hint.xml b/android/uhabits-android/src/main/res/layout/list_habits_hint.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/list_habits_hint.xml
rename to android/uhabits-android/src/main/res/layout/list_habits_hint.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/number_picker_dialog.xml b/android/uhabits-android/src/main/res/layout/number_picker_dialog.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/number_picker_dialog.xml
rename to android/uhabits-android/src/main/res/layout/number_picker_dialog.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/preference_category_custom.xml b/android/uhabits-android/src/main/res/layout/preference_category_custom.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/preference_category_custom.xml
rename to android/uhabits-android/src/main/res/layout/preference_category_custom.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/score_stackview_widget.xml b/android/uhabits-android/src/main/res/layout/score_stackview_widget.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/score_stackview_widget.xml
rename to android/uhabits-android/src/main/res/layout/score_stackview_widget.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/settings_activity.xml b/android/uhabits-android/src/main/res/layout/settings_activity.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/settings_activity.xml
rename to android/uhabits-android/src/main/res/layout/settings_activity.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit.xml b/android/uhabits-android/src/main/res/layout/show_habit.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit.xml
rename to android/uhabits-android/src/main/res/layout/show_habit.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_bar.xml b/android/uhabits-android/src/main/res/layout/show_habit_bar.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_bar.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_bar.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_frequency.xml b/android/uhabits-android/src/main/res/layout/show_habit_frequency.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_frequency.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_frequency.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_history.xml b/android/uhabits-android/src/main/res/layout/show_habit_history.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_history.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_history.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_inner.xml b/android/uhabits-android/src/main/res/layout/show_habit_inner.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_inner.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_inner.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_overview.xml b/android/uhabits-android/src/main/res/layout/show_habit_overview.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_overview.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_overview.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_preview.xml b/android/uhabits-android/src/main/res/layout/show_habit_preview.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_preview.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_preview.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_score.xml b/android/uhabits-android/src/main/res/layout/show_habit_score.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_score.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_score.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_streak.xml b/android/uhabits-android/src/main/res/layout/show_habit_streak.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_streak.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_streak.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/show_habit_subtitle.xml b/android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
rename to android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/stack_widget_configure_activity.xml b/android/uhabits-android/src/main/res/layout/stack_widget_configure_activity.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/stack_widget_configure_activity.xml
rename to android/uhabits-android/src/main/res/layout/stack_widget_configure_activity.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/streak_stackview_widget.xml b/android/uhabits-android/src/main/res/layout/streak_stackview_widget.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/streak_stackview_widget.xml
rename to android/uhabits-android/src/main/res/layout/streak_stackview_widget.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/toolbar.xml b/android/uhabits-android/src/main/res/layout/toolbar.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/toolbar.xml
rename to android/uhabits-android/src/main/res/layout/toolbar.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/widget_checkmark.xml b/android/uhabits-android/src/main/res/layout/widget_checkmark.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/widget_checkmark.xml
rename to android/uhabits-android/src/main/res/layout/widget_checkmark.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/widget_configure_activity.xml b/android/uhabits-android/src/main/res/layout/widget_configure_activity.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/widget_configure_activity.xml
rename to android/uhabits-android/src/main/res/layout/widget_configure_activity.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/widget_empty.xml b/android/uhabits-android/src/main/res/layout/widget_empty.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/widget_empty.xml
rename to android/uhabits-android/src/main/res/layout/widget_empty.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/widget_error.xml b/android/uhabits-android/src/main/res/layout/widget_error.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/widget_error.xml
rename to android/uhabits-android/src/main/res/layout/widget_error.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/widget_graph.xml b/android/uhabits-android/src/main/res/layout/widget_graph.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/widget_graph.xml
rename to android/uhabits-android/src/main/res/layout/widget_graph.xml
diff --git a/legacy/uhabits-android/src/main/res/layout/widget_wrapper.xml b/android/uhabits-android/src/main/res/layout/widget_wrapper.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/layout/widget_wrapper.xml
rename to android/uhabits-android/src/main/res/layout/widget_wrapper.xml
diff --git a/legacy/uhabits-android/src/main/res/menu/list_habits.xml b/android/uhabits-android/src/main/res/menu/list_habits.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/menu/list_habits.xml
rename to android/uhabits-android/src/main/res/menu/list_habits.xml
diff --git a/legacy/uhabits-android/src/main/res/menu/list_habits_selection.xml b/android/uhabits-android/src/main/res/menu/list_habits_selection.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/menu/list_habits_selection.xml
rename to android/uhabits-android/src/main/res/menu/list_habits_selection.xml
diff --git a/legacy/uhabits-android/src/main/res/menu/show_habit.xml b/android/uhabits-android/src/main/res/menu/show_habit.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/menu/show_habit.xml
rename to android/uhabits-android/src/main/res/menu/show_habit.xml
diff --git a/legacy/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/legacy/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to android/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/legacy/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png b/android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png
rename to android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/legacy/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/legacy/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/legacy/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/legacy/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/legacy/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/legacy/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/legacy/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from legacy/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/legacy/uhabits-android/src/main/res/values-af/strings.xml b/android/uhabits-android/src/main/res/values-af/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-af/strings.xml
rename to android/uhabits-android/src/main/res/values-af/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-ar/strings.xml b/android/uhabits-android/src/main/res/values-ar/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-ar/strings.xml
rename to android/uhabits-android/src/main/res/values-ar/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-bg/strings.xml b/android/uhabits-android/src/main/res/values-bg/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-bg/strings.xml
rename to android/uhabits-android/src/main/res/values-bg/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-ca/strings.xml b/android/uhabits-android/src/main/res/values-ca/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-ca/strings.xml
rename to android/uhabits-android/src/main/res/values-ca/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-cs/strings.xml b/android/uhabits-android/src/main/res/values-cs/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-cs/strings.xml
rename to android/uhabits-android/src/main/res/values-cs/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-da/strings.xml b/android/uhabits-android/src/main/res/values-da/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-da/strings.xml
rename to android/uhabits-android/src/main/res/values-da/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-de/strings.xml b/android/uhabits-android/src/main/res/values-de/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-de/strings.xml
rename to android/uhabits-android/src/main/res/values-de/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-el/strings.xml b/android/uhabits-android/src/main/res/values-el/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-el/strings.xml
rename to android/uhabits-android/src/main/res/values-el/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-eo/strings.xml b/android/uhabits-android/src/main/res/values-eo/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-eo/strings.xml
rename to android/uhabits-android/src/main/res/values-eo/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-es/strings.xml b/android/uhabits-android/src/main/res/values-es/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-es/strings.xml
rename to android/uhabits-android/src/main/res/values-es/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-eu/strings.xml b/android/uhabits-android/src/main/res/values-eu/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-eu/strings.xml
rename to android/uhabits-android/src/main/res/values-eu/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-fa/strings.xml b/android/uhabits-android/src/main/res/values-fa/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-fa/strings.xml
rename to android/uhabits-android/src/main/res/values-fa/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-fi/strings.xml b/android/uhabits-android/src/main/res/values-fi/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-fi/strings.xml
rename to android/uhabits-android/src/main/res/values-fi/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-fr/strings.xml b/android/uhabits-android/src/main/res/values-fr/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-fr/strings.xml
rename to android/uhabits-android/src/main/res/values-fr/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-hi/strings.xml b/android/uhabits-android/src/main/res/values-hi/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-hi/strings.xml
rename to android/uhabits-android/src/main/res/values-hi/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-hr/strings.xml b/android/uhabits-android/src/main/res/values-hr/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-hr/strings.xml
rename to android/uhabits-android/src/main/res/values-hr/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-hu/strings.xml b/android/uhabits-android/src/main/res/values-hu/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-hu/strings.xml
rename to android/uhabits-android/src/main/res/values-hu/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-in/strings.xml b/android/uhabits-android/src/main/res/values-in/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-in/strings.xml
rename to android/uhabits-android/src/main/res/values-in/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-it/strings.xml b/android/uhabits-android/src/main/res/values-it/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-it/strings.xml
rename to android/uhabits-android/src/main/res/values-it/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-iw/strings.xml b/android/uhabits-android/src/main/res/values-iw/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-iw/strings.xml
rename to android/uhabits-android/src/main/res/values-iw/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-ja/strings.xml b/android/uhabits-android/src/main/res/values-ja/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-ja/strings.xml
rename to android/uhabits-android/src/main/res/values-ja/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-ko/strings.xml b/android/uhabits-android/src/main/res/values-ko/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-ko/strings.xml
rename to android/uhabits-android/src/main/res/values-ko/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-nl/strings.xml b/android/uhabits-android/src/main/res/values-nl/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-nl/strings.xml
rename to android/uhabits-android/src/main/res/values-nl/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-no-rNO/strings.xml b/android/uhabits-android/src/main/res/values-no-rNO/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-no-rNO/strings.xml
rename to android/uhabits-android/src/main/res/values-no-rNO/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-pl/strings.xml b/android/uhabits-android/src/main/res/values-pl/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-pl/strings.xml
rename to android/uhabits-android/src/main/res/values-pl/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-pt-rBR/strings.xml b/android/uhabits-android/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-pt-rBR/strings.xml
rename to android/uhabits-android/src/main/res/values-pt-rBR/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-pt-rPT/strings.xml b/android/uhabits-android/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-pt-rPT/strings.xml
rename to android/uhabits-android/src/main/res/values-pt-rPT/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-ro/strings.xml b/android/uhabits-android/src/main/res/values-ro/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-ro/strings.xml
rename to android/uhabits-android/src/main/res/values-ro/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-ru/strings.xml b/android/uhabits-android/src/main/res/values-ru/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-ru/strings.xml
rename to android/uhabits-android/src/main/res/values-ru/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-sl/strings.xml b/android/uhabits-android/src/main/res/values-sl/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-sl/strings.xml
rename to android/uhabits-android/src/main/res/values-sl/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-sr/strings.xml b/android/uhabits-android/src/main/res/values-sr/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-sr/strings.xml
rename to android/uhabits-android/src/main/res/values-sr/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-sv/strings.xml b/android/uhabits-android/src/main/res/values-sv/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-sv/strings.xml
rename to android/uhabits-android/src/main/res/values-sv/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-tr/strings.xml b/android/uhabits-android/src/main/res/values-tr/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-tr/strings.xml
rename to android/uhabits-android/src/main/res/values-tr/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-uk/strings.xml b/android/uhabits-android/src/main/res/values-uk/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-uk/strings.xml
rename to android/uhabits-android/src/main/res/values-uk/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-v21/styles.xml b/android/uhabits-android/src/main/res/values-v21/styles.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-v21/styles.xml
rename to android/uhabits-android/src/main/res/values-v21/styles.xml
diff --git a/legacy/uhabits-android/src/main/res/values-v21/styles_list_habits.xml b/android/uhabits-android/src/main/res/values-v21/styles_list_habits.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-v21/styles_list_habits.xml
rename to android/uhabits-android/src/main/res/values-v21/styles_list_habits.xml
diff --git a/legacy/uhabits-android/src/main/res/values-vi/strings.xml b/android/uhabits-android/src/main/res/values-vi/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-vi/strings.xml
rename to android/uhabits-android/src/main/res/values-vi/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-zh-rCN/strings.xml b/android/uhabits-android/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-zh-rCN/strings.xml
rename to android/uhabits-android/src/main/res/values-zh-rCN/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values-zh-rTW/strings.xml b/android/uhabits-android/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values-zh-rTW/strings.xml
rename to android/uhabits-android/src/main/res/values-zh-rTW/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values/attrs.xml b/android/uhabits-android/src/main/res/values/attrs.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/attrs.xml
rename to android/uhabits-android/src/main/res/values/attrs.xml
diff --git a/legacy/uhabits-android/src/main/res/values/colors.xml b/android/uhabits-android/src/main/res/values/colors.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/colors.xml
rename to android/uhabits-android/src/main/res/values/colors.xml
diff --git a/legacy/uhabits-android/src/main/res/values/constants.xml b/android/uhabits-android/src/main/res/values/constants.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/constants.xml
rename to android/uhabits-android/src/main/res/values/constants.xml
diff --git a/legacy/uhabits-android/src/main/res/values/dimens.xml b/android/uhabits-android/src/main/res/values/dimens.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/dimens.xml
rename to android/uhabits-android/src/main/res/values/dimens.xml
diff --git a/legacy/uhabits-android/src/main/res/values/fontawesome.xml b/android/uhabits-android/src/main/res/values/fontawesome.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/fontawesome.xml
rename to android/uhabits-android/src/main/res/values/fontawesome.xml
diff --git a/legacy/uhabits-android/src/main/res/values/keys.xml b/android/uhabits-android/src/main/res/values/keys.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/keys.xml
rename to android/uhabits-android/src/main/res/values/keys.xml
diff --git a/legacy/uhabits-android/src/main/res/values/strings.xml b/android/uhabits-android/src/main/res/values/strings.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/strings.xml
rename to android/uhabits-android/src/main/res/values/strings.xml
diff --git a/legacy/uhabits-android/src/main/res/values/styles.xml b/android/uhabits-android/src/main/res/values/styles.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/styles.xml
rename to android/uhabits-android/src/main/res/values/styles.xml
diff --git a/legacy/uhabits-android/src/main/res/values/styles_dialog.xml b/android/uhabits-android/src/main/res/values/styles_dialog.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/styles_dialog.xml
rename to android/uhabits-android/src/main/res/values/styles_dialog.xml
diff --git a/legacy/uhabits-android/src/main/res/values/styles_list_habits.xml b/android/uhabits-android/src/main/res/values/styles_list_habits.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/styles_list_habits.xml
rename to android/uhabits-android/src/main/res/values/styles_list_habits.xml
diff --git a/legacy/uhabits-android/src/main/res/values/styles_show_habit.xml b/android/uhabits-android/src/main/res/values/styles_show_habit.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/values/styles_show_habit.xml
rename to android/uhabits-android/src/main/res/values/styles_show_habit.xml
diff --git a/legacy/uhabits-android/src/main/res/xml/file_paths.xml b/android/uhabits-android/src/main/res/xml/file_paths.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/xml/file_paths.xml
rename to android/uhabits-android/src/main/res/xml/file_paths.xml
diff --git a/legacy/uhabits-android/src/main/res/xml/preferences.xml b/android/uhabits-android/src/main/res/xml/preferences.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/xml/preferences.xml
rename to android/uhabits-android/src/main/res/xml/preferences.xml
diff --git a/legacy/uhabits-android/src/main/res/xml/widget_checkmark_info.xml b/android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
rename to android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
diff --git a/legacy/uhabits-android/src/main/res/xml/widget_frequency_info.xml b/android/uhabits-android/src/main/res/xml/widget_frequency_info.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/xml/widget_frequency_info.xml
rename to android/uhabits-android/src/main/res/xml/widget_frequency_info.xml
diff --git a/legacy/uhabits-android/src/main/res/xml/widget_history_info.xml b/android/uhabits-android/src/main/res/xml/widget_history_info.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/xml/widget_history_info.xml
rename to android/uhabits-android/src/main/res/xml/widget_history_info.xml
diff --git a/legacy/uhabits-android/src/main/res/xml/widget_score_info.xml b/android/uhabits-android/src/main/res/xml/widget_score_info.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/xml/widget_score_info.xml
rename to android/uhabits-android/src/main/res/xml/widget_score_info.xml
diff --git a/legacy/uhabits-android/src/main/res/xml/widget_streak_info.xml b/android/uhabits-android/src/main/res/xml/widget_streak_info.xml
similarity index 100%
rename from legacy/uhabits-android/src/main/res/xml/widget_streak_info.xml
rename to android/uhabits-android/src/main/res/xml/widget_streak_info.xml
diff --git a/legacy/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java b/android/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java
similarity index 100%
rename from legacy/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java
rename to android/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java
diff --git a/legacy/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.kt b/android/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.kt
similarity index 100%
rename from legacy/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.kt
rename to android/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.kt
diff --git a/legacy/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.kt b/android/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.kt
similarity index 100%
rename from legacy/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.kt
rename to android/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.kt
diff --git a/legacy/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.kt b/android/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.kt
similarity index 100%
rename from legacy/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.kt
rename to android/uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.kt
diff --git a/legacy/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java b/android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
similarity index 100%
rename from legacy/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
rename to android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
diff --git a/legacy/uhabits-android/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java b/android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
similarity index 100%
rename from legacy/uhabits-android/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
rename to android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
diff --git a/legacy/uhabits-core/.gitignore b/android/uhabits-core/.gitignore
similarity index 100%
rename from legacy/uhabits-core/.gitignore
rename to android/uhabits-core/.gitignore
diff --git a/legacy/uhabits-core/build.gradle b/android/uhabits-core/build.gradle
similarity index 100%
rename from legacy/uhabits-core/build.gradle
rename to android/uhabits-core/build.gradle
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/Config.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/Config.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/Config.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/Config.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandParser.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandParser.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandParser.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandParser.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommand.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommand.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommand.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/package-info.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/package-info.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/package-info.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/package-info.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/GenericImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/GenericImporter.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/GenericImporter.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/GenericImporter.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Timestamp.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Timestamp.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Timestamp.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Timestamp.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryCheckmarkList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryCheckmarkList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryCheckmarkList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryCheckmarkList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryScoreList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryScoreList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryScoreList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryScoreList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryStreakList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryStreakList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryStreakList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryStreakList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/package-info.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/package-info.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/package-info.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/package-info.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/package-info.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/package-info.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/package-info.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/package-info.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecord.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecord.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecord.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecord.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/ColorConstants.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/ColorConstants.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/ColorConstants.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/ColorConstants.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java
diff --git a/legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java
similarity index 100%
rename from legacy/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java
rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java
diff --git a/legacy/uhabits-core/src/main/resources/migrations/09.sql b/android/uhabits-core/src/main/resources/migrations/09.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/09.sql
rename to android/uhabits-core/src/main/resources/migrations/09.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/10.sql b/android/uhabits-core/src/main/resources/migrations/10.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/10.sql
rename to android/uhabits-core/src/main/resources/migrations/10.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/11.sql b/android/uhabits-core/src/main/resources/migrations/11.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/11.sql
rename to android/uhabits-core/src/main/resources/migrations/11.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/12.sql b/android/uhabits-core/src/main/resources/migrations/12.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/12.sql
rename to android/uhabits-core/src/main/resources/migrations/12.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/13.sql b/android/uhabits-core/src/main/resources/migrations/13.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/13.sql
rename to android/uhabits-core/src/main/resources/migrations/13.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/14.sql b/android/uhabits-core/src/main/resources/migrations/14.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/14.sql
rename to android/uhabits-core/src/main/resources/migrations/14.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/15.sql b/android/uhabits-core/src/main/resources/migrations/15.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/15.sql
rename to android/uhabits-core/src/main/resources/migrations/15.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/16.sql b/android/uhabits-core/src/main/resources/migrations/16.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/16.sql
rename to android/uhabits-core/src/main/resources/migrations/16.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/17.sql b/android/uhabits-core/src/main/resources/migrations/17.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/17.sql
rename to android/uhabits-core/src/main/resources/migrations/17.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/18.sql b/android/uhabits-core/src/main/resources/migrations/18.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/18.sql
rename to android/uhabits-core/src/main/resources/migrations/18.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/19.sql b/android/uhabits-core/src/main/resources/migrations/19.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/19.sql
rename to android/uhabits-core/src/main/resources/migrations/19.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/20.sql b/android/uhabits-core/src/main/resources/migrations/20.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/20.sql
rename to android/uhabits-core/src/main/resources/migrations/20.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/21.sql b/android/uhabits-core/src/main/resources/migrations/21.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/21.sql
rename to android/uhabits-core/src/main/resources/migrations/21.sql
diff --git a/legacy/uhabits-core/src/main/resources/migrations/22.sql b/android/uhabits-core/src/main/resources/migrations/22.sql
similarity index 100%
rename from legacy/uhabits-core/src/main/resources/migrations/22.sql
rename to android/uhabits-core/src/main/resources/migrations/22.sql
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CommandParserTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CommandParserTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CommandParserTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CommandParserTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/database/migrations/Version22Test.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/migrations/Version22Test.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/database/migrations/Version22Test.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/migrations/Version22Test.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/CheckmarkListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/TimestampTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/TimestampTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/TimestampTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/TimestampTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecordTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecordTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecordTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/RepetitionRecordTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/about/AboutBehaviorTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/about/AboutBehaviorTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/about/AboutBehaviorTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/about/AboutBehaviorTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehaviorTest.java
diff --git a/legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java
similarity index 100%
rename from legacy/uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java
rename to android/uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java
diff --git a/legacy/uhabits-core/src/test/resources/databases/021.db b/android/uhabits-core/src/test/resources/databases/021.db
similarity index 100%
rename from legacy/uhabits-core/src/test/resources/databases/021.db
rename to android/uhabits-core/src/test/resources/databases/021.db
diff --git a/legacy/uhabits-core/src/test/resources/habitbull.csv b/android/uhabits-core/src/test/resources/habitbull.csv
similarity index 100%
rename from legacy/uhabits-core/src/test/resources/habitbull.csv
rename to android/uhabits-core/src/test/resources/habitbull.csv
diff --git a/legacy/uhabits-core/src/test/resources/loop.db b/android/uhabits-core/src/test/resources/loop.db
similarity index 100%
rename from legacy/uhabits-core/src/test/resources/loop.db
rename to android/uhabits-core/src/test/resources/loop.db
diff --git a/legacy/uhabits-core/src/test/resources/rewire.db b/android/uhabits-core/src/test/resources/rewire.db
similarity index 100%
rename from legacy/uhabits-core/src/test/resources/rewire.db
rename to android/uhabits-core/src/test/resources/rewire.db
diff --git a/legacy/uhabits-core/src/test/resources/tickmate.db b/android/uhabits-core/src/test/resources/tickmate.db
similarity index 100%
rename from legacy/uhabits-core/src/test/resources/tickmate.db
rename to android/uhabits-core/src/test/resources/tickmate.db