diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/branding.desc b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/branding.desc
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/branding.desc
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/branding.desc
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/languages.png b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/languages.png
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/languages.png
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/languages.png
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/logo.png b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/logo.png
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/logo.png
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/logo.png
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/show.qml b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/show.qml
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/show.qml
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/show.qml
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide1.png b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide1.png
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide1.png
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide1.png
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide2.png b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide2.png
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide2.png
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide2.png
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide3.png b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide3.png
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide3.png
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide3.png
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide4.png b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide4.png
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide4.png
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide4.png
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide5.png b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide5.png
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide5.png
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/slide5.png
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/squid.png b/tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/squid.png
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/squid.png
rename to tromjaro/gnome/live-overlay/etc/calamares/branding/tromjaro/squid.png
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/bootloader.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/bootloader.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/bootloader.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/bootloader.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/chrootcfg.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/chrootcfg.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/chrootcfg.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/chrootcfg.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/contextualprocess.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/contextualprocess.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/contextualprocess.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/contextualprocess.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/displaymanager.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/displaymanager.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/displaymanager.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/displaymanager.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/finished.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/finished.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/finished.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/finished.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/fsresizer.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/fsresizer.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/fsresizer.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/fsresizer.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/fstab.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/fstab.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/fstab.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/fstab.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/grubcfg.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/grubcfg.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/grubcfg.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/grubcfg.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/initcpio.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/initcpio.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/initcpio.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/initcpio.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/keyboard.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/keyboard.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/keyboard.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/keyboard.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/license.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/license.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/license.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/license.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/locale.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/locale.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/locale.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/locale.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/luksopenswaphookcfg.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/luksopenswaphookcfg.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/luksopenswaphookcfg.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/luksopenswaphookcfg.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/machineid.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/machineid.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/machineid.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/machineid.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/mhwdcfg.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/mhwdcfg.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/mhwdcfg.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/mhwdcfg.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/mount.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/mount.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/mount.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/mount.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/netinstall.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/netinstall.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/netinstall.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/netinstall.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/oemid.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/oemid.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/oemid.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/oemid.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/openrcdmcryptcfg.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/openrcdmcryptcfg.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/openrcdmcryptcfg.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/openrcdmcryptcfg.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/packagechooser.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/packagechooser.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/packagechooser.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/packagechooser.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/packages.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/packages.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/packages.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/packages.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/partition.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/partition.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/partition.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/partition.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/plasmalnf.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/plasmalnf.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/plasmalnf.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/plasmalnf.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/plymouthcfg.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/plymouthcfg.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/plymouthcfg.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/plymouthcfg.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/postcfg.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/postcfg.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/postcfg.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/postcfg.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/preservefiles.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/preservefiles.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/preservefiles.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/preservefiles.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/rawfs.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/rawfs.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/rawfs.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/rawfs.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/removeuser.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/removeuser.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/removeuser.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/removeuser.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/services.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/services.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/services.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/services.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/servicescfg.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/servicescfg.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/servicescfg.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/servicescfg.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/shellprocess.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/shellprocess.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/shellprocess.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/shellprocess.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/tracking.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/tracking.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/tracking.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/tracking.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/umount.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/umount.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/umount.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/umount.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/unpackfs.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/unpackfs.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/unpackfs.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/unpackfs.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/users.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/users.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/users.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/users.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/modules/welcome.conf b/tromjaro/gnome/live-overlay/etc/calamares/modules/welcome.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/modules/welcome.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/modules/welcome.conf
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/BackButton.qml b/tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/BackButton.qml
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/BackButton.qml
rename to tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/BackButton.qml
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/ForwardButton.qml b/tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/ForwardButton.qml
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/ForwardButton.qml
rename to tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/ForwardButton.qml
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/NavButton.qml b/tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/NavButton.qml
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/NavButton.qml
rename to tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/NavButton.qml
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/Presentation.qml b/tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/Presentation.qml
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/Presentation.qml
rename to tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/Presentation.qml
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/Slide.qml b/tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/Slide.qml
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/Slide.qml
rename to tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/Slide.qml
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/SlideCounter.qml b/tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/SlideCounter.qml
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/SlideCounter.qml
rename to tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/SlideCounter.qml
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/qmldir b/tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/qmldir
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/qml/calamares/slideshow/qmldir
rename to tromjaro/gnome/live-overlay/etc/calamares/qml/calamares/slideshow/qmldir
diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/settings.conf b/tromjaro/gnome/live-overlay/etc/calamares/settings.conf
similarity index 100%
rename from tromjaro/gnome/live-overlay/usr/share/calamares/settings.conf
rename to tromjaro/gnome/live-overlay/etc/calamares/settings.conf