diff --git a/.gitignore b/.gitignore
index 5ed1214c..c8f6aa79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,46 +1,2 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
 .vscode/
 *.code-workspace
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/free*
-/android/app/paid*
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 00000000..5ed1214c
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1,46 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+.vscode/
+*.code-workspace
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/free*
+/android/app/paid*
diff --git a/.gitlab-ci.yml b/app/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yml
rename to app/.gitlab-ci.yml
diff --git a/.metadata b/app/.metadata
similarity index 100%
rename from .metadata
rename to app/.metadata
diff --git a/LICENSE b/app/LICENSE
similarity index 100%
rename from LICENSE
rename to app/LICENSE
diff --git a/README.md b/app/README.md
similarity index 100%
rename from README.md
rename to app/README.md
diff --git a/analysis_options.yaml b/app/analysis_options.yaml
similarity index 100%
rename from analysis_options.yaml
rename to app/analysis_options.yaml
diff --git a/android/.gitignore b/app/android/.gitignore
similarity index 100%
rename from android/.gitignore
rename to app/android/.gitignore
diff --git a/android/app/build.gradle b/app/android/app/build.gradle
similarity index 100%
rename from android/app/build.gradle
rename to app/android/app/build.gradle
diff --git a/android/app/proguard-rules.pro b/app/android/app/proguard-rules.pro
similarity index 100%
rename from android/app/proguard-rules.pro
rename to app/android/app/proguard-rules.pro
diff --git a/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/app/src/main/AndroidManifest.xml
rename to app/android/app/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/CustomHostnameVerifier.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/CustomHostnameVerifier.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/CustomHostnameVerifier.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/CustomHostnameVerifier.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/CustomKeyStoresTrustManager.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/CustomKeyStoresTrustManager.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/CustomKeyStoresTrustManager.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/CustomKeyStoresTrustManager.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/CustomSSLSocketFactory.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/CustomSSLSocketFactory.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/CustomSSLSocketFactory.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/CustomSSLSocketFactory.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/DownloadEventChannelHandler.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/DownloadEventChannelHandler.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/DownloadEventChannelHandler.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/DownloadEventChannelHandler.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/K.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/K.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/K.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/K.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/MainActivity.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/MainActivity.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/MainActivity.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/MainActivity.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/MediaStoreChannelHandler.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/MediaStoreChannelHandler.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/MediaStoreChannelHandler.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/MediaStoreChannelHandler.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/NotificationChannelHandler.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/NotificationChannelHandler.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/NotificationChannelHandler.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/NotificationChannelHandler.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/PermissionHandler.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/PermissionHandler.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/PermissionHandler.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/PermissionHandler.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/SelfSignedCertChannelHandler.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/SelfSignedCertChannelHandler.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/SelfSignedCertChannelHandler.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/SelfSignedCertChannelHandler.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/SelfSignedCertManager.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/SelfSignedCertManager.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/SelfSignedCertManager.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/SelfSignedCertManager.kt
diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/ShareChannelHandler.kt b/app/android/app/src/main/kotlin/com/nkming/nc_photos/ShareChannelHandler.kt
similarity index 100%
rename from android/app/src/main/kotlin/com/nkming/nc_photos/ShareChannelHandler.kt
rename to app/android/app/src/main/kotlin/com/nkming/nc_photos/ShareChannelHandler.kt
diff --git a/android/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml b/app/android/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
similarity index 100%
rename from android/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
rename to app/android/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
diff --git a/android/app/src/main/res/drawable-hdpi/baseline_download_white_18.png b/app/android/app/src/main/res/drawable-hdpi/baseline_download_white_18.png
similarity index 100%
rename from android/app/src/main/res/drawable-hdpi/baseline_download_white_18.png
rename to app/android/app/src/main/res/drawable-hdpi/baseline_download_white_18.png
diff --git a/android/app/src/main/res/drawable-mdpi/baseline_download_white_18.png b/app/android/app/src/main/res/drawable-mdpi/baseline_download_white_18.png
similarity index 100%
rename from android/app/src/main/res/drawable-mdpi/baseline_download_white_18.png
rename to app/android/app/src/main/res/drawable-mdpi/baseline_download_white_18.png
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/app/android/app/src/main/res/drawable-v21/launch_background.xml
similarity index 100%
rename from android/app/src/main/res/drawable-v21/launch_background.xml
rename to app/android/app/src/main/res/drawable-v21/launch_background.xml
diff --git a/android/app/src/main/res/drawable-xhdpi/baseline_download_white_18.png b/app/android/app/src/main/res/drawable-xhdpi/baseline_download_white_18.png
similarity index 100%
rename from android/app/src/main/res/drawable-xhdpi/baseline_download_white_18.png
rename to app/android/app/src/main/res/drawable-xhdpi/baseline_download_white_18.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/baseline_download_white_18.png b/app/android/app/src/main/res/drawable-xxhdpi/baseline_download_white_18.png
similarity index 100%
rename from android/app/src/main/res/drawable-xxhdpi/baseline_download_white_18.png
rename to app/android/app/src/main/res/drawable-xxhdpi/baseline_download_white_18.png
diff --git a/android/app/src/main/res/drawable-xxxhdpi/baseline_download_white_18.png b/app/android/app/src/main/res/drawable-xxxhdpi/baseline_download_white_18.png
similarity index 100%
rename from android/app/src/main/res/drawable-xxxhdpi/baseline_download_white_18.png
rename to app/android/app/src/main/res/drawable-xxxhdpi/baseline_download_white_18.png
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/app/android/app/src/main/res/drawable/launch_background.xml
similarity index 100%
rename from android/app/src/main/res/drawable/launch_background.xml
rename to app/android/app/src/main/res/drawable/launch_background.xml
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/values-night/styles.xml b/app/android/app/src/main/res/values-night/styles.xml
similarity index 100%
rename from android/app/src/main/res/values-night/styles.xml
rename to app/android/app/src/main/res/values-night/styles.xml
diff --git a/android/app/src/main/res/values/strings.xml b/app/android/app/src/main/res/values/strings.xml
similarity index 100%
rename from android/app/src/main/res/values/strings.xml
rename to app/android/app/src/main/res/values/strings.xml
diff --git a/android/app/src/main/res/values/styles.xml b/app/android/app/src/main/res/values/styles.xml
similarity index 100%
rename from android/app/src/main/res/values/styles.xml
rename to app/android/app/src/main/res/values/styles.xml
diff --git a/android/app/src/main/res/xml/file_paths.xml b/app/android/app/src/main/res/xml/file_paths.xml
similarity index 100%
rename from android/app/src/main/res/xml/file_paths.xml
rename to app/android/app/src/main/res/xml/file_paths.xml
diff --git a/android/app/src/main/res/xml/network_security_config.xml b/app/android/app/src/main/res/xml/network_security_config.xml
similarity index 100%
rename from android/app/src/main/res/xml/network_security_config.xml
rename to app/android/app/src/main/res/xml/network_security_config.xml
diff --git a/android/build.gradle b/app/android/build.gradle
similarity index 100%
rename from android/build.gradle
rename to app/android/build.gradle
diff --git a/android/gradle.properties b/app/android/gradle.properties
similarity index 100%
rename from android/gradle.properties
rename to app/android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.properties
rename to app/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/settings.gradle b/app/android/settings.gradle
similarity index 100%
rename from android/settings.gradle
rename to app/android/settings.gradle
diff --git a/assets/2.0x/gps_map_pin.png b/app/assets/2.0x/gps_map_pin.png
similarity index 100%
rename from assets/2.0x/gps_map_pin.png
rename to app/assets/2.0x/gps_map_pin.png
diff --git a/assets/2.0x/ic_dark_mode_switch_24dp.png b/app/assets/2.0x/ic_dark_mode_switch_24dp.png
similarity index 100%
rename from assets/2.0x/ic_dark_mode_switch_24dp.png
rename to app/assets/2.0x/ic_dark_mode_switch_24dp.png
diff --git a/assets/2.0x/setup_hidden_pref_dir.png b/app/assets/2.0x/setup_hidden_pref_dir.png
similarity index 100%
rename from assets/2.0x/setup_hidden_pref_dir.png
rename to app/assets/2.0x/setup_hidden_pref_dir.png
diff --git a/assets/3.0x/gps_map_pin.png b/app/assets/3.0x/gps_map_pin.png
similarity index 100%
rename from assets/3.0x/gps_map_pin.png
rename to app/assets/3.0x/gps_map_pin.png
diff --git a/assets/gps_map_pin.png b/app/assets/gps_map_pin.png
similarity index 100%
rename from assets/gps_map_pin.png
rename to app/assets/gps_map_pin.png
diff --git a/assets/ic_dark_mode_switch_24dp.png b/app/assets/ic_dark_mode_switch_24dp.png
similarity index 100%
rename from assets/ic_dark_mode_switch_24dp.png
rename to app/assets/ic_dark_mode_switch_24dp.png
diff --git a/assets/setup_hidden_pref_dir.png b/app/assets/setup_hidden_pref_dir.png
similarity index 100%
rename from assets/setup_hidden_pref_dir.png
rename to app/assets/setup_hidden_pref_dir.png
diff --git a/l10n.yaml b/app/l10n.yaml
similarity index 100%
rename from l10n.yaml
rename to app/l10n.yaml
diff --git a/lib/account.dart b/app/lib/account.dart
similarity index 100%
rename from lib/account.dart
rename to app/lib/account.dart
diff --git a/lib/api/api.dart b/app/lib/api/api.dart
similarity index 100%
rename from lib/api/api.dart
rename to app/lib/api/api.dart
diff --git a/lib/api/api_util.dart b/app/lib/api/api_util.dart
similarity index 100%
rename from lib/api/api_util.dart
rename to app/lib/api/api_util.dart
diff --git a/lib/app_db.dart b/app/lib/app_db.dart
similarity index 100%
rename from lib/app_db.dart
rename to app/lib/app_db.dart
diff --git a/lib/app_localizations.dart b/app/lib/app_localizations.dart
similarity index 100%
rename from lib/app_localizations.dart
rename to app/lib/app_localizations.dart
diff --git a/lib/async_util.dart b/app/lib/async_util.dart
similarity index 100%
rename from lib/async_util.dart
rename to app/lib/async_util.dart
diff --git a/lib/bloc/album_search.dart b/app/lib/bloc/album_search.dart
similarity index 100%
rename from lib/bloc/album_search.dart
rename to app/lib/bloc/album_search.dart
diff --git a/lib/bloc/app_password_exchange.dart b/app/lib/bloc/app_password_exchange.dart
similarity index 100%
rename from lib/bloc/app_password_exchange.dart
rename to app/lib/bloc/app_password_exchange.dart
diff --git a/lib/bloc/bloc_util.dart b/app/lib/bloc/bloc_util.dart
similarity index 100%
rename from lib/bloc/bloc_util.dart
rename to app/lib/bloc/bloc_util.dart
diff --git a/lib/bloc/list_album.dart b/app/lib/bloc/list_album.dart
similarity index 100%
rename from lib/bloc/list_album.dart
rename to app/lib/bloc/list_album.dart
diff --git a/lib/bloc/list_album_share_outlier.dart b/app/lib/bloc/list_album_share_outlier.dart
similarity index 100%
rename from lib/bloc/list_album_share_outlier.dart
rename to app/lib/bloc/list_album_share_outlier.dart
diff --git a/lib/bloc/list_face.dart b/app/lib/bloc/list_face.dart
similarity index 100%
rename from lib/bloc/list_face.dart
rename to app/lib/bloc/list_face.dart
diff --git a/lib/bloc/list_favorite.dart b/app/lib/bloc/list_favorite.dart
similarity index 100%
rename from lib/bloc/list_favorite.dart
rename to app/lib/bloc/list_favorite.dart
diff --git a/lib/bloc/list_importable_album.dart b/app/lib/bloc/list_importable_album.dart
similarity index 100%
rename from lib/bloc/list_importable_album.dart
rename to app/lib/bloc/list_importable_album.dart
diff --git a/lib/bloc/list_person.dart b/app/lib/bloc/list_person.dart
similarity index 100%
rename from lib/bloc/list_person.dart
rename to app/lib/bloc/list_person.dart
diff --git a/lib/bloc/list_share.dart b/app/lib/bloc/list_share.dart
similarity index 100%
rename from lib/bloc/list_share.dart
rename to app/lib/bloc/list_share.dart
diff --git a/lib/bloc/list_sharee.dart b/app/lib/bloc/list_sharee.dart
similarity index 100%
rename from lib/bloc/list_sharee.dart
rename to app/lib/bloc/list_sharee.dart
diff --git a/lib/bloc/list_sharing.dart b/app/lib/bloc/list_sharing.dart
similarity index 100%
rename from lib/bloc/list_sharing.dart
rename to app/lib/bloc/list_sharing.dart
diff --git a/lib/bloc/list_tag.dart b/app/lib/bloc/list_tag.dart
similarity index 100%
rename from lib/bloc/list_tag.dart
rename to app/lib/bloc/list_tag.dart
diff --git a/lib/bloc/ls_dir.dart b/app/lib/bloc/ls_dir.dart
similarity index 100%
rename from lib/bloc/ls_dir.dart
rename to app/lib/bloc/ls_dir.dart
diff --git a/lib/bloc/ls_trashbin.dart b/app/lib/bloc/ls_trashbin.dart
similarity index 100%
rename from lib/bloc/ls_trashbin.dart
rename to app/lib/bloc/ls_trashbin.dart
diff --git a/lib/bloc/scan_account_dir.dart b/app/lib/bloc/scan_account_dir.dart
similarity index 100%
rename from lib/bloc/scan_account_dir.dart
rename to app/lib/bloc/scan_account_dir.dart
diff --git a/lib/bloc/search_suggestion.dart b/app/lib/bloc/search_suggestion.dart
similarity index 100%
rename from lib/bloc/search_suggestion.dart
rename to app/lib/bloc/search_suggestion.dart
diff --git a/lib/cache_manager_util.dart b/app/lib/cache_manager_util.dart
similarity index 100%
rename from lib/cache_manager_util.dart
rename to app/lib/cache_manager_util.dart
diff --git a/lib/changelog.dart b/app/lib/changelog.dart
similarity index 100%
rename from lib/changelog.dart
rename to app/lib/changelog.dart
diff --git a/lib/ci_string.dart b/app/lib/ci_string.dart
similarity index 100%
rename from lib/ci_string.dart
rename to app/lib/ci_string.dart
diff --git a/lib/connectivity_util.dart b/app/lib/connectivity_util.dart
similarity index 100%
rename from lib/connectivity_util.dart
rename to app/lib/connectivity_util.dart
diff --git a/lib/date_time_extension.dart b/app/lib/date_time_extension.dart
similarity index 100%
rename from lib/date_time_extension.dart
rename to app/lib/date_time_extension.dart
diff --git a/lib/debug_util.dart b/app/lib/debug_util.dart
similarity index 100%
rename from lib/debug_util.dart
rename to app/lib/debug_util.dart
diff --git a/lib/di_container.dart b/app/lib/di_container.dart
similarity index 100%
rename from lib/di_container.dart
rename to app/lib/di_container.dart
diff --git a/lib/double_extension.dart b/app/lib/double_extension.dart
similarity index 100%
rename from lib/double_extension.dart
rename to app/lib/double_extension.dart
diff --git a/lib/download_handler.dart b/app/lib/download_handler.dart
similarity index 100%
rename from lib/download_handler.dart
rename to app/lib/download_handler.dart
diff --git a/lib/entity/album.dart b/app/lib/entity/album.dart
similarity index 100%
rename from lib/entity/album.dart
rename to app/lib/entity/album.dart
diff --git a/lib/entity/album/cover_provider.dart b/app/lib/entity/album/cover_provider.dart
similarity index 100%
rename from lib/entity/album/cover_provider.dart
rename to app/lib/entity/album/cover_provider.dart
diff --git a/lib/entity/album/item.dart b/app/lib/entity/album/item.dart
similarity index 100%
rename from lib/entity/album/item.dart
rename to app/lib/entity/album/item.dart
diff --git a/lib/entity/album/provider.dart b/app/lib/entity/album/provider.dart
similarity index 100%
rename from lib/entity/album/provider.dart
rename to app/lib/entity/album/provider.dart
diff --git a/lib/entity/album/sort_provider.dart b/app/lib/entity/album/sort_provider.dart
similarity index 100%
rename from lib/entity/album/sort_provider.dart
rename to app/lib/entity/album/sort_provider.dart
diff --git a/lib/entity/album/upgrader.dart b/app/lib/entity/album/upgrader.dart
similarity index 100%
rename from lib/entity/album/upgrader.dart
rename to app/lib/entity/album/upgrader.dart
diff --git a/lib/entity/album_util.dart b/app/lib/entity/album_util.dart
similarity index 100%
rename from lib/entity/album_util.dart
rename to app/lib/entity/album_util.dart
diff --git a/lib/entity/exif.dart b/app/lib/entity/exif.dart
similarity index 100%
rename from lib/entity/exif.dart
rename to app/lib/entity/exif.dart
diff --git a/lib/entity/face.dart b/app/lib/entity/face.dart
similarity index 100%
rename from lib/entity/face.dart
rename to app/lib/entity/face.dart
diff --git a/lib/entity/face/data_source.dart b/app/lib/entity/face/data_source.dart
similarity index 100%
rename from lib/entity/face/data_source.dart
rename to app/lib/entity/face/data_source.dart
diff --git a/lib/entity/favorite.dart b/app/lib/entity/favorite.dart
similarity index 100%
rename from lib/entity/favorite.dart
rename to app/lib/entity/favorite.dart
diff --git a/lib/entity/favorite/data_source.dart b/app/lib/entity/favorite/data_source.dart
similarity index 100%
rename from lib/entity/favorite/data_source.dart
rename to app/lib/entity/favorite/data_source.dart
diff --git a/lib/entity/file.dart b/app/lib/entity/file.dart
similarity index 100%
rename from lib/entity/file.dart
rename to app/lib/entity/file.dart
diff --git a/lib/entity/file/data_source.dart b/app/lib/entity/file/data_source.dart
similarity index 100%
rename from lib/entity/file/data_source.dart
rename to app/lib/entity/file/data_source.dart
diff --git a/lib/entity/file/file_cache_manager.dart b/app/lib/entity/file/file_cache_manager.dart
similarity index 100%
rename from lib/entity/file/file_cache_manager.dart
rename to app/lib/entity/file/file_cache_manager.dart
diff --git a/lib/entity/file_util.dart b/app/lib/entity/file_util.dart
similarity index 100%
rename from lib/entity/file_util.dart
rename to app/lib/entity/file_util.dart
diff --git a/lib/entity/person.dart b/app/lib/entity/person.dart
similarity index 100%
rename from lib/entity/person.dart
rename to app/lib/entity/person.dart
diff --git a/lib/entity/person/data_source.dart b/app/lib/entity/person/data_source.dart
similarity index 100%
rename from lib/entity/person/data_source.dart
rename to app/lib/entity/person/data_source.dart
diff --git a/lib/entity/share.dart b/app/lib/entity/share.dart
similarity index 100%
rename from lib/entity/share.dart
rename to app/lib/entity/share.dart
diff --git a/lib/entity/share/data_source.dart b/app/lib/entity/share/data_source.dart
similarity index 100%
rename from lib/entity/share/data_source.dart
rename to app/lib/entity/share/data_source.dart
diff --git a/lib/entity/sharee.dart b/app/lib/entity/sharee.dart
similarity index 100%
rename from lib/entity/sharee.dart
rename to app/lib/entity/sharee.dart
diff --git a/lib/entity/sharee/data_source.dart b/app/lib/entity/sharee/data_source.dart
similarity index 100%
rename from lib/entity/sharee/data_source.dart
rename to app/lib/entity/sharee/data_source.dart
diff --git a/lib/entity/tag.dart b/app/lib/entity/tag.dart
similarity index 100%
rename from lib/entity/tag.dart
rename to app/lib/entity/tag.dart
diff --git a/lib/entity/tag/data_source.dart b/app/lib/entity/tag/data_source.dart
similarity index 100%
rename from lib/entity/tag/data_source.dart
rename to app/lib/entity/tag/data_source.dart
diff --git a/lib/entity/tagged_file.dart b/app/lib/entity/tagged_file.dart
similarity index 100%
rename from lib/entity/tagged_file.dart
rename to app/lib/entity/tagged_file.dart
diff --git a/lib/entity/tagged_file/data_source.dart b/app/lib/entity/tagged_file/data_source.dart
similarity index 100%
rename from lib/entity/tagged_file/data_source.dart
rename to app/lib/entity/tagged_file/data_source.dart
diff --git a/lib/entity/webdav_response_parser.dart b/app/lib/entity/webdav_response_parser.dart
similarity index 100%
rename from lib/entity/webdav_response_parser.dart
rename to app/lib/entity/webdav_response_parser.dart
diff --git a/lib/event/event.dart b/app/lib/event/event.dart
similarity index 100%
rename from lib/event/event.dart
rename to app/lib/event/event.dart
diff --git a/lib/exception.dart b/app/lib/exception.dart
similarity index 100%
rename from lib/exception.dart
rename to app/lib/exception.dart
diff --git a/lib/exception_event.dart b/app/lib/exception_event.dart
similarity index 100%
rename from lib/exception_event.dart
rename to app/lib/exception_event.dart
diff --git a/lib/exception_util.dart b/app/lib/exception_util.dart
similarity index 100%
rename from lib/exception_util.dart
rename to app/lib/exception_util.dart
diff --git a/lib/help_utils.dart b/app/lib/help_utils.dart
similarity index 100%
rename from lib/help_utils.dart
rename to app/lib/help_utils.dart
diff --git a/lib/image_size_getter_util.dart b/app/lib/image_size_getter_util.dart
similarity index 100%
rename from lib/image_size_getter_util.dart
rename to app/lib/image_size_getter_util.dart
diff --git a/lib/int_util.dart b/app/lib/int_util.dart
similarity index 100%
rename from lib/int_util.dart
rename to app/lib/int_util.dart
diff --git a/lib/iterable_extension.dart b/app/lib/iterable_extension.dart
similarity index 100%
rename from lib/iterable_extension.dart
rename to app/lib/iterable_extension.dart
diff --git a/lib/iterator_extension.dart b/app/lib/iterator_extension.dart
similarity index 100%
rename from lib/iterator_extension.dart
rename to app/lib/iterator_extension.dart
diff --git a/lib/json_util.dart b/app/lib/json_util.dart
similarity index 100%
rename from lib/json_util.dart
rename to app/lib/json_util.dart
diff --git a/lib/k.dart b/app/lib/k.dart
similarity index 100%
rename from lib/k.dart
rename to app/lib/k.dart
diff --git a/lib/l10n/README.md b/app/lib/l10n/README.md
similarity index 100%
rename from lib/l10n/README.md
rename to app/lib/l10n/README.md
diff --git a/lib/l10n/app_cs.arb b/app/lib/l10n/app_cs.arb
similarity index 100%
rename from lib/l10n/app_cs.arb
rename to app/lib/l10n/app_cs.arb
diff --git a/lib/l10n/app_de.arb b/app/lib/l10n/app_de.arb
similarity index 100%
rename from lib/l10n/app_de.arb
rename to app/lib/l10n/app_de.arb
diff --git a/lib/l10n/app_el.arb b/app/lib/l10n/app_el.arb
similarity index 100%
rename from lib/l10n/app_el.arb
rename to app/lib/l10n/app_el.arb
diff --git a/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
similarity index 100%
rename from lib/l10n/app_en.arb
rename to app/lib/l10n/app_en.arb
diff --git a/lib/l10n/app_es.arb b/app/lib/l10n/app_es.arb
similarity index 100%
rename from lib/l10n/app_es.arb
rename to app/lib/l10n/app_es.arb
diff --git a/lib/l10n/app_fi.arb b/app/lib/l10n/app_fi.arb
similarity index 100%
rename from lib/l10n/app_fi.arb
rename to app/lib/l10n/app_fi.arb
diff --git a/lib/l10n/app_fr.arb b/app/lib/l10n/app_fr.arb
similarity index 100%
rename from lib/l10n/app_fr.arb
rename to app/lib/l10n/app_fr.arb
diff --git a/lib/l10n/app_pl.arb b/app/lib/l10n/app_pl.arb
similarity index 100%
rename from lib/l10n/app_pl.arb
rename to app/lib/l10n/app_pl.arb
diff --git a/lib/l10n/app_ru.arb b/app/lib/l10n/app_ru.arb
similarity index 100%
rename from lib/l10n/app_ru.arb
rename to app/lib/l10n/app_ru.arb
diff --git a/lib/l10n/untranslated-messages.txt b/app/lib/l10n/untranslated-messages.txt
similarity index 100%
rename from lib/l10n/untranslated-messages.txt
rename to app/lib/l10n/untranslated-messages.txt
diff --git a/lib/language_util.dart b/app/lib/language_util.dart
similarity index 100%
rename from lib/language_util.dart
rename to app/lib/language_util.dart
diff --git a/lib/list_extension.dart b/app/lib/list_extension.dart
similarity index 100%
rename from lib/list_extension.dart
rename to app/lib/list_extension.dart
diff --git a/lib/list_util.dart b/app/lib/list_util.dart
similarity index 100%
rename from lib/list_util.dart
rename to app/lib/list_util.dart
diff --git a/lib/main.dart b/app/lib/main.dart
similarity index 100%
rename from lib/main.dart
rename to app/lib/main.dart
diff --git a/lib/metadata_task_manager.dart b/app/lib/metadata_task_manager.dart
similarity index 100%
rename from lib/metadata_task_manager.dart
rename to app/lib/metadata_task_manager.dart
diff --git a/lib/mobile/android/android_info.dart b/app/lib/mobile/android/android_info.dart
similarity index 100%
rename from lib/mobile/android/android_info.dart
rename to app/lib/mobile/android/android_info.dart
diff --git a/lib/mobile/android/download.dart b/app/lib/mobile/android/download.dart
similarity index 100%
rename from lib/mobile/android/download.dart
rename to app/lib/mobile/android/download.dart
diff --git a/lib/mobile/android/media_store.dart b/app/lib/mobile/android/media_store.dart
similarity index 100%
rename from lib/mobile/android/media_store.dart
rename to app/lib/mobile/android/media_store.dart
diff --git a/lib/mobile/android/notification.dart b/app/lib/mobile/android/notification.dart
similarity index 100%
rename from lib/mobile/android/notification.dart
rename to app/lib/mobile/android/notification.dart
diff --git a/lib/mobile/android/self_signed_cert.dart b/app/lib/mobile/android/self_signed_cert.dart
similarity index 100%
rename from lib/mobile/android/self_signed_cert.dart
rename to app/lib/mobile/android/self_signed_cert.dart
diff --git a/lib/mobile/android/share.dart b/app/lib/mobile/android/share.dart
similarity index 100%
rename from lib/mobile/android/share.dart
rename to app/lib/mobile/android/share.dart
diff --git a/lib/mobile/db_util.dart b/app/lib/mobile/db_util.dart
similarity index 100%
rename from lib/mobile/db_util.dart
rename to app/lib/mobile/db_util.dart
diff --git a/lib/mobile/download.dart b/app/lib/mobile/download.dart
similarity index 100%
rename from lib/mobile/download.dart
rename to app/lib/mobile/download.dart
diff --git a/lib/mobile/file_saver.dart b/app/lib/mobile/file_saver.dart
similarity index 100%
rename from lib/mobile/file_saver.dart
rename to app/lib/mobile/file_saver.dart
diff --git a/lib/mobile/google_gps_map.dart b/app/lib/mobile/google_gps_map.dart
similarity index 100%
rename from lib/mobile/google_gps_map.dart
rename to app/lib/mobile/google_gps_map.dart
diff --git a/lib/mobile/notification.dart b/app/lib/mobile/notification.dart
similarity index 100%
rename from lib/mobile/notification.dart
rename to app/lib/mobile/notification.dart
diff --git a/lib/mobile/platform.dart b/app/lib/mobile/platform.dart
similarity index 100%
rename from lib/mobile/platform.dart
rename to app/lib/mobile/platform.dart
diff --git a/lib/mobile/self_signed_cert_manager.dart b/app/lib/mobile/self_signed_cert_manager.dart
similarity index 100%
rename from lib/mobile/self_signed_cert_manager.dart
rename to app/lib/mobile/self_signed_cert_manager.dart
diff --git a/lib/mobile/share.dart b/app/lib/mobile/share.dart
similarity index 100%
rename from lib/mobile/share.dart
rename to app/lib/mobile/share.dart
diff --git a/lib/mobile/ui_hack.dart b/app/lib/mobile/ui_hack.dart
similarity index 100%
rename from lib/mobile/ui_hack.dart
rename to app/lib/mobile/ui_hack.dart
diff --git a/lib/mobile/universal_storage.dart b/app/lib/mobile/universal_storage.dart
similarity index 100%
rename from lib/mobile/universal_storage.dart
rename to app/lib/mobile/universal_storage.dart
diff --git a/lib/notified_action.dart b/app/lib/notified_action.dart
similarity index 100%
rename from lib/notified_action.dart
rename to app/lib/notified_action.dart
diff --git a/lib/num_extension.dart b/app/lib/num_extension.dart
similarity index 100%
rename from lib/num_extension.dart
rename to app/lib/num_extension.dart
diff --git a/lib/object_extension.dart b/app/lib/object_extension.dart
similarity index 100%
rename from lib/object_extension.dart
rename to app/lib/object_extension.dart
diff --git a/lib/or_null.dart b/app/lib/or_null.dart
similarity index 100%
rename from lib/or_null.dart
rename to app/lib/or_null.dart
diff --git a/lib/override_comparator.dart b/app/lib/override_comparator.dart
similarity index 100%
rename from lib/override_comparator.dart
rename to app/lib/override_comparator.dart
diff --git a/lib/platform/download.dart b/app/lib/platform/download.dart
similarity index 100%
rename from lib/platform/download.dart
rename to app/lib/platform/download.dart
diff --git a/lib/platform/features.dart b/app/lib/platform/features.dart
similarity index 100%
rename from lib/platform/features.dart
rename to app/lib/platform/features.dart
diff --git a/lib/platform/file_saver.dart b/app/lib/platform/file_saver.dart
similarity index 100%
rename from lib/platform/file_saver.dart
rename to app/lib/platform/file_saver.dart
diff --git a/lib/platform/k.dart b/app/lib/platform/k.dart
similarity index 100%
rename from lib/platform/k.dart
rename to app/lib/platform/k.dart
diff --git a/lib/platform/notification.dart b/app/lib/platform/notification.dart
similarity index 100%
rename from lib/platform/notification.dart
rename to app/lib/platform/notification.dart
diff --git a/lib/platform/share.dart b/app/lib/platform/share.dart
similarity index 100%
rename from lib/platform/share.dart
rename to app/lib/platform/share.dart
diff --git a/lib/platform/universal_storage.dart b/app/lib/platform/universal_storage.dart
similarity index 100%
rename from lib/platform/universal_storage.dart
rename to app/lib/platform/universal_storage.dart
diff --git a/lib/pref.dart b/app/lib/pref.dart
similarity index 100%
rename from lib/pref.dart
rename to app/lib/pref.dart
diff --git a/lib/pref_util.dart b/app/lib/pref_util.dart
similarity index 100%
rename from lib/pref_util.dart
rename to app/lib/pref_util.dart
diff --git a/lib/primitive.dart b/app/lib/primitive.dart
similarity index 100%
rename from lib/primitive.dart
rename to app/lib/primitive.dart
diff --git a/lib/remote_storage_util.dart b/app/lib/remote_storage_util.dart
similarity index 100%
rename from lib/remote_storage_util.dart
rename to app/lib/remote_storage_util.dart
diff --git a/lib/session_storage.dart b/app/lib/session_storage.dart
similarity index 100%
rename from lib/session_storage.dart
rename to app/lib/session_storage.dart
diff --git a/lib/share_handler.dart b/app/lib/share_handler.dart
similarity index 100%
rename from lib/share_handler.dart
rename to app/lib/share_handler.dart
diff --git a/lib/snack_bar_manager.dart b/app/lib/snack_bar_manager.dart
similarity index 100%
rename from lib/snack_bar_manager.dart
rename to app/lib/snack_bar_manager.dart
diff --git a/lib/string_extension.dart b/app/lib/string_extension.dart
similarity index 100%
rename from lib/string_extension.dart
rename to app/lib/string_extension.dart
diff --git a/lib/theme.dart b/app/lib/theme.dart
similarity index 100%
rename from lib/theme.dart
rename to app/lib/theme.dart
diff --git a/lib/throttler.dart b/app/lib/throttler.dart
similarity index 100%
rename from lib/throttler.dart
rename to app/lib/throttler.dart
diff --git a/lib/touch_token_manager.dart b/app/lib/touch_token_manager.dart
similarity index 100%
rename from lib/touch_token_manager.dart
rename to app/lib/touch_token_manager.dart
diff --git a/lib/type.dart b/app/lib/type.dart
similarity index 100%
rename from lib/type.dart
rename to app/lib/type.dart
diff --git a/lib/use_case/add_to_album.dart b/app/lib/use_case/add_to_album.dart
similarity index 100%
rename from lib/use_case/add_to_album.dart
rename to app/lib/use_case/add_to_album.dart
diff --git a/lib/use_case/cache_favorite.dart b/app/lib/use_case/cache_favorite.dart
similarity index 100%
rename from lib/use_case/cache_favorite.dart
rename to app/lib/use_case/cache_favorite.dart
diff --git a/lib/use_case/compat/v15.dart b/app/lib/use_case/compat/v15.dart
similarity index 100%
rename from lib/use_case/compat/v15.dart
rename to app/lib/use_case/compat/v15.dart
diff --git a/lib/use_case/compat/v25.dart b/app/lib/use_case/compat/v25.dart
similarity index 100%
rename from lib/use_case/compat/v25.dart
rename to app/lib/use_case/compat/v25.dart
diff --git a/lib/use_case/compat/v29.dart b/app/lib/use_case/compat/v29.dart
similarity index 100%
rename from lib/use_case/compat/v29.dart
rename to app/lib/use_case/compat/v29.dart
diff --git a/lib/use_case/compat/v32.dart b/app/lib/use_case/compat/v32.dart
similarity index 100%
rename from lib/use_case/compat/v32.dart
rename to app/lib/use_case/compat/v32.dart
diff --git a/lib/use_case/compat/v34.dart b/app/lib/use_case/compat/v34.dart
similarity index 100%
rename from lib/use_case/compat/v34.dart
rename to app/lib/use_case/compat/v34.dart
diff --git a/lib/use_case/compat/v37.dart b/app/lib/use_case/compat/v37.dart
similarity index 100%
rename from lib/use_case/compat/v37.dart
rename to app/lib/use_case/compat/v37.dart
diff --git a/lib/use_case/copy.dart b/app/lib/use_case/copy.dart
similarity index 100%
rename from lib/use_case/copy.dart
rename to app/lib/use_case/copy.dart
diff --git a/lib/use_case/create_album.dart b/app/lib/use_case/create_album.dart
similarity index 100%
rename from lib/use_case/create_album.dart
rename to app/lib/use_case/create_album.dart
diff --git a/lib/use_case/create_dir.dart b/app/lib/use_case/create_dir.dart
similarity index 100%
rename from lib/use_case/create_dir.dart
rename to app/lib/use_case/create_dir.dart
diff --git a/lib/use_case/create_share.dart b/app/lib/use_case/create_share.dart
similarity index 100%
rename from lib/use_case/create_share.dart
rename to app/lib/use_case/create_share.dart
diff --git a/lib/use_case/db_compat/v5.dart b/app/lib/use_case/db_compat/v5.dart
similarity index 100%
rename from lib/use_case/db_compat/v5.dart
rename to app/lib/use_case/db_compat/v5.dart
diff --git a/lib/use_case/download_file.dart b/app/lib/use_case/download_file.dart
similarity index 100%
rename from lib/use_case/download_file.dart
rename to app/lib/use_case/download_file.dart
diff --git a/lib/use_case/find_file.dart b/app/lib/use_case/find_file.dart
similarity index 100%
rename from lib/use_case/find_file.dart
rename to app/lib/use_case/find_file.dart
diff --git a/lib/use_case/get_file_binary.dart b/app/lib/use_case/get_file_binary.dart
similarity index 100%
rename from lib/use_case/get_file_binary.dart
rename to app/lib/use_case/get_file_binary.dart
diff --git a/lib/use_case/import_pending_shared_album.dart b/app/lib/use_case/import_pending_shared_album.dart
similarity index 100%
rename from lib/use_case/import_pending_shared_album.dart
rename to app/lib/use_case/import_pending_shared_album.dart
diff --git a/lib/use_case/import_potential_shared_album.dart b/app/lib/use_case/import_potential_shared_album.dart
similarity index 100%
rename from lib/use_case/import_potential_shared_album.dart
rename to app/lib/use_case/import_potential_shared_album.dart
diff --git a/lib/use_case/list_album.dart b/app/lib/use_case/list_album.dart
similarity index 100%
rename from lib/use_case/list_album.dart
rename to app/lib/use_case/list_album.dart
diff --git a/lib/use_case/list_dir_share.dart b/app/lib/use_case/list_dir_share.dart
similarity index 100%
rename from lib/use_case/list_dir_share.dart
rename to app/lib/use_case/list_dir_share.dart
diff --git a/lib/use_case/list_favorite.dart b/app/lib/use_case/list_favorite.dart
similarity index 100%
rename from lib/use_case/list_favorite.dart
rename to app/lib/use_case/list_favorite.dart
diff --git a/lib/use_case/list_favorite_offline.dart b/app/lib/use_case/list_favorite_offline.dart
similarity index 100%
rename from lib/use_case/list_favorite_offline.dart
rename to app/lib/use_case/list_favorite_offline.dart
diff --git a/lib/use_case/list_file_tag.dart b/app/lib/use_case/list_file_tag.dart
similarity index 100%
rename from lib/use_case/list_file_tag.dart
rename to app/lib/use_case/list_file_tag.dart
diff --git a/lib/use_case/list_potential_shared_album.dart b/app/lib/use_case/list_potential_shared_album.dart
similarity index 100%
rename from lib/use_case/list_potential_shared_album.dart
rename to app/lib/use_case/list_potential_shared_album.dart
diff --git a/lib/use_case/list_share.dart b/app/lib/use_case/list_share.dart
similarity index 100%
rename from lib/use_case/list_share.dart
rename to app/lib/use_case/list_share.dart
diff --git a/lib/use_case/list_share_with_me.dart b/app/lib/use_case/list_share_with_me.dart
similarity index 100%
rename from lib/use_case/list_share_with_me.dart
rename to app/lib/use_case/list_share_with_me.dart
diff --git a/lib/use_case/list_sharee.dart b/app/lib/use_case/list_sharee.dart
similarity index 100%
rename from lib/use_case/list_sharee.dart
rename to app/lib/use_case/list_sharee.dart
diff --git a/lib/use_case/list_tag.dart b/app/lib/use_case/list_tag.dart
similarity index 100%
rename from lib/use_case/list_tag.dart
rename to app/lib/use_case/list_tag.dart
diff --git a/lib/use_case/list_tagged_file.dart b/app/lib/use_case/list_tagged_file.dart
similarity index 100%
rename from lib/use_case/list_tagged_file.dart
rename to app/lib/use_case/list_tagged_file.dart
diff --git a/lib/use_case/load_metadata.dart b/app/lib/use_case/load_metadata.dart
similarity index 100%
rename from lib/use_case/load_metadata.dart
rename to app/lib/use_case/load_metadata.dart
diff --git a/lib/use_case/ls.dart b/app/lib/use_case/ls.dart
similarity index 100%
rename from lib/use_case/ls.dart
rename to app/lib/use_case/ls.dart
diff --git a/lib/use_case/ls_single_file.dart b/app/lib/use_case/ls_single_file.dart
similarity index 100%
rename from lib/use_case/ls_single_file.dart
rename to app/lib/use_case/ls_single_file.dart
diff --git a/lib/use_case/ls_trashbin.dart b/app/lib/use_case/ls_trashbin.dart
similarity index 100%
rename from lib/use_case/ls_trashbin.dart
rename to app/lib/use_case/ls_trashbin.dart
diff --git a/lib/use_case/move.dart b/app/lib/use_case/move.dart
similarity index 100%
rename from lib/use_case/move.dart
rename to app/lib/use_case/move.dart
diff --git a/lib/use_case/populate_album.dart b/app/lib/use_case/populate_album.dart
similarity index 100%
rename from lib/use_case/populate_album.dart
rename to app/lib/use_case/populate_album.dart
diff --git a/lib/use_case/populate_person.dart b/app/lib/use_case/populate_person.dart
similarity index 100%
rename from lib/use_case/populate_person.dart
rename to app/lib/use_case/populate_person.dart
diff --git a/lib/use_case/preprocess_album.dart b/app/lib/use_case/preprocess_album.dart
similarity index 100%
rename from lib/use_case/preprocess_album.dart
rename to app/lib/use_case/preprocess_album.dart
diff --git a/lib/use_case/put_file_binary.dart b/app/lib/use_case/put_file_binary.dart
similarity index 100%
rename from lib/use_case/put_file_binary.dart
rename to app/lib/use_case/put_file_binary.dart
diff --git a/lib/use_case/remove.dart b/app/lib/use_case/remove.dart
similarity index 100%
rename from lib/use_case/remove.dart
rename to app/lib/use_case/remove.dart
diff --git a/lib/use_case/remove_album.dart b/app/lib/use_case/remove_album.dart
similarity index 100%
rename from lib/use_case/remove_album.dart
rename to app/lib/use_case/remove_album.dart
diff --git a/lib/use_case/remove_from_album.dart b/app/lib/use_case/remove_from_album.dart
similarity index 100%
rename from lib/use_case/remove_from_album.dart
rename to app/lib/use_case/remove_from_album.dart
diff --git a/lib/use_case/remove_share.dart b/app/lib/use_case/remove_share.dart
similarity index 100%
rename from lib/use_case/remove_share.dart
rename to app/lib/use_case/remove_share.dart
diff --git a/lib/use_case/request_public_link.dart b/app/lib/use_case/request_public_link.dart
similarity index 100%
rename from lib/use_case/request_public_link.dart
rename to app/lib/use_case/request_public_link.dart
diff --git a/lib/use_case/restore_trashbin.dart b/app/lib/use_case/restore_trashbin.dart
similarity index 100%
rename from lib/use_case/restore_trashbin.dart
rename to app/lib/use_case/restore_trashbin.dart
diff --git a/lib/use_case/resync_album.dart b/app/lib/use_case/resync_album.dart
similarity index 100%
rename from lib/use_case/resync_album.dart
rename to app/lib/use_case/resync_album.dart
diff --git a/lib/use_case/scan_dir.dart b/app/lib/use_case/scan_dir.dart
similarity index 100%
rename from lib/use_case/scan_dir.dart
rename to app/lib/use_case/scan_dir.dart
diff --git a/lib/use_case/scan_dir_offline.dart b/app/lib/use_case/scan_dir_offline.dart
similarity index 100%
rename from lib/use_case/scan_dir_offline.dart
rename to app/lib/use_case/scan_dir_offline.dart
diff --git a/lib/use_case/scan_missing_metadata.dart b/app/lib/use_case/scan_missing_metadata.dart
similarity index 100%
rename from lib/use_case/scan_missing_metadata.dart
rename to app/lib/use_case/scan_missing_metadata.dart
diff --git a/lib/use_case/share_album_with_user.dart b/app/lib/use_case/share_album_with_user.dart
similarity index 100%
rename from lib/use_case/share_album_with_user.dart
rename to app/lib/use_case/share_album_with_user.dart
diff --git a/lib/use_case/sync_favorite.dart b/app/lib/use_case/sync_favorite.dart
similarity index 100%
rename from lib/use_case/sync_favorite.dart
rename to app/lib/use_case/sync_favorite.dart
diff --git a/lib/use_case/unimport_shared_album.dart b/app/lib/use_case/unimport_shared_album.dart
similarity index 100%
rename from lib/use_case/unimport_shared_album.dart
rename to app/lib/use_case/unimport_shared_album.dart
diff --git a/lib/use_case/unshare_album_with_user.dart b/app/lib/use_case/unshare_album_with_user.dart
similarity index 100%
rename from lib/use_case/unshare_album_with_user.dart
rename to app/lib/use_case/unshare_album_with_user.dart
diff --git a/lib/use_case/unshare_file_from_album.dart b/app/lib/use_case/unshare_file_from_album.dart
similarity index 100%
rename from lib/use_case/unshare_file_from_album.dart
rename to app/lib/use_case/unshare_file_from_album.dart
diff --git a/lib/use_case/update_album.dart b/app/lib/use_case/update_album.dart
similarity index 100%
rename from lib/use_case/update_album.dart
rename to app/lib/use_case/update_album.dart
diff --git a/lib/use_case/update_album_time.dart b/app/lib/use_case/update_album_time.dart
similarity index 100%
rename from lib/use_case/update_album_time.dart
rename to app/lib/use_case/update_album_time.dart
diff --git a/lib/use_case/update_album_with_actual_items.dart b/app/lib/use_case/update_album_with_actual_items.dart
similarity index 100%
rename from lib/use_case/update_album_with_actual_items.dart
rename to app/lib/use_case/update_album_with_actual_items.dart
diff --git a/lib/use_case/update_auto_album_cover.dart b/app/lib/use_case/update_auto_album_cover.dart
similarity index 100%
rename from lib/use_case/update_auto_album_cover.dart
rename to app/lib/use_case/update_auto_album_cover.dart
diff --git a/lib/use_case/update_missing_metadata.dart b/app/lib/use_case/update_missing_metadata.dart
similarity index 100%
rename from lib/use_case/update_missing_metadata.dart
rename to app/lib/use_case/update_missing_metadata.dart
diff --git a/lib/use_case/update_property.dart b/app/lib/use_case/update_property.dart
similarity index 100%
rename from lib/use_case/update_property.dart
rename to app/lib/use_case/update_property.dart
diff --git a/lib/web/db_util.dart b/app/lib/web/db_util.dart
similarity index 100%
rename from lib/web/db_util.dart
rename to app/lib/web/db_util.dart
diff --git a/lib/web/download.dart b/app/lib/web/download.dart
similarity index 100%
rename from lib/web/download.dart
rename to app/lib/web/download.dart
diff --git a/lib/web/file_saver.dart b/app/lib/web/file_saver.dart
similarity index 100%
rename from lib/web/file_saver.dart
rename to app/lib/web/file_saver.dart
diff --git a/lib/web/google_gps_map.dart b/app/lib/web/google_gps_map.dart
similarity index 100%
rename from lib/web/google_gps_map.dart
rename to app/lib/web/google_gps_map.dart
diff --git a/lib/web/platform.dart b/app/lib/web/platform.dart
similarity index 100%
rename from lib/web/platform.dart
rename to app/lib/web/platform.dart
diff --git a/lib/web/universal_storage.dart b/app/lib/web/universal_storage.dart
similarity index 100%
rename from lib/web/universal_storage.dart
rename to app/lib/web/universal_storage.dart
diff --git a/lib/widget/account_picker_dialog.dart b/app/lib/widget/account_picker_dialog.dart
similarity index 100%
rename from lib/widget/account_picker_dialog.dart
rename to app/lib/widget/account_picker_dialog.dart
diff --git a/lib/widget/album_browser.dart b/app/lib/widget/album_browser.dart
similarity index 100%
rename from lib/widget/album_browser.dart
rename to app/lib/widget/album_browser.dart
diff --git a/lib/widget/album_browser_app_bar.dart b/app/lib/widget/album_browser_app_bar.dart
similarity index 100%
rename from lib/widget/album_browser_app_bar.dart
rename to app/lib/widget/album_browser_app_bar.dart
diff --git a/lib/widget/album_browser_mixin.dart b/app/lib/widget/album_browser_mixin.dart
similarity index 100%
rename from lib/widget/album_browser_mixin.dart
rename to app/lib/widget/album_browser_mixin.dart
diff --git a/lib/widget/album_browser_util.dart b/app/lib/widget/album_browser_util.dart
similarity index 100%
rename from lib/widget/album_browser_util.dart
rename to app/lib/widget/album_browser_util.dart
diff --git a/lib/widget/album_dir_picker.dart b/app/lib/widget/album_dir_picker.dart
similarity index 100%
rename from lib/widget/album_dir_picker.dart
rename to app/lib/widget/album_dir_picker.dart
diff --git a/lib/widget/album_grid_item.dart b/app/lib/widget/album_grid_item.dart
similarity index 100%
rename from lib/widget/album_grid_item.dart
rename to app/lib/widget/album_grid_item.dart
diff --git a/lib/widget/album_importer.dart b/app/lib/widget/album_importer.dart
similarity index 100%
rename from lib/widget/album_importer.dart
rename to app/lib/widget/album_importer.dart
diff --git a/lib/widget/album_picker.dart b/app/lib/widget/album_picker.dart
similarity index 100%
rename from lib/widget/album_picker.dart
rename to app/lib/widget/album_picker.dart
diff --git a/lib/widget/album_search_delegate.dart b/app/lib/widget/album_search_delegate.dart
similarity index 100%
rename from lib/widget/album_search_delegate.dart
rename to app/lib/widget/album_search_delegate.dart
diff --git a/lib/widget/album_share_outlier_browser.dart b/app/lib/widget/album_share_outlier_browser.dart
similarity index 100%
rename from lib/widget/album_share_outlier_browser.dart
rename to app/lib/widget/album_share_outlier_browser.dart
diff --git a/lib/widget/animated_visibility.dart b/app/lib/widget/animated_visibility.dart
similarity index 100%
rename from lib/widget/animated_visibility.dart
rename to app/lib/widget/animated_visibility.dart
diff --git a/lib/widget/archive_browser.dart b/app/lib/widget/archive_browser.dart
similarity index 100%
rename from lib/widget/archive_browser.dart
rename to app/lib/widget/archive_browser.dart
diff --git a/lib/widget/builder/album_grid_item_builder.dart b/app/lib/widget/builder/album_grid_item_builder.dart
similarity index 100%
rename from lib/widget/builder/album_grid_item_builder.dart
rename to app/lib/widget/builder/album_grid_item_builder.dart
diff --git a/lib/widget/cached_network_image_mod.dart b/app/lib/widget/cached_network_image_mod.dart
similarity index 100%
rename from lib/widget/cached_network_image_mod.dart
rename to app/lib/widget/cached_network_image_mod.dart
diff --git a/lib/widget/connect.dart b/app/lib/widget/connect.dart
similarity index 100%
rename from lib/widget/connect.dart
rename to app/lib/widget/connect.dart
diff --git a/lib/widget/dialog_scaffold.dart b/app/lib/widget/dialog_scaffold.dart
similarity index 100%
rename from lib/widget/dialog_scaffold.dart
rename to app/lib/widget/dialog_scaffold.dart
diff --git a/lib/widget/dir_picker.dart b/app/lib/widget/dir_picker.dart
similarity index 100%
rename from lib/widget/dir_picker.dart
rename to app/lib/widget/dir_picker.dart
diff --git a/lib/widget/disposable.dart b/app/lib/widget/disposable.dart
similarity index 100%
rename from lib/widget/disposable.dart
rename to app/lib/widget/disposable.dart
diff --git a/lib/widget/draggable.dart b/app/lib/widget/draggable.dart
similarity index 100%
rename from lib/widget/draggable.dart
rename to app/lib/widget/draggable.dart
diff --git a/lib/widget/draggable_item_list_mixin.dart b/app/lib/widget/draggable_item_list_mixin.dart
similarity index 100%
rename from lib/widget/draggable_item_list_mixin.dart
rename to app/lib/widget/draggable_item_list_mixin.dart
diff --git a/lib/widget/dynamic_album_browser.dart b/app/lib/widget/dynamic_album_browser.dart
similarity index 100%
rename from lib/widget/dynamic_album_browser.dart
rename to app/lib/widget/dynamic_album_browser.dart
diff --git a/lib/widget/empty_list_indicator.dart b/app/lib/widget/empty_list_indicator.dart
similarity index 100%
rename from lib/widget/empty_list_indicator.dart
rename to app/lib/widget/empty_list_indicator.dart
diff --git a/lib/widget/fancy_option_picker.dart b/app/lib/widget/fancy_option_picker.dart
similarity index 100%
rename from lib/widget/fancy_option_picker.dart
rename to app/lib/widget/fancy_option_picker.dart
diff --git a/lib/widget/favorite_browser.dart b/app/lib/widget/favorite_browser.dart
similarity index 100%
rename from lib/widget/favorite_browser.dart
rename to app/lib/widget/favorite_browser.dart
diff --git a/lib/widget/gps_map.dart b/app/lib/widget/gps_map.dart
similarity index 100%
rename from lib/widget/gps_map.dart
rename to app/lib/widget/gps_map.dart
diff --git a/lib/widget/handler/add_selection_to_album_handler.dart b/app/lib/widget/handler/add_selection_to_album_handler.dart
similarity index 100%
rename from lib/widget/handler/add_selection_to_album_handler.dart
rename to app/lib/widget/handler/add_selection_to_album_handler.dart
diff --git a/lib/widget/handler/archive_selection_handler.dart b/app/lib/widget/handler/archive_selection_handler.dart
similarity index 100%
rename from lib/widget/handler/archive_selection_handler.dart
rename to app/lib/widget/handler/archive_selection_handler.dart
diff --git a/lib/widget/handler/remove_selection_handler.dart b/app/lib/widget/handler/remove_selection_handler.dart
similarity index 100%
rename from lib/widget/handler/remove_selection_handler.dart
rename to app/lib/widget/handler/remove_selection_handler.dart
diff --git a/lib/widget/home.dart b/app/lib/widget/home.dart
similarity index 100%
rename from lib/widget/home.dart
rename to app/lib/widget/home.dart
diff --git a/lib/widget/home_albums.dart b/app/lib/widget/home_albums.dart
similarity index 100%
rename from lib/widget/home_albums.dart
rename to app/lib/widget/home_albums.dart
diff --git a/lib/widget/home_app_bar.dart b/app/lib/widget/home_app_bar.dart
similarity index 100%
rename from lib/widget/home_app_bar.dart
rename to app/lib/widget/home_app_bar.dart
diff --git a/lib/widget/home_photos.dart b/app/lib/widget/home_photos.dart
similarity index 100%
rename from lib/widget/home_photos.dart
rename to app/lib/widget/home_photos.dart
diff --git a/lib/widget/horizontal_page_viewer.dart b/app/lib/widget/horizontal_page_viewer.dart
similarity index 100%
rename from lib/widget/horizontal_page_viewer.dart
rename to app/lib/widget/horizontal_page_viewer.dart
diff --git a/lib/widget/image_viewer.dart b/app/lib/widget/image_viewer.dart
similarity index 100%
rename from lib/widget/image_viewer.dart
rename to app/lib/widget/image_viewer.dart
diff --git a/lib/widget/list_tile_center_leading.dart b/app/lib/widget/list_tile_center_leading.dart
similarity index 100%
rename from lib/widget/list_tile_center_leading.dart
rename to app/lib/widget/list_tile_center_leading.dart
diff --git a/lib/widget/measurable_item_list.dart b/app/lib/widget/measurable_item_list.dart
similarity index 100%
rename from lib/widget/measurable_item_list.dart
rename to app/lib/widget/measurable_item_list.dart
diff --git a/lib/widget/measure.dart b/app/lib/widget/measure.dart
similarity index 100%
rename from lib/widget/measure.dart
rename to app/lib/widget/measure.dart
diff --git a/lib/widget/measureable_sliver_staggered_grid.dart b/app/lib/widget/measureable_sliver_staggered_grid.dart
similarity index 100%
rename from lib/widget/measureable_sliver_staggered_grid.dart
rename to app/lib/widget/measureable_sliver_staggered_grid.dart
diff --git a/lib/widget/my_app.dart b/app/lib/widget/my_app.dart
similarity index 100%
rename from lib/widget/my_app.dart
rename to app/lib/widget/my_app.dart
diff --git a/lib/widget/new_album_dialog.dart b/app/lib/widget/new_album_dialog.dart
similarity index 100%
rename from lib/widget/new_album_dialog.dart
rename to app/lib/widget/new_album_dialog.dart
diff --git a/lib/widget/page_changed_listener.dart b/app/lib/widget/page_changed_listener.dart
similarity index 100%
rename from lib/widget/page_changed_listener.dart
rename to app/lib/widget/page_changed_listener.dart
diff --git a/lib/widget/page_visibility_mixin.dart b/app/lib/widget/page_visibility_mixin.dart
similarity index 100%
rename from lib/widget/page_visibility_mixin.dart
rename to app/lib/widget/page_visibility_mixin.dart
diff --git a/lib/widget/people_browser.dart b/app/lib/widget/people_browser.dart
similarity index 100%
rename from lib/widget/people_browser.dart
rename to app/lib/widget/people_browser.dart
diff --git a/lib/widget/person_browser.dart b/app/lib/widget/person_browser.dart
similarity index 100%
rename from lib/widget/person_browser.dart
rename to app/lib/widget/person_browser.dart
diff --git a/lib/widget/photo_date_time_edit_dialog.dart b/app/lib/widget/photo_date_time_edit_dialog.dart
similarity index 100%
rename from lib/widget/photo_date_time_edit_dialog.dart
rename to app/lib/widget/photo_date_time_edit_dialog.dart
diff --git a/lib/widget/photo_list_item.dart b/app/lib/widget/photo_list_item.dart
similarity index 100%
rename from lib/widget/photo_list_item.dart
rename to app/lib/widget/photo_list_item.dart
diff --git a/lib/widget/photo_list_util.dart b/app/lib/widget/photo_list_util.dart
similarity index 100%
rename from lib/widget/photo_list_util.dart
rename to app/lib/widget/photo_list_util.dart
diff --git a/lib/widget/processing_dialog.dart b/app/lib/widget/processing_dialog.dart
similarity index 100%
rename from lib/widget/processing_dialog.dart
rename to app/lib/widget/processing_dialog.dart
diff --git a/lib/widget/root_picker.dart b/app/lib/widget/root_picker.dart
similarity index 100%
rename from lib/widget/root_picker.dart
rename to app/lib/widget/root_picker.dart
diff --git a/lib/widget/selectable.dart b/app/lib/widget/selectable.dart
similarity index 100%
rename from lib/widget/selectable.dart
rename to app/lib/widget/selectable.dart
diff --git a/lib/widget/selectable_item_stream_list_mixin.dart b/app/lib/widget/selectable_item_stream_list_mixin.dart
similarity index 100%
rename from lib/widget/selectable_item_stream_list_mixin.dart
rename to app/lib/widget/selectable_item_stream_list_mixin.dart
diff --git a/lib/widget/selection_app_bar.dart b/app/lib/widget/selection_app_bar.dart
similarity index 100%
rename from lib/widget/selection_app_bar.dart
rename to app/lib/widget/selection_app_bar.dart
diff --git a/lib/widget/settings.dart b/app/lib/widget/settings.dart
similarity index 100%
rename from lib/widget/settings.dart
rename to app/lib/widget/settings.dart
diff --git a/lib/widget/setup.dart b/app/lib/widget/setup.dart
similarity index 100%
rename from lib/widget/setup.dart
rename to app/lib/widget/setup.dart
diff --git a/lib/widget/share_album_dialog.dart b/app/lib/widget/share_album_dialog.dart
similarity index 100%
rename from lib/widget/share_album_dialog.dart
rename to app/lib/widget/share_album_dialog.dart
diff --git a/lib/widget/share_folder_picker.dart b/app/lib/widget/share_folder_picker.dart
similarity index 100%
rename from lib/widget/share_folder_picker.dart
rename to app/lib/widget/share_folder_picker.dart
diff --git a/lib/widget/share_link_multiple_files_dialog.dart b/app/lib/widget/share_link_multiple_files_dialog.dart
similarity index 100%
rename from lib/widget/share_link_multiple_files_dialog.dart
rename to app/lib/widget/share_link_multiple_files_dialog.dart
diff --git a/lib/widget/share_method_dialog.dart b/app/lib/widget/share_method_dialog.dart
similarity index 100%
rename from lib/widget/share_method_dialog.dart
rename to app/lib/widget/share_method_dialog.dart
diff --git a/lib/widget/shared_album_info_dialog.dart b/app/lib/widget/shared_album_info_dialog.dart
similarity index 100%
rename from lib/widget/shared_album_info_dialog.dart
rename to app/lib/widget/shared_album_info_dialog.dart
diff --git a/lib/widget/shared_file_viewer.dart b/app/lib/widget/shared_file_viewer.dart
similarity index 100%
rename from lib/widget/shared_file_viewer.dart
rename to app/lib/widget/shared_file_viewer.dart
diff --git a/lib/widget/sharing_browser.dart b/app/lib/widget/sharing_browser.dart
similarity index 100%
rename from lib/widget/sharing_browser.dart
rename to app/lib/widget/sharing_browser.dart
diff --git a/lib/widget/sign_in.dart b/app/lib/widget/sign_in.dart
similarity index 100%
rename from lib/widget/sign_in.dart
rename to app/lib/widget/sign_in.dart
diff --git a/lib/widget/simple_input_dialog.dart b/app/lib/widget/simple_input_dialog.dart
similarity index 100%
rename from lib/widget/simple_input_dialog.dart
rename to app/lib/widget/simple_input_dialog.dart
diff --git a/lib/widget/slideshow_dialog.dart b/app/lib/widget/slideshow_dialog.dart
similarity index 100%
rename from lib/widget/slideshow_dialog.dart
rename to app/lib/widget/slideshow_dialog.dart
diff --git a/lib/widget/slideshow_viewer.dart b/app/lib/widget/slideshow_viewer.dart
similarity index 100%
rename from lib/widget/slideshow_viewer.dart
rename to app/lib/widget/slideshow_viewer.dart
diff --git a/lib/widget/smart_album_browser.dart b/app/lib/widget/smart_album_browser.dart
similarity index 100%
rename from lib/widget/smart_album_browser.dart
rename to app/lib/widget/smart_album_browser.dart
diff --git a/lib/widget/splash.dart b/app/lib/widget/splash.dart
similarity index 100%
rename from lib/widget/splash.dart
rename to app/lib/widget/splash.dart
diff --git a/lib/widget/stateful_slider.dart b/app/lib/widget/stateful_slider.dart
similarity index 100%
rename from lib/widget/stateful_slider.dart
rename to app/lib/widget/stateful_slider.dart
diff --git a/lib/widget/switch_form_field.dart b/app/lib/widget/switch_form_field.dart
similarity index 100%
rename from lib/widget/switch_form_field.dart
rename to app/lib/widget/switch_form_field.dart
diff --git a/lib/widget/tag_picker_dialog.dart b/app/lib/widget/tag_picker_dialog.dart
similarity index 100%
rename from lib/widget/tag_picker_dialog.dart
rename to app/lib/widget/tag_picker_dialog.dart
diff --git a/lib/widget/trashbin_browser.dart b/app/lib/widget/trashbin_browser.dart
similarity index 100%
rename from lib/widget/trashbin_browser.dart
rename to app/lib/widget/trashbin_browser.dart
diff --git a/lib/widget/trashbin_viewer.dart b/app/lib/widget/trashbin_viewer.dart
similarity index 100%
rename from lib/widget/trashbin_viewer.dart
rename to app/lib/widget/trashbin_viewer.dart
diff --git a/lib/widget/unbounded_list_tile.dart b/app/lib/widget/unbounded_list_tile.dart
similarity index 100%
rename from lib/widget/unbounded_list_tile.dart
rename to app/lib/widget/unbounded_list_tile.dart
diff --git a/lib/widget/video_viewer.dart b/app/lib/widget/video_viewer.dart
similarity index 100%
rename from lib/widget/video_viewer.dart
rename to app/lib/widget/video_viewer.dart
diff --git a/lib/widget/viewer.dart b/app/lib/widget/viewer.dart
similarity index 100%
rename from lib/widget/viewer.dart
rename to app/lib/widget/viewer.dart
diff --git a/lib/widget/viewer_bottom_app_bar.dart b/app/lib/widget/viewer_bottom_app_bar.dart
similarity index 100%
rename from lib/widget/viewer_bottom_app_bar.dart
rename to app/lib/widget/viewer_bottom_app_bar.dart
diff --git a/lib/widget/viewer_detail_pane.dart b/app/lib/widget/viewer_detail_pane.dart
similarity index 100%
rename from lib/widget/viewer_detail_pane.dart
rename to app/lib/widget/viewer_detail_pane.dart
diff --git a/lib/widget/viewer_mixin.dart b/app/lib/widget/viewer_mixin.dart
similarity index 100%
rename from lib/widget/viewer_mixin.dart
rename to app/lib/widget/viewer_mixin.dart
diff --git a/lib/widget/wakelock_util.dart b/app/lib/widget/wakelock_util.dart
similarity index 100%
rename from lib/widget/wakelock_util.dart
rename to app/lib/widget/wakelock_util.dart
diff --git a/lib/widget/zoom_menu_button.dart b/app/lib/widget/zoom_menu_button.dart
similarity index 100%
rename from lib/widget/zoom_menu_button.dart
rename to app/lib/widget/zoom_menu_button.dart
diff --git a/pubspec.lock b/app/pubspec.lock
similarity index 100%
rename from pubspec.lock
rename to app/pubspec.lock
diff --git a/pubspec.yaml b/app/pubspec.yaml
similarity index 100%
rename from pubspec.yaml
rename to app/pubspec.yaml
diff --git a/test/bloc/list_album_share_outlier_test.dart b/app/test/bloc/list_album_share_outlier_test.dart
similarity index 100%
rename from test/bloc/list_album_share_outlier_test.dart
rename to app/test/bloc/list_album_share_outlier_test.dart
diff --git a/test/bloc/ls_dir_test.dart b/app/test/bloc/ls_dir_test.dart
similarity index 100%
rename from test/bloc/ls_dir_test.dart
rename to app/test/bloc/ls_dir_test.dart
diff --git a/test/ci_string_test.dart b/app/test/ci_string_test.dart
similarity index 100%
rename from test/ci_string_test.dart
rename to app/test/ci_string_test.dart
diff --git a/test/debug_util_test.dart b/app/test/debug_util_test.dart
similarity index 100%
rename from test/debug_util_test.dart
rename to app/test/debug_util_test.dart
diff --git a/test/double_extension_test.dart b/app/test/double_extension_test.dart
similarity index 100%
rename from test/double_extension_test.dart
rename to app/test/double_extension_test.dart
diff --git a/test/entity/album_test.dart b/app/test/entity/album_test.dart
similarity index 100%
rename from test/entity/album_test.dart
rename to app/test/entity/album_test.dart
diff --git a/test/entity/exif_test.dart b/app/test/entity/exif_test.dart
similarity index 100%
rename from test/entity/exif_test.dart
rename to app/test/entity/exif_test.dart
diff --git a/test/entity/file/data_source_test.dart b/app/test/entity/file/data_source_test.dart
similarity index 100%
rename from test/entity/file/data_source_test.dart
rename to app/test/entity/file/data_source_test.dart
diff --git a/test/entity/file_test.dart b/app/test/entity/file_test.dart
similarity index 100%
rename from test/entity/file_test.dart
rename to app/test/entity/file_test.dart
diff --git a/test/entity/file_util_test.dart b/app/test/entity/file_util_test.dart
similarity index 100%
rename from test/entity/file_util_test.dart
rename to app/test/entity/file_util_test.dart
diff --git a/test/entity/webdav_response_parser_test.dart b/app/test/entity/webdav_response_parser_test.dart
similarity index 100%
rename from test/entity/webdav_response_parser_test.dart
rename to app/test/entity/webdav_response_parser_test.dart
diff --git a/test/iterable_extension_test.dart b/app/test/iterable_extension_test.dart
similarity index 100%
rename from test/iterable_extension_test.dart
rename to app/test/iterable_extension_test.dart
diff --git a/test/iterator_extension_test.dart b/app/test/iterator_extension_test.dart
similarity index 100%
rename from test/iterator_extension_test.dart
rename to app/test/iterator_extension_test.dart
diff --git a/test/list_extension_test.dart b/app/test/list_extension_test.dart
similarity index 100%
rename from test/list_extension_test.dart
rename to app/test/list_extension_test.dart
diff --git a/test/list_util_test.dart b/app/test/list_util_test.dart
similarity index 100%
rename from test/list_util_test.dart
rename to app/test/list_util_test.dart
diff --git a/test/mock_type.dart b/app/test/mock_type.dart
similarity index 100%
rename from test/mock_type.dart
rename to app/test/mock_type.dart
diff --git a/test/num_extension_test.dart b/app/test/num_extension_test.dart
similarity index 100%
rename from test/num_extension_test.dart
rename to app/test/num_extension_test.dart
diff --git a/test/object_extension_test.dart b/app/test/object_extension_test.dart
similarity index 100%
rename from test/object_extension_test.dart
rename to app/test/object_extension_test.dart
diff --git a/test/string_extension_test.dart b/app/test/string_extension_test.dart
similarity index 100%
rename from test/string_extension_test.dart
rename to app/test/string_extension_test.dart
diff --git a/test/test_util.dart b/app/test/test_util.dart
similarity index 100%
rename from test/test_util.dart
rename to app/test/test_util.dart
diff --git a/test/use_case/add_to_album_test.dart b/app/test/use_case/add_to_album_test.dart
similarity index 100%
rename from test/use_case/add_to_album_test.dart
rename to app/test/use_case/add_to_album_test.dart
diff --git a/test/use_case/compat/v32_test.dart b/app/test/use_case/compat/v32_test.dart
similarity index 100%
rename from test/use_case/compat/v32_test.dart
rename to app/test/use_case/compat/v32_test.dart
diff --git a/test/use_case/compat/v34_test.dart b/app/test/use_case/compat/v34_test.dart
similarity index 100%
rename from test/use_case/compat/v34_test.dart
rename to app/test/use_case/compat/v34_test.dart
diff --git a/test/use_case/compat/v37_test.dart b/app/test/use_case/compat/v37_test.dart
similarity index 100%
rename from test/use_case/compat/v37_test.dart
rename to app/test/use_case/compat/v37_test.dart
diff --git a/test/use_case/db_compat/v5_test.dart b/app/test/use_case/db_compat/v5_test.dart
similarity index 100%
rename from test/use_case/db_compat/v5_test.dart
rename to app/test/use_case/db_compat/v5_test.dart
diff --git a/test/use_case/find_file_test.dart b/app/test/use_case/find_file_test.dart
similarity index 100%
rename from test/use_case/find_file_test.dart
rename to app/test/use_case/find_file_test.dart
diff --git a/test/use_case/ls_test.dart b/app/test/use_case/ls_test.dart
similarity index 100%
rename from test/use_case/ls_test.dart
rename to app/test/use_case/ls_test.dart
diff --git a/test/use_case/remove_album_test.dart b/app/test/use_case/remove_album_test.dart
similarity index 100%
rename from test/use_case/remove_album_test.dart
rename to app/test/use_case/remove_album_test.dart
diff --git a/test/use_case/remove_from_album_test.dart b/app/test/use_case/remove_from_album_test.dart
similarity index 100%
rename from test/use_case/remove_from_album_test.dart
rename to app/test/use_case/remove_from_album_test.dart
diff --git a/test/use_case/remove_test.dart b/app/test/use_case/remove_test.dart
similarity index 100%
rename from test/use_case/remove_test.dart
rename to app/test/use_case/remove_test.dart
diff --git a/test/use_case/scan_dir_offline_test.dart b/app/test/use_case/scan_dir_offline_test.dart
similarity index 100%
rename from test/use_case/scan_dir_offline_test.dart
rename to app/test/use_case/scan_dir_offline_test.dart
diff --git a/test/use_case/share_album_with_user_test.dart b/app/test/use_case/share_album_with_user_test.dart
similarity index 100%
rename from test/use_case/share_album_with_user_test.dart
rename to app/test/use_case/share_album_with_user_test.dart
diff --git a/test/use_case/unshare_album_with_user_test.dart b/app/test/use_case/unshare_album_with_user_test.dart
similarity index 100%
rename from test/use_case/unshare_album_with_user_test.dart
rename to app/test/use_case/unshare_album_with_user_test.dart
diff --git a/test/widget/photo_list_util_test.dart b/app/test/widget/photo_list_util_test.dart
similarity index 100%
rename from test/widget/photo_list_util_test.dart
rename to app/test/widget/photo_list_util_test.dart
diff --git a/web/favicon.png b/app/web/favicon.png
similarity index 100%
rename from web/favicon.png
rename to app/web/favicon.png
diff --git a/web/icons/Icon-192.png b/app/web/icons/Icon-192.png
similarity index 100%
rename from web/icons/Icon-192.png
rename to app/web/icons/Icon-192.png
diff --git a/web/icons/Icon-512.png b/app/web/icons/Icon-512.png
similarity index 100%
rename from web/icons/Icon-512.png
rename to app/web/icons/Icon-512.png
diff --git a/web/index.html b/app/web/index.html
similarity index 100%
rename from web/index.html
rename to app/web/index.html
diff --git a/web/manifest.json b/app/web/manifest.json
similarity index 100%
rename from web/manifest.json
rename to app/web/manifest.json