diff --git a/musicus/.gitignore b/mobile/.gitignore
similarity index 100%
rename from musicus/.gitignore
rename to mobile/.gitignore
diff --git a/musicus/android/.gitignore b/mobile/android/.gitignore
similarity index 100%
rename from musicus/android/.gitignore
rename to mobile/android/.gitignore
diff --git a/musicus/android/app/build.gradle b/mobile/android/app/build.gradle
similarity index 100%
rename from musicus/android/app/build.gradle
rename to mobile/android/app/build.gradle
diff --git a/musicus/android/app/src/debug/AndroidManifest.xml b/mobile/android/app/src/debug/AndroidManifest.xml
similarity index 100%
rename from musicus/android/app/src/debug/AndroidManifest.xml
rename to mobile/android/app/src/debug/AndroidManifest.xml
diff --git a/musicus/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from musicus/android/app/src/main/AndroidManifest.xml
rename to mobile/android/app/src/main/AndroidManifest.xml
diff --git a/musicus/android/app/src/main/ic_launcher-web.png b/mobile/android/app/src/main/ic_launcher-web.png
similarity index 100%
rename from musicus/android/app/src/main/ic_launcher-web.png
rename to mobile/android/app/src/main/ic_launcher-web.png
diff --git a/musicus/android/app/src/main/kotlin/de/johrpan/musicus/MainActivity.kt b/mobile/android/app/src/main/kotlin/de/johrpan/musicus/MainActivity.kt
similarity index 100%
rename from musicus/android/app/src/main/kotlin/de/johrpan/musicus/MainActivity.kt
rename to mobile/android/app/src/main/kotlin/de/johrpan/musicus/MainActivity.kt
diff --git a/musicus/android/app/src/main/res/drawable-hdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-hdpi/ic_notification.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/musicus/android/app/src/main/res/drawable-hdpi/ic_pause.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_pause.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-hdpi/ic_pause.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_pause.png
diff --git a/musicus/android/app/src/main/res/drawable-hdpi/ic_play.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_play.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-hdpi/ic_play.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_play.png
diff --git a/musicus/android/app/src/main/res/drawable-hdpi/ic_stop.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_stop.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-hdpi/ic_stop.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_stop.png
diff --git a/musicus/android/app/src/main/res/drawable-mdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-mdpi/ic_notification.png
rename to mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/musicus/android/app/src/main/res/drawable-mdpi/ic_pause.png b/mobile/android/app/src/main/res/drawable-mdpi/ic_pause.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-mdpi/ic_pause.png
rename to mobile/android/app/src/main/res/drawable-mdpi/ic_pause.png
diff --git a/musicus/android/app/src/main/res/drawable-mdpi/ic_play.png b/mobile/android/app/src/main/res/drawable-mdpi/ic_play.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-mdpi/ic_play.png
rename to mobile/android/app/src/main/res/drawable-mdpi/ic_play.png
diff --git a/musicus/android/app/src/main/res/drawable-mdpi/ic_stop.png b/mobile/android/app/src/main/res/drawable-mdpi/ic_stop.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-mdpi/ic_stop.png
rename to mobile/android/app/src/main/res/drawable-mdpi/ic_stop.png
diff --git a/musicus/android/app/src/main/res/drawable-xhdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xhdpi/ic_notification.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/musicus/android/app/src/main/res/drawable-xhdpi/ic_pause.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_pause.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xhdpi/ic_pause.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_pause.png
diff --git a/musicus/android/app/src/main/res/drawable-xhdpi/ic_play.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_play.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xhdpi/ic_play.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_play.png
diff --git a/musicus/android/app/src/main/res/drawable-xhdpi/ic_stop.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_stop.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xhdpi/ic_stop.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_stop.png
diff --git a/musicus/android/app/src/main/res/drawable-xxhdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/musicus/android/app/src/main/res/drawable-xxhdpi/ic_pause.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_pause.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xxhdpi/ic_pause.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_pause.png
diff --git a/musicus/android/app/src/main/res/drawable-xxhdpi/ic_play.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_play.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xxhdpi/ic_play.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_play.png
diff --git a/musicus/android/app/src/main/res/drawable-xxhdpi/ic_stop.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_stop.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xxhdpi/ic_stop.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_stop.png
diff --git a/musicus/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
rename to mobile/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
diff --git a/musicus/android/app/src/main/res/drawable-xxxhdpi/ic_pause.png b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_pause.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xxxhdpi/ic_pause.png
rename to mobile/android/app/src/main/res/drawable-xxxhdpi/ic_pause.png
diff --git a/musicus/android/app/src/main/res/drawable-xxxhdpi/ic_play.png b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_play.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xxxhdpi/ic_play.png
rename to mobile/android/app/src/main/res/drawable-xxxhdpi/ic_play.png
diff --git a/musicus/android/app/src/main/res/drawable-xxxhdpi/ic_stop.png b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_stop.png
similarity index 100%
rename from musicus/android/app/src/main/res/drawable-xxxhdpi/ic_stop.png
rename to mobile/android/app/src/main/res/drawable-xxxhdpi/ic_stop.png
diff --git a/musicus/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/mobile/android/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from musicus/android/app/src/main/res/drawable/ic_launcher_foreground.xml
rename to mobile/android/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/musicus/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/musicus/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/musicus/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/musicus/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/musicus/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/musicus/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/musicus/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/musicus/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/musicus/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/musicus/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/musicus/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/musicus/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from musicus/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/musicus/android/app/src/main/res/values/colors.xml b/mobile/android/app/src/main/res/values/colors.xml
similarity index 100%
rename from musicus/android/app/src/main/res/values/colors.xml
rename to mobile/android/app/src/main/res/values/colors.xml
diff --git a/musicus/android/app/src/main/res/values/styles.xml b/mobile/android/app/src/main/res/values/styles.xml
similarity index 100%
rename from musicus/android/app/src/main/res/values/styles.xml
rename to mobile/android/app/src/main/res/values/styles.xml
diff --git a/musicus/android/app/src/profile/AndroidManifest.xml b/mobile/android/app/src/profile/AndroidManifest.xml
similarity index 100%
rename from musicus/android/app/src/profile/AndroidManifest.xml
rename to mobile/android/app/src/profile/AndroidManifest.xml
diff --git a/musicus/android/build.gradle b/mobile/android/build.gradle
similarity index 100%
rename from musicus/android/build.gradle
rename to mobile/android/build.gradle
diff --git a/musicus/android/gradle.properties b/mobile/android/gradle.properties
similarity index 100%
rename from musicus/android/gradle.properties
rename to mobile/android/gradle.properties
diff --git a/musicus/android/settings.gradle b/mobile/android/settings.gradle
similarity index 100%
rename from musicus/android/settings.gradle
rename to mobile/android/settings.gradle
diff --git a/musicus/build.yaml b/mobile/build.yaml
similarity index 100%
rename from musicus/build.yaml
rename to mobile/build.yaml
diff --git a/musicus/fonts/libertinussans_bold.otf b/mobile/fonts/libertinussans_bold.otf
similarity index 100%
rename from musicus/fonts/libertinussans_bold.otf
rename to mobile/fonts/libertinussans_bold.otf
diff --git a/musicus/fonts/libertinussans_italic.otf b/mobile/fonts/libertinussans_italic.otf
similarity index 100%
rename from musicus/fonts/libertinussans_italic.otf
rename to mobile/fonts/libertinussans_italic.otf
diff --git a/musicus/fonts/libertinussans_regular.otf b/mobile/fonts/libertinussans_regular.otf
similarity index 100%
rename from musicus/fonts/libertinussans_regular.otf
rename to mobile/fonts/libertinussans_regular.otf
diff --git a/musicus/lib/app.dart b/mobile/lib/app.dart
similarity index 100%
rename from musicus/lib/app.dart
rename to mobile/lib/app.dart
diff --git a/musicus/lib/backend.dart b/mobile/lib/backend.dart
similarity index 100%
rename from musicus/lib/backend.dart
rename to mobile/lib/backend.dart
diff --git a/musicus/lib/database.dart b/mobile/lib/database.dart
similarity index 100%
rename from musicus/lib/database.dart
rename to mobile/lib/database.dart
diff --git a/musicus/lib/database.moor b/mobile/lib/database.moor
similarity index 100%
rename from musicus/lib/database.moor
rename to mobile/lib/database.moor
diff --git a/musicus/lib/editors/ensemble.dart b/mobile/lib/editors/ensemble.dart
similarity index 100%
rename from musicus/lib/editors/ensemble.dart
rename to mobile/lib/editors/ensemble.dart
diff --git a/musicus/lib/editors/instrument.dart b/mobile/lib/editors/instrument.dart
similarity index 100%
rename from musicus/lib/editors/instrument.dart
rename to mobile/lib/editors/instrument.dart
diff --git a/musicus/lib/editors/person.dart b/mobile/lib/editors/person.dart
similarity index 100%
rename from musicus/lib/editors/person.dart
rename to mobile/lib/editors/person.dart
diff --git a/musicus/lib/editors/recording.dart b/mobile/lib/editors/recording.dart
similarity index 100%
rename from musicus/lib/editors/recording.dart
rename to mobile/lib/editors/recording.dart
diff --git a/musicus/lib/editors/tracks.dart b/mobile/lib/editors/tracks.dart
similarity index 100%
rename from musicus/lib/editors/tracks.dart
rename to mobile/lib/editors/tracks.dart
diff --git a/musicus/lib/editors/work.dart b/mobile/lib/editors/work.dart
similarity index 100%
rename from musicus/lib/editors/work.dart
rename to mobile/lib/editors/work.dart
diff --git a/musicus/lib/main.dart b/mobile/lib/main.dart
similarity index 100%
rename from musicus/lib/main.dart
rename to mobile/lib/main.dart
diff --git a/musicus/lib/music_library.dart b/mobile/lib/music_library.dart
similarity index 100%
rename from musicus/lib/music_library.dart
rename to mobile/lib/music_library.dart
diff --git a/musicus/lib/platform.dart b/mobile/lib/platform.dart
similarity index 100%
rename from musicus/lib/platform.dart
rename to mobile/lib/platform.dart
diff --git a/musicus/lib/player.dart b/mobile/lib/player.dart
similarity index 100%
rename from musicus/lib/player.dart
rename to mobile/lib/player.dart
diff --git a/musicus/lib/screens/home.dart b/mobile/lib/screens/home.dart
similarity index 100%
rename from musicus/lib/screens/home.dart
rename to mobile/lib/screens/home.dart
diff --git a/musicus/lib/screens/person.dart b/mobile/lib/screens/person.dart
similarity index 100%
rename from musicus/lib/screens/person.dart
rename to mobile/lib/screens/person.dart
diff --git a/musicus/lib/screens/program.dart b/mobile/lib/screens/program.dart
similarity index 100%
rename from musicus/lib/screens/program.dart
rename to mobile/lib/screens/program.dart
diff --git a/musicus/lib/screens/settings.dart b/mobile/lib/screens/settings.dart
similarity index 100%
rename from musicus/lib/screens/settings.dart
rename to mobile/lib/screens/settings.dart
diff --git a/musicus/lib/screens/work.dart b/mobile/lib/screens/work.dart
similarity index 100%
rename from musicus/lib/screens/work.dart
rename to mobile/lib/screens/work.dart
diff --git a/musicus/lib/selectors/files.dart b/mobile/lib/selectors/files.dart
similarity index 100%
rename from musicus/lib/selectors/files.dart
rename to mobile/lib/selectors/files.dart
diff --git a/musicus/lib/selectors/instruments.dart b/mobile/lib/selectors/instruments.dart
similarity index 100%
rename from musicus/lib/selectors/instruments.dart
rename to mobile/lib/selectors/instruments.dart
diff --git a/musicus/lib/selectors/performer.dart b/mobile/lib/selectors/performer.dart
similarity index 100%
rename from musicus/lib/selectors/performer.dart
rename to mobile/lib/selectors/performer.dart
diff --git a/musicus/lib/selectors/person.dart b/mobile/lib/selectors/person.dart
similarity index 100%
rename from musicus/lib/selectors/person.dart
rename to mobile/lib/selectors/person.dart
diff --git a/musicus/lib/selectors/recording.dart b/mobile/lib/selectors/recording.dart
similarity index 100%
rename from musicus/lib/selectors/recording.dart
rename to mobile/lib/selectors/recording.dart
diff --git a/musicus/lib/selectors/work.dart b/mobile/lib/selectors/work.dart
similarity index 100%
rename from musicus/lib/selectors/work.dart
rename to mobile/lib/selectors/work.dart
diff --git a/musicus/lib/widgets/play_pause_button.dart b/mobile/lib/widgets/play_pause_button.dart
similarity index 100%
rename from musicus/lib/widgets/play_pause_button.dart
rename to mobile/lib/widgets/play_pause_button.dart
diff --git a/musicus/lib/widgets/player_bar.dart b/mobile/lib/widgets/player_bar.dart
similarity index 100%
rename from musicus/lib/widgets/player_bar.dart
rename to mobile/lib/widgets/player_bar.dart
diff --git a/musicus/lib/widgets/recording_tile.dart b/mobile/lib/widgets/recording_tile.dart
similarity index 100%
rename from musicus/lib/widgets/recording_tile.dart
rename to mobile/lib/widgets/recording_tile.dart
diff --git a/musicus/lib/widgets/texts.dart b/mobile/lib/widgets/texts.dart
similarity index 100%
rename from musicus/lib/widgets/texts.dart
rename to mobile/lib/widgets/texts.dart
diff --git a/musicus/lib/widgets/works_by_composer.dart b/mobile/lib/widgets/works_by_composer.dart
similarity index 100%
rename from musicus/lib/widgets/works_by_composer.dart
rename to mobile/lib/widgets/works_by_composer.dart
diff --git a/musicus/pubspec.yaml b/mobile/pubspec.yaml
similarity index 100%
rename from musicus/pubspec.yaml
rename to mobile/pubspec.yaml
diff --git a/musicus_player/.gitignore b/player/.gitignore
similarity index 100%
rename from musicus_player/.gitignore
rename to player/.gitignore
diff --git a/musicus_player/android/.gitignore b/player/android/.gitignore
similarity index 100%
rename from musicus_player/android/.gitignore
rename to player/android/.gitignore
diff --git a/musicus_player/android/build.gradle b/player/android/build.gradle
similarity index 100%
rename from musicus_player/android/build.gradle
rename to player/android/build.gradle
diff --git a/musicus_player/android/gradle.properties b/player/android/gradle.properties
similarity index 100%
rename from musicus_player/android/gradle.properties
rename to player/android/gradle.properties
diff --git a/musicus_player/android/settings.gradle b/player/android/settings.gradle
similarity index 100%
rename from musicus_player/android/settings.gradle
rename to player/android/settings.gradle
diff --git a/musicus_player/android/src/main/AndroidManifest.xml b/player/android/src/main/AndroidManifest.xml
similarity index 100%
rename from musicus_player/android/src/main/AndroidManifest.xml
rename to player/android/src/main/AndroidManifest.xml
diff --git a/musicus_player/android/src/main/kotlin/de/johrpan/musicus_player/MusicusPlayerPlugin.kt b/player/android/src/main/kotlin/de/johrpan/musicus_player/MusicusPlayerPlugin.kt
similarity index 100%
rename from musicus_player/android/src/main/kotlin/de/johrpan/musicus_player/MusicusPlayerPlugin.kt
rename to player/android/src/main/kotlin/de/johrpan/musicus_player/MusicusPlayerPlugin.kt
diff --git a/musicus_player/lib/musicus_player.dart b/player/lib/musicus_player.dart
similarity index 100%
rename from musicus_player/lib/musicus_player.dart
rename to player/lib/musicus_player.dart
diff --git a/musicus_player/pubspec.yaml b/player/pubspec.yaml
similarity index 100%
rename from musicus_player/pubspec.yaml
rename to player/pubspec.yaml