diff --git a/data/de.johrpan.musicus.desktop.in b/crates/musicus/data/de.johrpan.musicus.desktop.in
similarity index 100%
rename from data/de.johrpan.musicus.desktop.in
rename to crates/musicus/data/de.johrpan.musicus.desktop.in
diff --git a/data/de.johrpan.musicus.gschema.xml b/crates/musicus/data/de.johrpan.musicus.gschema.xml
similarity index 100%
rename from data/de.johrpan.musicus.gschema.xml
rename to crates/musicus/data/de.johrpan.musicus.gschema.xml
diff --git a/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg b/crates/musicus/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg
rename to crates/musicus/data/icons/hicolor/scalable/apps/de.johrpan.musicus.svg
diff --git a/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg b/crates/musicus/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg
rename to crates/musicus/data/icons/hicolor/symbolic/apps/de.johrpan.musicus-symbolic.svg
diff --git a/data/meson.build b/crates/musicus/data/meson.build
similarity index 100%
rename from data/meson.build
rename to crates/musicus/data/meson.build
diff --git a/po/LINGUAS b/crates/musicus/po/LINGUAS
similarity index 100%
rename from po/LINGUAS
rename to crates/musicus/po/LINGUAS
diff --git a/po/POTFILES.in b/crates/musicus/po/POTFILES.in
similarity index 100%
rename from po/POTFILES.in
rename to crates/musicus/po/POTFILES.in
diff --git a/po/de.po b/crates/musicus/po/de.po
similarity index 100%
rename from po/de.po
rename to crates/musicus/po/de.po
diff --git a/po/meson.build b/crates/musicus/po/meson.build
similarity index 100%
rename from po/meson.build
rename to crates/musicus/po/meson.build
diff --git a/po/musicus.pot b/crates/musicus/po/musicus.pot
similarity index 100%
rename from po/musicus.pot
rename to crates/musicus/po/musicus.pot
diff --git a/res/meson.build b/crates/musicus/res/meson.build
similarity index 100%
rename from res/meson.build
rename to crates/musicus/res/meson.build
diff --git a/res/musicus.gresource.xml b/crates/musicus/res/musicus.gresource.xml
similarity index 100%
rename from res/musicus.gresource.xml
rename to crates/musicus/res/musicus.gresource.xml
diff --git a/res/ui/editor.ui b/crates/musicus/res/ui/editor.ui
similarity index 100%
rename from res/ui/editor.ui
rename to crates/musicus/res/ui/editor.ui
diff --git a/res/ui/login_dialog.ui b/crates/musicus/res/ui/login_dialog.ui
similarity index 100%
rename from res/ui/login_dialog.ui
rename to crates/musicus/res/ui/login_dialog.ui
diff --git a/res/ui/main_screen.ui b/crates/musicus/res/ui/main_screen.ui
similarity index 100%
rename from res/ui/main_screen.ui
rename to crates/musicus/res/ui/main_screen.ui
diff --git a/res/ui/medium_editor.ui b/crates/musicus/res/ui/medium_editor.ui
similarity index 100%
rename from res/ui/medium_editor.ui
rename to crates/musicus/res/ui/medium_editor.ui
diff --git a/res/ui/performance_editor.ui b/crates/musicus/res/ui/performance_editor.ui
similarity index 100%
rename from res/ui/performance_editor.ui
rename to crates/musicus/res/ui/performance_editor.ui
diff --git a/res/ui/player_bar.ui b/crates/musicus/res/ui/player_bar.ui
similarity index 100%
rename from res/ui/player_bar.ui
rename to crates/musicus/res/ui/player_bar.ui
diff --git a/res/ui/player_screen.ui b/crates/musicus/res/ui/player_screen.ui
similarity index 100%
rename from res/ui/player_screen.ui
rename to crates/musicus/res/ui/player_screen.ui
diff --git a/res/ui/preferences.ui b/crates/musicus/res/ui/preferences.ui
similarity index 100%
rename from res/ui/preferences.ui
rename to crates/musicus/res/ui/preferences.ui
diff --git a/res/ui/recording_editor.ui b/crates/musicus/res/ui/recording_editor.ui
similarity index 100%
rename from res/ui/recording_editor.ui
rename to crates/musicus/res/ui/recording_editor.ui
diff --git a/res/ui/register_dialog.ui b/crates/musicus/res/ui/register_dialog.ui
similarity index 100%
rename from res/ui/register_dialog.ui
rename to crates/musicus/res/ui/register_dialog.ui
diff --git a/res/ui/screen.ui b/crates/musicus/res/ui/screen.ui
similarity index 100%
rename from res/ui/screen.ui
rename to crates/musicus/res/ui/screen.ui
diff --git a/res/ui/section.ui b/crates/musicus/res/ui/section.ui
similarity index 100%
rename from res/ui/section.ui
rename to crates/musicus/res/ui/section.ui
diff --git a/res/ui/selector.ui b/crates/musicus/res/ui/selector.ui
similarity index 100%
rename from res/ui/selector.ui
rename to crates/musicus/res/ui/selector.ui
diff --git a/res/ui/server_dialog.ui b/crates/musicus/res/ui/server_dialog.ui
similarity index 100%
rename from res/ui/server_dialog.ui
rename to crates/musicus/res/ui/server_dialog.ui
diff --git a/res/ui/source_selector.ui b/crates/musicus/res/ui/source_selector.ui
similarity index 100%
rename from res/ui/source_selector.ui
rename to crates/musicus/res/ui/source_selector.ui
diff --git a/res/ui/track_editor.ui b/crates/musicus/res/ui/track_editor.ui
similarity index 100%
rename from res/ui/track_editor.ui
rename to crates/musicus/res/ui/track_editor.ui
diff --git a/res/ui/track_selector.ui b/crates/musicus/res/ui/track_selector.ui
similarity index 100%
rename from res/ui/track_selector.ui
rename to crates/musicus/res/ui/track_selector.ui
diff --git a/res/ui/track_set_editor.ui b/crates/musicus/res/ui/track_set_editor.ui
similarity index 100%
rename from res/ui/track_set_editor.ui
rename to crates/musicus/res/ui/track_set_editor.ui
diff --git a/res/ui/work_editor.ui b/crates/musicus/res/ui/work_editor.ui
similarity index 100%
rename from res/ui/work_editor.ui
rename to crates/musicus/res/ui/work_editor.ui
diff --git a/res/ui/work_part_editor.ui b/crates/musicus/res/ui/work_part_editor.ui
similarity index 100%
rename from res/ui/work_part_editor.ui
rename to crates/musicus/res/ui/work_part_editor.ui
diff --git a/res/ui/work_section_editor.ui b/crates/musicus/res/ui/work_section_editor.ui
similarity index 100%
rename from res/ui/work_section_editor.ui
rename to crates/musicus/res/ui/work_section_editor.ui
diff --git a/crates/musicus/src/resources.rs b/crates/musicus/src/resources.rs
index a88b177..4ded19d 100644
--- a/crates/musicus/src/resources.rs
+++ b/crates/musicus/src/resources.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 
 pub fn init() -> Result<()> {
-    let bytes = glib::Bytes::from(include_bytes!("/home/johrpan/.var/app/org.gnome.Builder/cache/gnome-builder/projects/musicus/builds/de.johrpan.musicus.json-flatpak-org.gnome.Platform-x86_64-master-master/res/musicus.gresource").as_ref());
+    let bytes = glib::Bytes::from(include_bytes!("/home/johrpan/.var/app/org.gnome.Builder/cache/gnome-builder/projects/musicus/builds/de.johrpan.musicus.json-flatpak-org.gnome.Platform-x86_64-master-master/crates/musicus/res/musicus.gresource").as_ref());
     let resource = gio::Resource::from_data(&bytes)?;
     gio::resources_register(&resource);
 
diff --git a/meson.build b/meson.build
index e553bc7..aa78c78 100644
--- a/meson.build
+++ b/meson.build
@@ -9,7 +9,7 @@ dependency('glib-2.0', version: '>= 2.56')
 dependency('gio-2.0', version: '>= 2.56')
 dependency('gstreamer-1.0', version: '>= 1.12')
 dependency('gtk4', version: '>= 4.0')
-#dependency('libcurl', version: '>= 7.24.0')
+dependency('libcurl', version: '>= 7.24.0')
 dependency('libdiscid', version: '>= 0.6.2')
 dependency('libadwaita-1', version: '>= 1.0')
 dependency('pango', version: '>= 1.0')
@@ -17,9 +17,9 @@ dependency('sqlite3', version: '>= 3.20')
 
 i18n = import('i18n')
 
-subdir('data')
-subdir('po')
-subdir('res')
+subdir('crates/musicus/data')
+subdir('crates/musicus/po')
+subdir('crates/musicus/res')
 subdir('crates/musicus/src')
 
 meson.add_install_script('build-aux/postinstall.py')