diff --git a/android-app/app/.gitignore b/app/.gitignore
similarity index 100%
rename from android-app/app/.gitignore
rename to app/.gitignore
diff --git a/android-app/app/build.gradle.kts b/app/build.gradle.kts
similarity index 100%
rename from android-app/app/build.gradle.kts
rename to app/build.gradle.kts
diff --git a/android-app/app/proguard-android-optimize.txt b/app/proguard-android-optimize.txt
similarity index 100%
rename from android-app/app/proguard-android-optimize.txt
rename to app/proguard-android-optimize.txt
diff --git a/android-app/app/proguard-rules.pro b/app/proguard-rules.pro
similarity index 100%
rename from android-app/app/proguard-rules.pro
rename to app/proguard-rules.pro
diff --git a/android-app/app/src/androidTest/assets/categories/simple.json b/app/src/androidTest/assets/categories/simple.json
similarity index 100%
rename from android-app/app/src/androidTest/assets/categories/simple.json
rename to app/src/androidTest/assets/categories/simple.json
diff --git a/android-app/app/src/androidTest/assets/kotatsu_test.bak b/app/src/androidTest/assets/kotatsu_test.bak
similarity index 100%
rename from android-app/app/src/androidTest/assets/kotatsu_test.bak
rename to app/src/androidTest/assets/kotatsu_test.bak
diff --git a/android-app/app/src/androidTest/assets/manga/bad_ids.json b/app/src/androidTest/assets/manga/bad_ids.json
similarity index 100%
rename from android-app/app/src/androidTest/assets/manga/bad_ids.json
rename to app/src/androidTest/assets/manga/bad_ids.json
diff --git a/android-app/app/src/androidTest/assets/manga/empty.json b/app/src/androidTest/assets/manga/empty.json
similarity index 100%
rename from android-app/app/src/androidTest/assets/manga/empty.json
rename to app/src/androidTest/assets/manga/empty.json
diff --git a/android-app/app/src/androidTest/assets/manga/first_chapters.json b/app/src/androidTest/assets/manga/first_chapters.json
similarity index 100%
rename from android-app/app/src/androidTest/assets/manga/first_chapters.json
rename to app/src/androidTest/assets/manga/first_chapters.json
diff --git a/android-app/app/src/androidTest/assets/manga/full.json b/app/src/androidTest/assets/manga/full.json
similarity index 100%
rename from android-app/app/src/androidTest/assets/manga/full.json
rename to app/src/androidTest/assets/manga/full.json
diff --git a/android-app/app/src/androidTest/assets/manga/header.json b/app/src/androidTest/assets/manga/header.json
similarity index 100%
rename from android-app/app/src/androidTest/assets/manga/header.json
rename to app/src/androidTest/assets/manga/header.json
diff --git a/android-app/app/src/androidTest/assets/manga/without_middle_chapter.json b/app/src/androidTest/assets/manga/without_middle_chapter.json
similarity index 100%
rename from android-app/app/src/androidTest/assets/manga/without_middle_chapter.json
rename to app/src/androidTest/assets/manga/without_middle_chapter.json
diff --git a/android-app/app/src/androidTest/java/org/xtimms/shirizu/HiltTestRunner.kt b/app/src/androidTest/java/org/xtimms/shirizu/HiltTestRunner.kt
similarity index 100%
rename from android-app/app/src/androidTest/java/org/xtimms/shirizu/HiltTestRunner.kt
rename to app/src/androidTest/java/org/xtimms/shirizu/HiltTestRunner.kt
diff --git a/android-app/app/src/androidTest/java/org/xtimms/shirizu/Instrumentation.kt b/app/src/androidTest/java/org/xtimms/shirizu/Instrumentation.kt
similarity index 100%
rename from android-app/app/src/androidTest/java/org/xtimms/shirizu/Instrumentation.kt
rename to app/src/androidTest/java/org/xtimms/shirizu/Instrumentation.kt
diff --git a/android-app/app/src/androidTest/java/org/xtimms/shirizu/SampleData.kt b/app/src/androidTest/java/org/xtimms/shirizu/SampleData.kt
similarity index 100%
rename from android-app/app/src/androidTest/java/org/xtimms/shirizu/SampleData.kt
rename to app/src/androidTest/java/org/xtimms/shirizu/SampleData.kt
diff --git a/android-app/app/src/androidTest/java/org/xtimms/shirizu/core/database/ShirizuDatabaseTest.kt b/app/src/androidTest/java/org/xtimms/shirizu/core/database/ShirizuDatabaseTest.kt
similarity index 100%
rename from android-app/app/src/androidTest/java/org/xtimms/shirizu/core/database/ShirizuDatabaseTest.kt
rename to app/src/androidTest/java/org/xtimms/shirizu/core/database/ShirizuDatabaseTest.kt
diff --git a/android-app/app/src/androidTest/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgentTest.kt b/app/src/androidTest/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgentTest.kt
similarity index 100%
rename from android-app/app/src/androidTest/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgentTest.kt
rename to app/src/androidTest/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgentTest.kt
diff --git a/android-app/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android-app/app/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/android-app/app/src/main/assets/font/manrope_variable.ttf b/app/src/main/assets/font/manrope_variable.ttf
similarity index 100%
rename from android-app/app/src/main/assets/font/manrope_variable.ttf
rename to app/src/main/assets/font/manrope_variable.ttf
diff --git a/android-app/app/src/main/baseline-prof.txt b/app/src/main/baseline-prof.txt
similarity index 100%
rename from android-app/app/src/main/baseline-prof.txt
rename to app/src/main/baseline-prof.txt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/App.kt b/app/src/main/java/org/xtimms/shirizu/App.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/App.kt
rename to app/src/main/java/org/xtimms/shirizu/App.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/CompositionLocals.kt b/app/src/main/java/org/xtimms/shirizu/CompositionLocals.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/CompositionLocals.kt
rename to app/src/main/java/org/xtimms/shirizu/CompositionLocals.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/MainActivity.kt b/app/src/main/java/org/xtimms/shirizu/MainActivity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/MainActivity.kt
rename to app/src/main/java/org/xtimms/shirizu/MainActivity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ShirizuModule.kt b/app/src/main/java/org/xtimms/shirizu/ShirizuModule.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ShirizuModule.kt
rename to app/src/main/java/org/xtimms/shirizu/ShirizuModule.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/AsyncImageImpl.kt b/app/src/main/java/org/xtimms/shirizu/core/AsyncImageImpl.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/AsyncImageImpl.kt
rename to app/src/main/java/org/xtimms/shirizu/core/AsyncImageImpl.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/BottomNavDestination.kt b/app/src/main/java/org/xtimms/shirizu/core/BottomNavDestination.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/BottomNavDestination.kt
rename to app/src/main/java/org/xtimms/shirizu/core/BottomNavDestination.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/HapticFeedback.kt b/app/src/main/java/org/xtimms/shirizu/core/HapticFeedback.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/HapticFeedback.kt
rename to app/src/main/java/org/xtimms/shirizu/core/HapticFeedback.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/ModifierCollapsable.kt b/app/src/main/java/org/xtimms/shirizu/core/ModifierCollapsable.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/ModifierCollapsable.kt
rename to app/src/main/java/org/xtimms/shirizu/core/ModifierCollapsable.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/Navigation.kt b/app/src/main/java/org/xtimms/shirizu/core/Navigation.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/Navigation.kt
rename to app/src/main/java/org/xtimms/shirizu/core/Navigation.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/base/AlertDialogFragment.kt b/app/src/main/java/org/xtimms/shirizu/core/base/AlertDialogFragment.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/base/AlertDialogFragment.kt
rename to app/src/main/java/org/xtimms/shirizu/core/base/AlertDialogFragment.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/base/BaseActivity.kt b/app/src/main/java/org/xtimms/shirizu/core/base/BaseActivity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/base/BaseActivity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/base/BaseActivity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/base/event/PagedUiEvent.kt b/app/src/main/java/org/xtimms/shirizu/core/base/event/PagedUiEvent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/base/event/PagedUiEvent.kt
rename to app/src/main/java/org/xtimms/shirizu/core/base/event/PagedUiEvent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/base/event/UiEvent.kt b/app/src/main/java/org/xtimms/shirizu/core/base/event/UiEvent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/base/event/UiEvent.kt
rename to app/src/main/java/org/xtimms/shirizu/core/base/event/UiEvent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/base/state/PagedUiState.kt b/app/src/main/java/org/xtimms/shirizu/core/base/state/PagedUiState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/base/state/PagedUiState.kt
rename to app/src/main/java/org/xtimms/shirizu/core/base/state/PagedUiState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/base/state/UiState.kt b/app/src/main/java/org/xtimms/shirizu/core/base/state/UiState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/base/state/UiState.kt
rename to app/src/main/java/org/xtimms/shirizu/core/base/state/UiState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/BaseViewModel.kt b/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/BaseViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/BaseViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/BaseViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/KotatsuBaseViewModel.kt b/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/KotatsuBaseViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/KotatsuBaseViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/KotatsuBaseViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/cache/CacheDir.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/CacheDir.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/cache/CacheDir.kt
rename to app/src/main/java/org/xtimms/shirizu/core/cache/CacheDir.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/cache/ContentCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/ContentCache.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/cache/ContentCache.kt
rename to app/src/main/java/org/xtimms/shirizu/core/cache/ContentCache.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringLruCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringLruCache.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringLruCache.kt
rename to app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringLruCache.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringValue.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringValue.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringValue.kt
rename to app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringValue.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/cache/MemoryContentCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/MemoryContentCache.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/cache/MemoryContentCache.kt
rename to app/src/main/java/org/xtimms/shirizu/core/cache/MemoryContentCache.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/cache/PagesCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/PagesCache.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/cache/PagesCache.kt
rename to app/src/main/java/org/xtimms/shirizu/core/cache/PagesCache.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/cache/SafeDeferred.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/SafeDeferred.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/cache/SafeDeferred.kt
rename to app/src/main/java/org/xtimms/shirizu/core/cache/SafeDeferred.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/cache/StubContentCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/StubContentCache.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/cache/StubContentCache.kt
rename to app/src/main/java/org/xtimms/shirizu/core/cache/StubContentCache.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedButton.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedButton.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/AnimatedButton.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedNumber.kt b/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedNumber.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedNumber.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/AnimatedNumber.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/BackgroundProgress.kt b/app/src/main/java/org/xtimms/shirizu/core/components/BackgroundProgress.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/BackgroundProgress.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/BackgroundProgress.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/BottomNavBar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/BottomNavBar.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/BottomNavBar.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/BottomNavBar.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/Buttons.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Buttons.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/Buttons.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/Buttons.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/CheckBox.kt b/app/src/main/java/org/xtimms/shirizu/core/components/CheckBox.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/CheckBox.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/CheckBox.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/Chips.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Chips.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/Chips.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/Chips.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/ContinueReadingButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ContinueReadingButton.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/ContinueReadingButton.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/ContinueReadingButton.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/DetailsToolbar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/DetailsToolbar.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/DetailsToolbar.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/DetailsToolbar.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/DialogItems.kt b/app/src/main/java/org/xtimms/shirizu/core/components/DialogItems.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/DialogItems.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/DialogItems.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/Dialogs.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Dialogs.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/Dialogs.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/Dialogs.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/DotSeparatorText.kt b/app/src/main/java/org/xtimms/shirizu/core/components/DotSeparatorText.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/DotSeparatorText.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/DotSeparatorText.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/ExploreButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ExploreButton.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/ExploreButton.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/ExploreButton.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/FloatingActionButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/FloatingActionButton.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/FloatingActionButton.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/FloatingActionButton.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/HtmlTextField.kt b/app/src/main/java/org/xtimms/shirizu/core/components/HtmlTextField.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/HtmlTextField.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/HtmlTextField.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/IconButtons.kt b/app/src/main/java/org/xtimms/shirizu/core/components/IconButtons.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/IconButtons.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/IconButtons.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/ListGroupHeader.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ListGroupHeader.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/ListGroupHeader.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/ListGroupHeader.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/MangaCover.kt b/app/src/main/java/org/xtimms/shirizu/core/components/MangaCover.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/MangaCover.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/MangaCover.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/MangaGridItem.kt b/app/src/main/java/org/xtimms/shirizu/core/components/MangaGridItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/MangaGridItem.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/MangaGridItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/ModalBottomSheet.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ModalBottomSheet.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/ModalBottomSheet.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/ModalBottomSheet.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/NavigationRail.kt b/app/src/main/java/org/xtimms/shirizu/core/components/NavigationRail.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/NavigationRail.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/NavigationRail.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/Pill.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Pill.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/Pill.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/Pill.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/PreferenceItem.kt b/app/src/main/java/org/xtimms/shirizu/core/components/PreferenceItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/PreferenceItem.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/PreferenceItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/PullRefresh.kt b/app/src/main/java/org/xtimms/shirizu/core/components/PullRefresh.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/PullRefresh.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/PullRefresh.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/ReadButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ReadButton.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/ReadButton.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/ReadButton.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/ScaffoldWithTopAppBar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ScaffoldWithTopAppBar.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/ScaffoldWithTopAppBar.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/ScaffoldWithTopAppBar.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/ScoreIndicator.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ScoreIndicator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/ScoreIndicator.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/ScoreIndicator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/SearchBar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/SearchBar.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/SearchBar.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/SearchBar.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/SettingItem.kt b/app/src/main/java/org/xtimms/shirizu/core/components/SettingItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/SettingItem.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/SettingItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/SourceItem.kt b/app/src/main/java/org/xtimms/shirizu/core/components/SourceItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/SourceItem.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/SourceItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/Tab.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Tab.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/Tab.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/Tab.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/TopAppBar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/TopAppBar.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/TopAppBar.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/TopAppBar.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/effects/ListAnimation.kt b/app/src/main/java/org/xtimms/shirizu/core/components/effects/ListAnimation.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/effects/ListAnimation.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/effects/ListAnimation.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/effects/Snowflake.kt b/app/src/main/java/org/xtimms/shirizu/core/components/effects/Snowflake.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/effects/Snowflake.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/effects/Snowflake.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/icons/ArrowDecisionOutline.kt b/app/src/main/java/org/xtimms/shirizu/core/components/icons/ArrowDecisionOutline.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/icons/ArrowDecisionOutline.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/icons/ArrowDecisionOutline.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/icons/Creation.kt b/app/src/main/java/org/xtimms/shirizu/core/components/icons/Creation.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/icons/Creation.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/icons/Creation.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/icons/Dice.kt b/app/src/main/java/org/xtimms/shirizu/core/components/icons/Dice.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/icons/Dice.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/icons/Dice.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/icons/Kotatsu.kt b/app/src/main/java/org/xtimms/shirizu/core/components/icons/Kotatsu.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/icons/Kotatsu.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/icons/Kotatsu.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/components/shape/WavyShape.kt b/app/src/main/java/org/xtimms/shirizu/core/components/shape/WavyShape.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/components/shape/WavyShape.kt
rename to app/src/main/java/org/xtimms/shirizu/core/components/shape/WavyShape.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/DatabasePrePopulateCallback.kt b/app/src/main/java/org/xtimms/shirizu/core/database/DatabasePrePopulateCallback.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/DatabasePrePopulateCallback.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/DatabasePrePopulateCallback.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/ShirizuDatabase.kt b/app/src/main/java/org/xtimms/shirizu/core/database/ShirizuDatabase.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/ShirizuDatabase.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/ShirizuDatabase.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/Tables.kt b/app/src/main/java/org/xtimms/shirizu/core/database/Tables.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/Tables.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/Tables.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/BookmarksDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/BookmarksDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/BookmarksDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/BookmarksDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouriteCategoriesDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouriteCategoriesDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouriteCategoriesDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouriteCategoriesDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouritesDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouritesDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouritesDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouritesDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/HistoryDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/HistoryDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/HistoryDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/HistoryDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaSourcesDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaSourcesDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaSourcesDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaSourcesDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/StatsDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/StatsDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/StatsDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/StatsDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/SuggestionDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/SuggestionDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/SuggestionDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/SuggestionDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/TagsDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TagsDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/TagsDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/TagsDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/TrackLogsDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TrackLogsDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/TrackLogsDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/TrackLogsDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/TracksDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TracksDao.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/dao/TracksDao.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/TracksDao.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/BookmarksEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/BookmarksEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/BookmarksEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/BookmarksEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/EntityMapping.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/EntityMapping.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/EntityMapping.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/EntityMapping.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteCategoryEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteCategoryEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteCategoryEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteCategoryEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryWithManga.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryWithManga.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryWithManga.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryWithManga.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaSourceEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaSourceEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaSourceEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaSourceEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaTagsEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaTagsEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaTagsEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaTagsEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaWithTags.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaWithTags.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaWithTags.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaWithTags.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/StatsEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/StatsEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/StatsEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/StatsEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionWithManga.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionWithManga.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionWithManga.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionWithManga.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/TagEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TagEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/TagEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/TagEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogEntity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogEntity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogEntity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogWithManga.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogWithManga.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogWithManga.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogWithManga.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/database/migrations/Migrations1To2.kt b/app/src/main/java/org/xtimms/shirizu/core/database/migrations/Migrations1To2.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/database/migrations/Migrations1To2.kt
rename to app/src/main/java/org/xtimms/shirizu/core/database/migrations/Migrations1To2.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/exceptions/CloudflareProtectedException.kt b/app/src/main/java/org/xtimms/shirizu/core/exceptions/CloudflareProtectedException.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/exceptions/CloudflareProtectedException.kt
rename to app/src/main/java/org/xtimms/shirizu/core/exceptions/CloudflareProtectedException.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/exceptions/SyncApiException.kt b/app/src/main/java/org/xtimms/shirizu/core/exceptions/SyncApiException.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/exceptions/SyncApiException.kt
rename to app/src/main/java/org/xtimms/shirizu/core/exceptions/SyncApiException.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/exceptions/TooManyRequestExceptions.kt b/app/src/main/java/org/xtimms/shirizu/core/exceptions/TooManyRequestExceptions.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/exceptions/TooManyRequestExceptions.kt
rename to app/src/main/java/org/xtimms/shirizu/core/exceptions/TooManyRequestExceptions.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/logs/FileLogger.kt b/app/src/main/java/org/xtimms/shirizu/core/logs/FileLogger.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/logs/FileLogger.kt
rename to app/src/main/java/org/xtimms/shirizu/core/logs/FileLogger.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/logs/Loggers.kt b/app/src/main/java/org/xtimms/shirizu/core/logs/Loggers.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/logs/Loggers.kt
rename to app/src/main/java/org/xtimms/shirizu/core/logs/Loggers.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/logs/LoggersModule.kt b/app/src/main/java/org/xtimms/shirizu/core/logs/LoggersModule.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/logs/LoggersModule.kt
rename to app/src/main/java/org/xtimms/shirizu/core/logs/LoggersModule.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/Bookmark.kt b/app/src/main/java/org/xtimms/shirizu/core/model/Bookmark.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/Bookmark.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/Bookmark.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/FavouriteCategory.kt b/app/src/main/java/org/xtimms/shirizu/core/model/FavouriteCategory.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/FavouriteCategory.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/FavouriteCategory.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/ListModel.kt b/app/src/main/java/org/xtimms/shirizu/core/model/ListModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/ListModel.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/ListModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/ListSortOrder.kt b/app/src/main/java/org/xtimms/shirizu/core/model/ListSortOrder.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/ListSortOrder.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/ListSortOrder.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/LocalManga.kt b/app/src/main/java/org/xtimms/shirizu/core/model/LocalManga.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/LocalManga.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/LocalManga.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/Manga.kt b/app/src/main/java/org/xtimms/shirizu/core/model/Manga.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/Manga.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/Manga.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/MangaHistory.kt b/app/src/main/java/org/xtimms/shirizu/core/model/MangaHistory.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/MangaHistory.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/MangaHistory.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/MangaSource.kt b/app/src/main/java/org/xtimms/shirizu/core/model/MangaSource.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/MangaSource.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/MangaSource.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/MangaSuggestion.kt b/app/src/main/java/org/xtimms/shirizu/core/model/MangaSuggestion.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/MangaSuggestion.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/MangaSuggestion.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/MangaWithHistory.kt b/app/src/main/java/org/xtimms/shirizu/core/model/MangaWithHistory.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/MangaWithHistory.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/MangaWithHistory.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/ShelfCategory.kt b/app/src/main/java/org/xtimms/shirizu/core/model/ShelfCategory.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/ShelfCategory.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/ShelfCategory.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/TagsBlacklist.kt b/app/src/main/java/org/xtimms/shirizu/core/model/TagsBlacklist.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/TagsBlacklist.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/TagsBlacklist.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcelableMangaTags.kt b/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcelableMangaTags.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcelableMangaTags.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcelableMangaTags.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcerableManga.kt b/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcerableManga.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcerableManga.kt
rename to app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcerableManga.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/MaterialSharedAxis.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/MaterialSharedAxis.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/MaterialSharedAxis.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/MaterialSharedAxis.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/MotionConstants.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/MotionConstants.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/MotionConstants.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/MotionConstants.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/DelayExit.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/DelayExit.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/DelayExit.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/DelayExit.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ElementContainer.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ElementContainer.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ElementContainer.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ElementContainer.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/KeyframeBasedMotion.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/KeyframeBasedMotion.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/KeyframeBasedMotion.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/KeyframeBasedMotion.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MaterialArcMotion.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MaterialArcMotion.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MaterialArcMotion.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MaterialArcMotion.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MathUtils.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MathUtils.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MathUtils.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MathUtils.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/PathMotion.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/PathMotion.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/PathMotion.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/PathMotion.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ProgressThresholds.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ProgressThresholds.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ProgressThresholds.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ProgressThresholds.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/QuadraticBezier.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/QuadraticBezier.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/QuadraticBezier.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/QuadraticBezier.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElement.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElement.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElement.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElement.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsRoot.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsRoot.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsRoot.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsRoot.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsTransitionSpec.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsTransitionSpec.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsTransitionSpec.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsTransitionSpec.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedMaterialContainer.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedMaterialContainer.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedMaterialContainer.kt
rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedMaterialContainer.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/CommonHeaders.kt b/app/src/main/java/org/xtimms/shirizu/core/network/CommonHeaders.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/CommonHeaders.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/CommonHeaders.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/HttpClients.kt b/app/src/main/java/org/xtimms/shirizu/core/network/HttpClients.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/HttpClients.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/HttpClients.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/NetworkModule.kt b/app/src/main/java/org/xtimms/shirizu/core/network/NetworkModule.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/NetworkModule.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/NetworkModule.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/SSLBypass.kt b/app/src/main/java/org/xtimms/shirizu/core/network/SSLBypass.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/SSLBypass.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/SSLBypass.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/cookies/AndroidCookieJar.kt b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/AndroidCookieJar.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/cookies/AndroidCookieJar.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/cookies/AndroidCookieJar.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/cookies/CookieWrapper.kt b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/CookieWrapper.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/cookies/CookieWrapper.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/cookies/CookieWrapper.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/cookies/MutableCookieJar.kt b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/MutableCookieJar.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/cookies/MutableCookieJar.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/cookies/MutableCookieJar.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/cookies/PreferencesCookieJar.kt b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/PreferencesCookieJar.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/cookies/PreferencesCookieJar.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/cookies/PreferencesCookieJar.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/doh/DoHManager.kt b/app/src/main/java/org/xtimms/shirizu/core/network/doh/DoHManager.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/doh/DoHManager.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/doh/DoHManager.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/doh/DoHProvider.kt b/app/src/main/java/org/xtimms/shirizu/core/network/doh/DoHProvider.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/doh/DoHProvider.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/doh/DoHProvider.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CacheLimitInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CacheLimitInterceptor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CacheLimitInterceptor.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CacheLimitInterceptor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CloudflareInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CloudflareInterceptor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CloudflareInterceptor.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CloudflareInterceptor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CommonHeadersInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CommonHeadersInterceptor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CommonHeadersInterceptor.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CommonHeadersInterceptor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/GZipInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/GZipInterceptor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/GZipInterceptor.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/GZipInterceptor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/ImageProxyInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/ImageProxyInterceptor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/ImageProxyInterceptor.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/ImageProxyInterceptor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/RateLimitInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/RateLimitInterceptor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/RateLimitInterceptor.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/RateLimitInterceptor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/proxy/AppProxySelector.kt b/app/src/main/java/org/xtimms/shirizu/core/network/proxy/AppProxySelector.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/proxy/AppProxySelector.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/proxy/AppProxySelector.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/network/proxy/ProxyAuthenticator.kt b/app/src/main/java/org/xtimms/shirizu/core/network/proxy/ProxyAuthenticator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/network/proxy/ProxyAuthenticator.kt
rename to app/src/main/java/org/xtimms/shirizu/core/network/proxy/ProxyAuthenticator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/os/NetworkState.kt b/app/src/main/java/org/xtimms/shirizu/core/os/NetworkState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/os/NetworkState.kt
rename to app/src/main/java/org/xtimms/shirizu/core/os/NetworkState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/LocalMangaRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/LocalMangaRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/LocalMangaRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/LocalMangaRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaDataRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaDataRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaDataRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaDataRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaIntent.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaIntent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaIntent.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaIntent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLinkResolver.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLinkResolver.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLinkResolver.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaLinkResolver.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLoaderContextImpl.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLoaderContextImpl.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLoaderContextImpl.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaLoaderContextImpl.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaParser.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaParser.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaParser.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaParser.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/MangaRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/RemoteMangaRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/RemoteMangaRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/RemoteMangaRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/RemoteMangaRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconFetcher.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconFetcher.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconFetcher.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconFetcher.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconUri.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconUri.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconUri.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconUri.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/CbzFilter.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/CbzFilter.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/CbzFilter.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/CbzFilter.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/DownloadFormat.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/DownloadFormat.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/DownloadFormat.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/DownloadFormat.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/LocalMangaRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/LocalMangaRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/LocalMangaRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/LocalMangaRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/MangaIndex.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/MangaIndex.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/MangaIndex.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/MangaIndex.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/Qualifiers.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/Qualifiers.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/Qualifiers.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/Qualifiers.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/TempFileFilter.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/TempFileFilter.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/TempFileFilter.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/TempFileFilter.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaDirInput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaDirInput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaDirInput.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaDirInput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaInput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaInput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaInput.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaInput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaZipInput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaZipInput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaZipInput.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaZipInput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaDirOutput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaDirOutput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaDirOutput.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaDirOutput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaOutput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaOutput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaOutput.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaOutput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaUtil.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaUtil.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaUtil.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaUtil.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaZipOutput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaZipOutput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaZipOutput.kt
rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaZipOutput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/prefs/AppSettings.kt b/app/src/main/java/org/xtimms/shirizu/core/prefs/AppSettings.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/prefs/AppSettings.kt
rename to app/src/main/java/org/xtimms/shirizu/core/prefs/AppSettings.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/prefs/KotatsuAppSettings.kt b/app/src/main/java/org/xtimms/shirizu/core/prefs/KotatsuAppSettings.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/prefs/KotatsuAppSettings.kt
rename to app/src/main/java/org/xtimms/shirizu/core/prefs/KotatsuAppSettings.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/prefs/SourceSettings.kt b/app/src/main/java/org/xtimms/shirizu/core/prefs/SourceSettings.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/prefs/SourceSettings.kt
rename to app/src/main/java/org/xtimms/shirizu/core/prefs/SourceSettings.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/screens/EmptyScreen.kt b/app/src/main/java/org/xtimms/shirizu/core/screens/EmptyScreen.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/screens/EmptyScreen.kt
rename to app/src/main/java/org/xtimms/shirizu/core/screens/EmptyScreen.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/screens/InfoScreen.kt b/app/src/main/java/org/xtimms/shirizu/core/screens/InfoScreen.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/screens/InfoScreen.kt
rename to app/src/main/java/org/xtimms/shirizu/core/screens/InfoScreen.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/screens/LoadingScreen.kt b/app/src/main/java/org/xtimms/shirizu/core/screens/LoadingScreen.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/screens/LoadingScreen.kt
rename to app/src/main/java/org/xtimms/shirizu/core/screens/LoadingScreen.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAccountAuthenticator.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAccountAuthenticator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAccountAuthenticator.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAccountAuthenticator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAdapterEntryPoint.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAdapterEntryPoint.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAdapterEntryPoint.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAdapterEntryPoint.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthActivity.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthActivity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthActivity.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthActivity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthApi.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthApi.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthApi.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthApi.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthResult.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthResult.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthResult.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthResult.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthViewModel.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticator.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticator.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticatorService.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticatorService.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticatorService.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticatorService.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncController.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncController.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncController.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncController.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHelper.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHelper.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHelper.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncHelper.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHostDialogFragment.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHostDialogFragment.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHostDialogFragment.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncHostDialogFragment.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncInterceptor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncInterceptor.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncInterceptor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncProvider.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncProvider.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncProvider.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncProvider.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncSettings.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncSettings.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/sync/SyncSettings.kt
rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncSettings.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/tracker/Tracker.kt b/app/src/main/java/org/xtimms/shirizu/core/tracker/Tracker.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/tracker/Tracker.kt
rename to app/src/main/java/org/xtimms/shirizu/core/tracker/Tracker.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaTracking.kt b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaTracking.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaTracking.kt
rename to app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaTracking.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaUpdates.kt b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaUpdates.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaUpdates.kt
rename to app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaUpdates.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/tracker/model/TrackingLogItem.kt b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/TrackingLogItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/tracker/model/TrackingLogItem.kt
rename to app/src/main/java/org/xtimms/shirizu/core/tracker/model/TrackingLogItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/MeteredNetworkDialog.kt b/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/MeteredNetworkDialog.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/MeteredNetworkDialog.kt
rename to app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/MeteredNetworkDialog.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/NotificationPermissionDialog.kt b/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/NotificationPermissionDialog.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/NotificationPermissionDialog.kt
rename to app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/NotificationPermissionDialog.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/UpdateDialog.kt b/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/UpdateDialog.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/UpdateDialog.kt
rename to app/src/main/java/org/xtimms/shirizu/core/ui/dialogs/UpdateDialog.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/updates/Updater.kt b/app/src/main/java/org/xtimms/shirizu/core/updates/Updater.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/updates/Updater.kt
rename to app/src/main/java/org/xtimms/shirizu/core/updates/Updater.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/core/zip/ZipOutput.kt b/app/src/main/java/org/xtimms/shirizu/core/zip/ZipOutput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/core/zip/ZipOutput.kt
rename to app/src/main/java/org/xtimms/shirizu/core/zip/ZipOutput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/crash/CrashActivity.kt b/app/src/main/java/org/xtimms/shirizu/crash/CrashActivity.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/crash/CrashActivity.kt
rename to app/src/main/java/org/xtimms/shirizu/crash/CrashActivity.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/crash/CrashScreen.kt b/app/src/main/java/org/xtimms/shirizu/crash/CrashScreen.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/crash/CrashScreen.kt
rename to app/src/main/java/org/xtimms/shirizu/crash/CrashScreen.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/crash/GlobalExceptionHandler.kt b/app/src/main/java/org/xtimms/shirizu/crash/GlobalExceptionHandler.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/crash/GlobalExceptionHandler.kt
rename to app/src/main/java/org/xtimms/shirizu/crash/GlobalExceptionHandler.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/LocalStorageManager.kt b/app/src/main/java/org/xtimms/shirizu/data/LocalStorageManager.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/LocalStorageManager.kt
rename to app/src/main/java/org/xtimms/shirizu/data/LocalStorageManager.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/BookmarksRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/BookmarksRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/BookmarksRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/BookmarksRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/ExploreRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/ExploreRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/ExploreRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/ExploreRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/FavouritesRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/FavouritesRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/FavouritesRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/FavouritesRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/HistoryRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/HistoryRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/HistoryRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/HistoryRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/MangaSourcesRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/MangaSourcesRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/MangaSourcesRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/MangaSourcesRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/StatsRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/StatsRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/StatsRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/StatsRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/SuggestionRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/SuggestionRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/SuggestionRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/SuggestionRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/TrackingRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/TrackingRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/TrackingRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/TrackingRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupEntry.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupEntry.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupEntry.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupEntry.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupRepository.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupRepository.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupRepository.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipInput.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipInput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipInput.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipInput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipOutput.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipOutput.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipOutput.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipOutput.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/CompositeResult.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/CompositeResult.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/CompositeResult.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/CompositeResult.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonDeserializer.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonDeserializer.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonDeserializer.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonDeserializer.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonSerializer.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonSerializer.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonSerializer.kt
rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonSerializer.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/ChapterListItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/ChapterListItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/ChapterListItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/ChapterListItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/ChaptersMapper.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/ChaptersMapper.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/ChaptersMapper.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/ChaptersMapper.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsEvent.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsEvent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsEvent.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsEvent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsInfoHeader.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsInfoHeader.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsInfoHeader.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsInfoHeader.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsUiState.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsUiState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsUiState.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsUiState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewConstants.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewConstants.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewConstants.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewConstants.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DownloadSettingDialog.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DownloadSettingDialog.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/DownloadSettingDialog.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/DownloadSettingDialog.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/FullImageView.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/FullImageView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/FullImageView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/FullImageView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/data/MangaDetails.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/data/MangaDetails.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/data/MangaDetails.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/data/MangaDetails.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/data/ReadingTime.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/data/ReadingTime.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/data/ReadingTime.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/data/ReadingTime.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/BranchComparator.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/BranchComparator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/BranchComparator.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/BranchComparator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsInteractor.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsInteractor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsInteractor.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsInteractor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsLoadUseCase.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsLoadUseCase.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsLoadUseCase.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsLoadUseCase.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/ReadingTimeUseCase.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/ReadingTimeUseCase.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/ReadingTimeUseCase.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/ReadingTimeUseCase.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/RelatedMangaUseCase.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/RelatedMangaUseCase.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/domain/RelatedMangaUseCase.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/RelatedMangaUseCase.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/model/ChapterItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/model/ChapterItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/model/ChapterItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/model/ChapterItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/model/HistoryInfo.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/model/HistoryInfo.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/model/HistoryInfo.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/model/HistoryInfo.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/model/ListModelConversionExt.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/model/ListModelConversionExt.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/model/ListModelConversionExt.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/model/ListModelConversionExt.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/details/model/MangaBranch.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/model/MangaBranch.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/details/model/MangaBranch.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/details/model/MangaBranch.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreEvent.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreEvent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreEvent.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreEvent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreUiState.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreUiState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreUiState.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreUiState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreView.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/SourceItemModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/SourceItemModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/SourceItemModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/explore/SourceItemModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/data/SourcesSortOrder.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/data/SourcesSortOrder.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/explore/data/SourcesSortOrder.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/explore/data/SourcesSortOrder.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedView.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/feed/FeedView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/model/FeedItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/model/FeedItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/model/FeedItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/feed/model/FeedItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/model/ListModelConversionExt.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/model/ListModelConversionExt.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/feed/model/ListModelConversionExt.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/feed/model/ListModelConversionExt.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItemModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItemModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItemModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItemModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryView.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/history/HistoryView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/history/HistoryViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/history/SwipeActions.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/SwipeActions.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/history/SwipeActions.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/history/SwipeActions.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListEvent.kt b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListEvent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListEvent.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/list/MangaListEvent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListUiState.kt b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListUiState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListUiState.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/list/MangaListUiState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListView.kt b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/list/MangaListView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/list/MangaListViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderContent.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderContent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderContent.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderContent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderState.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderState.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderView.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChapterPages.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChapterPages.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChapterPages.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChapterPages.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChaptersLoader.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChaptersLoader.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChaptersLoader.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChaptersLoader.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/PageLoader.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/PageLoader.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/PageLoader.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/domain/PageLoader.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/pager/ReaderPage.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/pager/ReaderPage.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/pager/ReaderPage.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/pager/ReaderPage.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/thumbnails/MangaPageFetcher.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/thumbnails/MangaPageFetcher.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/reader/thumbnails/MangaPageFetcher.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/reader/thumbnails/MangaPageFetcher.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/search/SearchView.kt b/app/src/main/java/org/xtimms/shirizu/sections/search/SearchView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/search/SearchView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/search/SearchView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/about/AboutView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/AboutView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/about/AboutView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/about/AboutView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/about/LicenseView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/LicenseView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/about/LicenseView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/about/LicenseView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/about/OpenSourceLicensesView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/OpenSourceLicensesView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/about/OpenSourceLicensesView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/about/OpenSourceLicensesView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/about/UpdateView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/UpdateView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/about/UpdateView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/about/UpdateView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/advanced/AdvancedView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/advanced/AdvancedView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/advanced/AdvancedView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/advanced/AdvancedView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/AppearanceView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/AppearanceView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/AppearanceView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/AppearanceView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/DarkThemeView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/DarkThemeView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/DarkThemeView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/DarkThemeView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/LanguagesView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/LanguagesView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/LanguagesView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/LanguagesView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgent.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgent.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupEntryModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupEntryModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupEntryModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupEntryModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupObserver.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupObserver.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupObserver.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupObserver.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupRestoreView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupRestoreView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupRestoreView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupRestoreView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/PeriodicalBackupWorker.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/PeriodicalBackupWorker.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/PeriodicalBackupWorker.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/PeriodicalBackupWorker.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreItemsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreItemsView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreItemsView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreItemsView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/network/NetworkView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/network/NetworkView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/network/NetworkView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/network/NetworkView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/services/ServicesView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/services/ServicesView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/services/ServicesView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/services/ServicesView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/services/suggestions/SuggestionsSettingsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/services/suggestions/SuggestionsSettingsView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/services/suggestions/SuggestionsSettingsView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/services/suggestions/SuggestionsSettingsView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/ShelfSettingsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/ShelfSettingsView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/ShelfSettingsView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/ShelfSettingsView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/AddCategoryDialog.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/AddCategoryDialog.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/AddCategoryDialog.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/AddCategoryDialog.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoriesView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoriesView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoriesView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoriesView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoryListItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoryListItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoryListItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoryListItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/interactor/ReorderCategory.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/interactor/ReorderCategory.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/interactor/ReorderCategory.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/interactor/ReorderCategory.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItemModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItemModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItemModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItemModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogPage.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogPage.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogPage.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogPage.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogListProducer.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogListProducer.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogListProducer.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogListProducer.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogPager.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogPager.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogPager.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogPager.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogTabs.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogTabs.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogTabs.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogTabs.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/CleanDialog.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/CleanDialog.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/CleanDialog.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/CleanDialog.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageEvent.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageEvent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageEvent.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageEvent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageUiState.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageUiState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageUiState.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageUiState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteManga.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteManga.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteManga.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteManga.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteTabModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteTabModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteTabModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteTabModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/LazyShelfGrid.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/LazyShelfGrid.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/LazyShelfGrid.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/LazyShelfGrid.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfGrid.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfGrid.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfGrid.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfGrid.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfItem.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfItem.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfManga.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfManga.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfManga.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfManga.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfPager.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfPager.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfPager.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfPager.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfTabs.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfTabs.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfTabs.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfTabs.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfView.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/ChaptersChart.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/ChaptersChart.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/ChaptersChart.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/ChaptersChart.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/MinMaxReadCard.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/MinMaxReadCard.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/MinMaxReadCard.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/MinMaxReadCard.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsCard.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsCard.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsCard.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/StatsCard.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/StatsView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/StatsViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/CategoriesChartCard.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/CategoriesChartCard.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/CategoriesChartCard.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/categories/CategoriesChartCard.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/DonutChart.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/DonutChart.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/DonutChart.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/categories/DonutChart.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/TagAmount.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/TagAmount.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/TagAmount.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/categories/TagAmount.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsCollector.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsCollector.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsCollector.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsCollector.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsPeriod.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsPeriod.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsPeriod.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsPeriod.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsRecord.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsRecord.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsRecord.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/stats/domain/StatsRecord.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionMangaModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionMangaModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionMangaModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionMangaModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsView.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsView.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsView.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsViewModel.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsViewModel.kt
rename to app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsViewModel.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/blend/Blend.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/blend/Blend.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/blend/Blend.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/blend/Blend.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Cam16.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Cam16.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Cam16.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Cam16.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/CamSolver.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/CamSolver.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/CamSolver.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/CamSolver.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Hct.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Hct.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Hct.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Hct.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/ViewingConditions.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/ViewingConditions.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/ViewingConditions.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/ViewingConditions.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/CorePalette.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/CorePalette.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/CorePalette.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/CorePalette.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/TonalPalette.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/TonalPalette.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/TonalPalette.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/TonalPalette.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/ColorUtils.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/ColorUtils.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/ColorUtils.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/ColorUtils.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/MathUtils.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/MathUtils.java
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/MathUtils.java
rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/MathUtils.java
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/monet/ColorSpec.kt b/app/src/main/java/org/xtimms/shirizu/ui/monet/ColorSpec.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/monet/ColorSpec.kt
rename to app/src/main/java/org/xtimms/shirizu/ui/monet/ColorSpec.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/monet/Monet.kt b/app/src/main/java/org/xtimms/shirizu/ui/monet/Monet.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/monet/Monet.kt
rename to app/src/main/java/org/xtimms/shirizu/ui/monet/Monet.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/monet/PaletteStyle.kt b/app/src/main/java/org/xtimms/shirizu/ui/monet/PaletteStyle.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/monet/PaletteStyle.kt
rename to app/src/main/java/org/xtimms/shirizu/ui/monet/PaletteStyle.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/monet/TonalPalettes.kt b/app/src/main/java/org/xtimms/shirizu/ui/monet/TonalPalettes.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/monet/TonalPalettes.kt
rename to app/src/main/java/org/xtimms/shirizu/ui/monet/TonalPalettes.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/theme/Color.kt b/app/src/main/java/org/xtimms/shirizu/ui/theme/Color.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/theme/Color.kt
rename to app/src/main/java/org/xtimms/shirizu/ui/theme/Color.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/theme/Theme.kt b/app/src/main/java/org/xtimms/shirizu/ui/theme/Theme.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/theme/Theme.kt
rename to app/src/main/java/org/xtimms/shirizu/ui/theme/Theme.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/ui/theme/Type.kt b/app/src/main/java/org/xtimms/shirizu/ui/theme/Type.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/ui/theme/Type.kt
rename to app/src/main/java/org/xtimms/shirizu/ui/theme/Type.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/AlphanumComparator.kt b/app/src/main/java/org/xtimms/shirizu/utils/AlphanumComparator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/AlphanumComparator.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/AlphanumComparator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/CancellableSource.kt b/app/src/main/java/org/xtimms/shirizu/utils/CancellableSource.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/CancellableSource.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/CancellableSource.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/CoilImageGetter.kt b/app/src/main/java/org/xtimms/shirizu/utils/CoilImageGetter.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/CoilImageGetter.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/CoilImageGetter.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex.kt b/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex2.kt b/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex2.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex2.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex2.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/CrashLogUtil.kt b/app/src/main/java/org/xtimms/shirizu/utils/CrashLogUtil.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/CrashLogUtil.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/CrashLogUtil.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/DeviceUtil.kt b/app/src/main/java/org/xtimms/shirizu/utils/DeviceUtil.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/DeviceUtil.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/DeviceUtil.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/DomainValidator.kt b/app/src/main/java/org/xtimms/shirizu/utils/DomainValidator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/DomainValidator.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/DomainValidator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/Event.kt b/app/src/main/java/org/xtimms/shirizu/utils/Event.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/Event.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/Event.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/ExtraCloseableSource.kt b/app/src/main/java/org/xtimms/shirizu/utils/ExtraCloseableSource.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/ExtraCloseableSource.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/ExtraCloseableSource.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/FileSequence.kt b/app/src/main/java/org/xtimms/shirizu/utils/FileSequence.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/FileSequence.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/FileSequence.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/FileSize.kt b/app/src/main/java/org/xtimms/shirizu/utils/FileSize.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/FileSize.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/FileSize.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/ImageFileFilter.kt b/app/src/main/java/org/xtimms/shirizu/utils/ImageFileFilter.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/ImageFileFilter.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/ImageFileFilter.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/MaskVisualTransformation.kt b/app/src/main/java/org/xtimms/shirizu/utils/MaskVisualTransformation.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/MaskVisualTransformation.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/MaskVisualTransformation.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/MediatorStateFlow.kt b/app/src/main/java/org/xtimms/shirizu/utils/MediatorStateFlow.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/MediatorStateFlow.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/MediatorStateFlow.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/MetricAffectingSpan.kt b/app/src/main/java/org/xtimms/shirizu/utils/MetricAffectingSpan.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/MetricAffectingSpan.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/MetricAffectingSpan.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/ProgressResponseBody.kt b/app/src/main/java/org/xtimms/shirizu/utils/ProgressResponseBody.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/ProgressResponseBody.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/ProgressResponseBody.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/RetainedLifecycleCoroutineScope.kt b/app/src/main/java/org/xtimms/shirizu/utils/RetainedLifecycleCoroutineScope.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/RetainedLifecycleCoroutineScope.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/RetainedLifecycleCoroutineScope.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/ReversibleAction.kt b/app/src/main/java/org/xtimms/shirizu/utils/ReversibleAction.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/ReversibleAction.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/ReversibleAction.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/ReversibleHandle.kt b/app/src/main/java/org/xtimms/shirizu/utils/ReversibleHandle.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/ReversibleHandle.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/ReversibleHandle.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/ShareHelper.kt b/app/src/main/java/org/xtimms/shirizu/utils/ShareHelper.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/ShareHelper.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/ShareHelper.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/StringArrayNavType.kt b/app/src/main/java/org/xtimms/shirizu/utils/StringArrayNavType.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/StringArrayNavType.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/StringArrayNavType.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/WebViewUtil.kt b/app/src/main/java/org/xtimms/shirizu/utils/WebViewUtil.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/WebViewUtil.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/WebViewUtil.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/composable/Bitmap.kt b/app/src/main/java/org/xtimms/shirizu/utils/composable/Bitmap.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/composable/Bitmap.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/composable/Bitmap.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/composable/LazyListState.kt b/app/src/main/java/org/xtimms/shirizu/utils/composable/LazyListState.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/composable/LazyListState.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/composable/LazyListState.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/composable/Modifier.kt b/app/src/main/java/org/xtimms/shirizu/utils/composable/Modifier.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/composable/Modifier.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/composable/Modifier.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/iterator/CloseableIterator.kt b/app/src/main/java/org/xtimms/shirizu/utils/iterator/CloseableIterator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/iterator/CloseableIterator.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/iterator/CloseableIterator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/iterator/MappingIterator.kt b/app/src/main/java/org/xtimms/shirizu/utils/iterator/MappingIterator.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/iterator/MappingIterator.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/iterator/MappingIterator.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Bundle.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Bundle.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Bundle.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Bundle.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Coil.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Coil.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Coil.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Coil.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Collections.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Collections.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Collections.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Collections.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Coroutines.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Coroutines.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Coroutines.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Coroutines.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Date.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Date.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Date.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Date.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/EventFlow.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/EventFlow.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/EventFlow.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/EventFlow.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Flow.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Flow.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Flow.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Flow.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/FlowObserver.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/FlowObserver.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/FlowObserver.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/FlowObserver.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/IO.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/IO.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/IO.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/IO.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Primitive.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Primitive.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/Primitive.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Primitive.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/String.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/String.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/String.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/String.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/WorkManager.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/WorkManager.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/lang/WorkManager.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/lang/WorkManager.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/material/Color.kt b/app/src/main/java/org/xtimms/shirizu/utils/material/Color.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/material/Color.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/material/Color.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/material/Constants.kt b/app/src/main/java/org/xtimms/shirizu/utils/material/Constants.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/material/Constants.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/material/Constants.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/progress/ProgressDeferred.kt b/app/src/main/java/org/xtimms/shirizu/utils/progress/ProgressDeferred.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/progress/ProgressDeferred.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/progress/ProgressDeferred.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Android.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Android.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Android.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Android.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Context.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Context.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Context.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Context.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Cursor.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Cursor.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Cursor.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Cursor.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/File.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/File.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/File.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/File.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Http.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Http.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Http.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Http.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Intent.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Intent.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Intent.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Intent.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Locale.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Locale.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Locale.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Locale.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Network.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Network.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Network.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Network.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/PaddingValues.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/PaddingValues.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/PaddingValues.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/PaddingValues.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Preferences.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Preferences.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Preferences.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Preferences.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Throwable.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Throwable.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Throwable.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Throwable.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Toast.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Toast.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Toast.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Toast.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Uri.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Uri.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/utils/system/Uri.kt
rename to app/src/main/java/org/xtimms/shirizu/utils/system/Uri.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/work/PeriodicWorkScheduler.kt b/app/src/main/java/org/xtimms/shirizu/work/PeriodicWorkScheduler.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/work/PeriodicWorkScheduler.kt
rename to app/src/main/java/org/xtimms/shirizu/work/PeriodicWorkScheduler.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/work/WorkScheduleManager.kt b/app/src/main/java/org/xtimms/shirizu/work/WorkScheduleManager.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/work/WorkScheduleManager.kt
rename to app/src/main/java/org/xtimms/shirizu/work/WorkScheduleManager.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/work/suggestions/SuggestionsWorker.kt b/app/src/main/java/org/xtimms/shirizu/work/suggestions/SuggestionsWorker.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/work/suggestions/SuggestionsWorker.kt
rename to app/src/main/java/org/xtimms/shirizu/work/suggestions/SuggestionsWorker.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackWorker.kt b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackWorker.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackWorker.kt
rename to app/src/main/java/org/xtimms/shirizu/work/tracker/TrackWorker.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackerNotificationChannels.kt b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackerNotificationChannels.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackerNotificationChannels.kt
rename to app/src/main/java/org/xtimms/shirizu/work/tracker/TrackerNotificationChannels.kt
diff --git a/android-app/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackingItem.kt b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackingItem.kt
similarity index 100%
rename from android-app/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackingItem.kt
rename to app/src/main/java/org/xtimms/shirizu/work/tracker/TrackingItem.kt
diff --git a/android-app/app/src/main/res/drawable-hdpi/ic_stat_shirizu.png b/app/src/main/res/drawable-hdpi/ic_stat_shirizu.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-hdpi/ic_stat_shirizu.png
rename to app/src/main/res/drawable-hdpi/ic_stat_shirizu.png
diff --git a/android-app/app/src/main/res/drawable-hdpi/ic_stat_suggestion.png b/app/src/main/res/drawable-hdpi/ic_stat_suggestion.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-hdpi/ic_stat_suggestion.png
rename to app/src/main/res/drawable-hdpi/ic_stat_suggestion.png
diff --git a/android-app/app/src/main/res/drawable-mdpi/ic_stat_shirizu.png b/app/src/main/res/drawable-mdpi/ic_stat_shirizu.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-mdpi/ic_stat_shirizu.png
rename to app/src/main/res/drawable-mdpi/ic_stat_shirizu.png
diff --git a/android-app/app/src/main/res/drawable-mdpi/ic_stat_suggestion.png b/app/src/main/res/drawable-mdpi/ic_stat_suggestion.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-mdpi/ic_stat_suggestion.png
rename to app/src/main/res/drawable-mdpi/ic_stat_suggestion.png
diff --git a/android-app/app/src/main/res/drawable-night-v31/splash_branding_image.xml b/app/src/main/res/drawable-night-v31/splash_branding_image.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable-night-v31/splash_branding_image.xml
rename to app/src/main/res/drawable-night-v31/splash_branding_image.xml
diff --git a/android-app/app/src/main/res/drawable-night-v31/splash_icon.xml b/app/src/main/res/drawable-night-v31/splash_icon.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable-night-v31/splash_icon.xml
rename to app/src/main/res/drawable-night-v31/splash_icon.xml
diff --git a/android-app/app/src/main/res/drawable-night/splash_icon.xml b/app/src/main/res/drawable-night/splash_icon.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable-night/splash_icon.xml
rename to app/src/main/res/drawable-night/splash_icon.xml
diff --git a/android-app/app/src/main/res/drawable-nodpi/sample.webp b/app/src/main/res/drawable-nodpi/sample.webp
similarity index 100%
rename from android-app/app/src/main/res/drawable-nodpi/sample.webp
rename to app/src/main/res/drawable-nodpi/sample.webp
diff --git a/android-app/app/src/main/res/drawable-nodpi/sample1.webp b/app/src/main/res/drawable-nodpi/sample1.webp
similarity index 100%
rename from android-app/app/src/main/res/drawable-nodpi/sample1.webp
rename to app/src/main/res/drawable-nodpi/sample1.webp
diff --git a/android-app/app/src/main/res/drawable-v31/splash_branding_image.xml b/app/src/main/res/drawable-v31/splash_branding_image.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable-v31/splash_branding_image.xml
rename to app/src/main/res/drawable-v31/splash_branding_image.xml
diff --git a/android-app/app/src/main/res/drawable-v31/splash_icon.xml b/app/src/main/res/drawable-v31/splash_icon.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable-v31/splash_icon.xml
rename to app/src/main/res/drawable-v31/splash_icon.xml
diff --git a/android-app/app/src/main/res/drawable-xhdpi/ic_stat_shirizu.png b/app/src/main/res/drawable-xhdpi/ic_stat_shirizu.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-xhdpi/ic_stat_shirizu.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_shirizu.png
diff --git a/android-app/app/src/main/res/drawable-xhdpi/ic_stat_suggestion.png b/app/src/main/res/drawable-xhdpi/ic_stat_suggestion.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-xhdpi/ic_stat_suggestion.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_suggestion.png
diff --git a/android-app/app/src/main/res/drawable-xxhdpi/ic_stat_shirizu.png b/app/src/main/res/drawable-xxhdpi/ic_stat_shirizu.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-xxhdpi/ic_stat_shirizu.png
rename to app/src/main/res/drawable-xxhdpi/ic_stat_shirizu.png
diff --git a/android-app/app/src/main/res/drawable-xxhdpi/ic_stat_suggestion.png b/app/src/main/res/drawable-xxhdpi/ic_stat_suggestion.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-xxhdpi/ic_stat_suggestion.png
rename to app/src/main/res/drawable-xxhdpi/ic_stat_suggestion.png
diff --git a/android-app/app/src/main/res/drawable-xxxhdpi/ic_stat_shirizu.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_shirizu.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-xxxhdpi/ic_stat_shirizu.png
rename to app/src/main/res/drawable-xxxhdpi/ic_stat_shirizu.png
diff --git a/android-app/app/src/main/res/drawable-xxxhdpi/ic_stat_suggestion.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_suggestion.png
similarity index 100%
rename from android-app/app/src/main/res/drawable-xxxhdpi/ic_stat_suggestion.png
rename to app/src/main/res/drawable-xxxhdpi/ic_stat_suggestion.png
diff --git a/android-app/app/src/main/res/drawable/anim_caret_down.xml b/app/src/main/res/drawable/anim_caret_down.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/anim_caret_down.xml
rename to app/src/main/res/drawable/anim_caret_down.xml
diff --git a/android-app/app/src/main/res/drawable/baseline_error_outline_24.xml b/app/src/main/res/drawable/baseline_error_outline_24.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/baseline_error_outline_24.xml
rename to app/src/main/res/drawable/baseline_error_outline_24.xml
diff --git a/android-app/app/src/main/res/drawable/cover_error.xml b/app/src/main/res/drawable/cover_error.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/cover_error.xml
rename to app/src/main/res/drawable/cover_error.xml
diff --git a/android-app/app/src/main/res/drawable/cover_loading.xml b/app/src/main/res/drawable/cover_loading.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/cover_loading.xml
rename to app/src/main/res/drawable/cover_loading.xml
diff --git a/android-app/app/src/main/res/drawable/outline_cloud_sync_24.xml b/app/src/main/res/drawable/outline_cloud_sync_24.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/outline_cloud_sync_24.xml
rename to app/src/main/res/drawable/outline_cloud_sync_24.xml
diff --git a/android-app/app/src/main/res/drawable/outline_expand_more_24.xml b/app/src/main/res/drawable/outline_expand_more_24.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/outline_expand_more_24.xml
rename to app/src/main/res/drawable/outline_expand_more_24.xml
diff --git a/android-app/app/src/main/res/drawable/outline_settings_24.xml b/app/src/main/res/drawable/outline_settings_24.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/outline_settings_24.xml
rename to app/src/main/res/drawable/outline_settings_24.xml
diff --git a/android-app/app/src/main/res/drawable/shape_soft_star_1.xml b/app/src/main/res/drawable/shape_soft_star_1.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/shape_soft_star_1.xml
rename to app/src/main/res/drawable/shape_soft_star_1.xml
diff --git a/android-app/app/src/main/res/drawable/shape_soft_star_2.xml b/app/src/main/res/drawable/shape_soft_star_2.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/shape_soft_star_2.xml
rename to app/src/main/res/drawable/shape_soft_star_2.xml
diff --git a/android-app/app/src/main/res/drawable/splash_icon.xml b/app/src/main/res/drawable/splash_icon.xml
similarity index 100%
rename from android-app/app/src/main/res/drawable/splash_icon.xml
rename to app/src/main/res/drawable/splash_icon.xml
diff --git a/android-app/app/src/main/res/font/roboto_flex_regular.ttf b/app/src/main/res/font/roboto_flex_regular.ttf
similarity index 100%
rename from android-app/app/src/main/res/font/roboto_flex_regular.ttf
rename to app/src/main/res/font/roboto_flex_regular.ttf
diff --git a/android-app/app/src/main/res/layout/activity_sync_auth.xml b/app/src/main/res/layout/activity_sync_auth.xml
similarity index 100%
rename from android-app/app/src/main/res/layout/activity_sync_auth.xml
rename to app/src/main/res/layout/activity_sync_auth.xml
diff --git a/android-app/app/src/main/res/layout/preference_dialog_autocomplete_text_view.xml b/app/src/main/res/layout/preference_dialog_autocomplete_text_view.xml
similarity index 100%
rename from android-app/app/src/main/res/layout/preference_dialog_autocomplete_text_view.xml
rename to app/src/main/res/layout/preference_dialog_autocomplete_text_view.xml
diff --git a/android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android-app/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android-app/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/android-app/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android-app/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
diff --git a/android-app/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android-app/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/android-app/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android-app/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
diff --git a/android-app/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android-app/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/android-app/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android-app/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
diff --git a/android-app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android-app/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/android-app/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android-app/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
diff --git a/android-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/android-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
similarity index 100%
rename from android-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
diff --git a/android-app/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
similarity index 100%
rename from android-app/app/src/main/res/resources.properties
rename to app/src/main/res/resources.properties
diff --git a/android-app/app/src/main/res/values-night/splash_theme.xml b/app/src/main/res/values-night/splash_theme.xml
similarity index 100%
rename from android-app/app/src/main/res/values-night/splash_theme.xml
rename to app/src/main/res/values-night/splash_theme.xml
diff --git a/android-app/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
similarity index 100%
rename from android-app/app/src/main/res/values-ru/strings.xml
rename to app/src/main/res/values-ru/strings.xml
diff --git a/android-app/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
similarity index 100%
rename from android-app/app/src/main/res/values-v31/themes.xml
rename to app/src/main/res/values-v31/themes.xml
diff --git a/android-app/app/src/main/res/values-v33/bools.xml b/app/src/main/res/values-v33/bools.xml
similarity index 100%
rename from android-app/app/src/main/res/values-v33/bools.xml
rename to app/src/main/res/values-v33/bools.xml
diff --git a/android-app/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
similarity index 100%
rename from android-app/app/src/main/res/values/bools.xml
rename to app/src/main/res/values/bools.xml
diff --git a/android-app/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from android-app/app/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/android-app/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
similarity index 100%
rename from android-app/app/src/main/res/values/constants.xml
rename to app/src/main/res/values/constants.xml
diff --git a/android-app/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from android-app/app/src/main/res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/android-app/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
similarity index 100%
rename from android-app/app/src/main/res/values/plurals.xml
rename to app/src/main/res/values/plurals.xml
diff --git a/android-app/app/src/main/res/values/splash_theme.xml b/app/src/main/res/values/splash_theme.xml
similarity index 100%
rename from android-app/app/src/main/res/values/splash_theme.xml
rename to app/src/main/res/values/splash_theme.xml
diff --git a/android-app/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from android-app/app/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/android-app/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
similarity index 100%
rename from android-app/app/src/main/res/values/themes.xml
rename to app/src/main/res/values/themes.xml
diff --git a/android-app/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
similarity index 100%
rename from android-app/app/src/main/res/xml/backup_rules.xml
rename to app/src/main/res/xml/backup_rules.xml
diff --git a/android-app/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
similarity index 100%
rename from android-app/app/src/main/res/xml/data_extraction_rules.xml
rename to app/src/main/res/xml/data_extraction_rules.xml
diff --git a/android-app/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
similarity index 100%
rename from android-app/app/src/main/res/xml/network_security_config.xml
rename to app/src/main/res/xml/network_security_config.xml
diff --git a/android-app/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
similarity index 100%
rename from android-app/app/src/main/res/xml/provider_paths.xml
rename to app/src/main/res/xml/provider_paths.xml
diff --git a/android-app/app/src/test/java/org/xtimms/shirizu/ExampleUnitTest.kt b/app/src/test/java/org/xtimms/shirizu/ExampleUnitTest.kt
similarity index 100%
rename from android-app/app/src/test/java/org/xtimms/shirizu/ExampleUnitTest.kt
rename to app/src/test/java/org/xtimms/shirizu/ExampleUnitTest.kt
diff --git a/android-app/app/src/test/java/org/xtimms/shirizu/data/repository/backup/JsonSerializerTest.kt b/app/src/test/java/org/xtimms/shirizu/data/repository/backup/JsonSerializerTest.kt
similarity index 100%
rename from android-app/app/src/test/java/org/xtimms/shirizu/data/repository/backup/JsonSerializerTest.kt
rename to app/src/test/java/org/xtimms/shirizu/data/repository/backup/JsonSerializerTest.kt
diff --git a/android-app/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
similarity index 96%
rename from android-app/benchmark/build.gradle.kts
rename to benchmark/build.gradle.kts
index 840b255..f3ac99c 100644
--- a/android-app/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -34,7 +34,7 @@ android {
         }
     }
 
-    targetProjectPath = ":android-app:app"
+    targetProjectPath = ":app"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 
diff --git a/android-app/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml
similarity index 100%
rename from android-app/benchmark/src/main/AndroidManifest.xml
rename to benchmark/src/main/AndroidManifest.xml
diff --git a/android-app/benchmark/src/main/java/app/shirizu/benchmark/BaselineProfileGenerator.kt b/benchmark/src/main/java/app/shirizu/benchmark/BaselineProfileGenerator.kt
similarity index 100%
rename from android-app/benchmark/src/main/java/app/shirizu/benchmark/BaselineProfileGenerator.kt
rename to benchmark/src/main/java/app/shirizu/benchmark/BaselineProfileGenerator.kt
diff --git a/android-app/benchmark/src/main/java/app/shirizu/benchmark/StartupBenchmark.kt b/benchmark/src/main/java/app/shirizu/benchmark/StartupBenchmark.kt
similarity index 100%
rename from android-app/benchmark/src/main/java/app/shirizu/benchmark/StartupBenchmark.kt
rename to benchmark/src/main/java/app/shirizu/benchmark/StartupBenchmark.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 848b74f..2b020fe 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,5 +15,5 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "Shirizu"
-include(":android-app:app")
-include(":android-app:benchmark")
+include(":app")
+include(":benchmark")