diff --git a/Containerfile.cp b/Containerfile.cp
index 0af3b54..79eabaa 100644
--- a/Containerfile.cp
+++ b/Containerfile.cp
@@ -24,7 +24,7 @@ ARG RECIPE=recipe-c.yml
 # templates on immutable Fedora distros, whereas the normal "/etc" is ONLY meant
 # for manual overrides and editing by the machine's admin AFTER installation!
 # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28).
-COPY usr-common/ /usr
+COPY usr/ /usr
 COPY ${USR_DIR}/ /usr
 
 # Copy the recipe that we're building.
diff --git a/Containerfile.jp b/Containerfile.jp
index 6ab31ee..499f076 100644
--- a/Containerfile.jp
+++ b/Containerfile.jp
@@ -24,7 +24,7 @@ ARG RECIPE=recipe-framework-13.yml
 # templates on immutable Fedora distros, whereas the normal "/etc" is ONLY meant
 # for manual overrides and editing by the machine's admin AFTER installation!
 # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28).
-COPY usr-common/ /usr
+COPY usr/ /usr
 COPY ${USR_DIR}/ /usr
 
 # Copy the recipe that we're building.
diff --git a/usr-common/bin/ublue-nix-install b/usr/bin/ublue-nix-install
similarity index 100%
rename from usr-common/bin/ublue-nix-install
rename to usr/bin/ublue-nix-install
diff --git a/usr-common/bin/ublue-nix-uninstall b/usr/bin/ublue-nix-uninstall
similarity index 100%
rename from usr-common/bin/ublue-nix-uninstall
rename to usr/bin/ublue-nix-uninstall
diff --git a/usr-common/share/ublue-os/firstboot/launcher/autostart.desktop b/usr/share/ublue-os/firstboot/launcher/autostart.desktop
similarity index 100%
rename from usr-common/share/ublue-os/firstboot/launcher/autostart.desktop
rename to usr/share/ublue-os/firstboot/launcher/autostart.desktop
diff --git a/usr-common/share/ublue-os/firstboot/launcher/autostart.sh b/usr/share/ublue-os/firstboot/launcher/autostart.sh
similarity index 100%
rename from usr-common/share/ublue-os/firstboot/launcher/autostart.sh
rename to usr/share/ublue-os/firstboot/launcher/autostart.sh
diff --git a/usr-common/share/ublue-os/firstboot/launcher/launcher-flowchart.png b/usr/share/ublue-os/firstboot/launcher/launcher-flowchart.png
similarity index 100%
rename from usr-common/share/ublue-os/firstboot/launcher/launcher-flowchart.png
rename to usr/share/ublue-os/firstboot/launcher/launcher-flowchart.png
diff --git a/usr-common/share/ublue-os/firstboot/launcher/login-profile.sh b/usr/share/ublue-os/firstboot/launcher/login-profile.sh
similarity index 100%
rename from usr-common/share/ublue-os/firstboot/launcher/login-profile.sh
rename to usr/share/ublue-os/firstboot/launcher/login-profile.sh
diff --git a/usr-common/share/ublue-os/firstboot/yafti.yml b/usr/share/ublue-os/firstboot/yafti.yml
similarity index 100%
rename from usr-common/share/ublue-os/firstboot/yafti.yml
rename to usr/share/ublue-os/firstboot/yafti.yml
diff --git a/usr-common/share/ublue-os/just/custom.just b/usr/share/ublue-os/just/custom.just
similarity index 100%
rename from usr-common/share/ublue-os/just/custom.just
rename to usr/share/ublue-os/just/custom.just