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