diff --git a/meta-citadel/recipes-core/base-files/files/profile b/meta-citadel/recipes-citadel/bbappends/base-files/profile
similarity index 100%
rename from meta-citadel/recipes-core/base-files/files/profile
rename to meta-citadel/recipes-citadel/bbappends/base-files/profile
diff --git a/meta-citadel/recipes-core/base-files/base-files_%.bbappend b/meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend
similarity index 93%
rename from meta-citadel/recipes-core/base-files/base-files_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend
index 420866f..4ff9a83 100644
--- a/meta-citadel/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend
@@ -6,7 +6,7 @@ dirs755="/boot /dev /usr/bin /usr/sbin /usr/lib /etc /etc/default /etc/skel /usr
 
 volatiles = ""
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:"
 SRC_URI += "file://profile"
 
 do_install_append () {
diff --git a/meta-citadel/recipes-support/btrfs-tools/btrfs-tools_%.bbappend b/meta-citadel/recipes-citadel/bbappends/btrfs-tools_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-support/btrfs-tools/btrfs-tools_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/btrfs-tools_%.bbappend
diff --git a/meta-citadel/recipes-core/dbus/dbus_%.bbappend b/meta-citadel/recipes-citadel/bbappends/dbus_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-core/dbus/dbus_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/dbus_%.bbappend
diff --git a/meta-citadel/recipes-devtools/gcc/gcc-cross_9.%.bbappend b/meta-citadel/recipes-citadel/bbappends/gcc-cross_9.%.bbappend
similarity index 100%
rename from meta-citadel/recipes-devtools/gcc/gcc-cross_9.%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/gcc-cross_9.%.bbappend
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/50_gnome-terminal.gschema.override b/meta-citadel/recipes-citadel/bbappends/gnome-terminal/50_gnome-terminal.gschema.override
similarity index 100%
rename from meta-citadel/recipes-desktop/gnome-terminal/files/50_gnome-terminal.gschema.override
rename to meta-citadel/recipes-citadel/bbappends/gnome-terminal/50_gnome-terminal.gschema.override
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/gnome-terminal-citadel.service b/meta-citadel/recipes-citadel/bbappends/gnome-terminal/gnome-terminal-citadel.service
similarity index 100%
rename from meta-citadel/recipes-desktop/gnome-terminal/files/gnome-terminal-citadel.service
rename to meta-citadel/recipes-citadel/bbappends/gnome-terminal/gnome-terminal-citadel.service
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.desktop b/meta-citadel/recipes-citadel/bbappends/gnome-terminal/org.gnome.TerminalCitadel.desktop
similarity index 100%
rename from meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.desktop
rename to meta-citadel/recipes-citadel/bbappends/gnome-terminal/org.gnome.TerminalCitadel.desktop
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.service b/meta-citadel/recipes-citadel/bbappends/gnome-terminal/org.gnome.TerminalCitadel.service
similarity index 100%
rename from meta-citadel/recipes-desktop/gnome-terminal/files/org.gnome.TerminalCitadel.service
rename to meta-citadel/recipes-citadel/bbappends/gnome-terminal/org.gnome.TerminalCitadel.service
diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend
similarity index 92%
rename from meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend
index d1a7447..1d1b60f 100644
--- a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/gnome-terminal:"
 
 SRC_URI += "\
     file://gnome-terminal-citadel.service \
diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend
similarity index 100%
rename from meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend
diff --git a/meta-citadel/recipes-desktop/gtk+3/files/gtk-update-icon-cache-reproducibility-fix.patch b/meta-citadel/recipes-citadel/bbappends/gtk+3/gtk-update-icon-cache-reproducibility-fix.patch
similarity index 100%
rename from meta-citadel/recipes-desktop/gtk+3/files/gtk-update-icon-cache-reproducibility-fix.patch
rename to meta-citadel/recipes-citadel/bbappends/gtk+3/gtk-update-icon-cache-reproducibility-fix.patch
diff --git a/meta-citadel/recipes-support/gtk+/gtk+3_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gtk+3_%.bbappend
similarity index 58%
rename from meta-citadel/recipes-support/gtk+/gtk+3_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/gtk+3_%.bbappend
index 9c14aff..0530bff 100644
--- a/meta-citadel/recipes-support/gtk+/gtk+3_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/gtk+3_%.bbappend
@@ -1,2 +1,6 @@
 # Remove this dependency so it doesn't get dragged in with gtk.  These icons are in citadel-extra-image now
 GTKBASE_RRECOMMENDS_remove = "adwaita-icon-theme-symbolic"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/gtk+3:"
+
+SRC_URI += "file://gtk-update-icon-cache-reproducibility-fix.patch"
diff --git a/meta-citadel/recipes-support/lvm2/libaio_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libaio_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-support/lvm2/libaio_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/libaio_%.bbappend
diff --git a/meta-citadel/recipes-support/libblockdev/libblockdev_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libblockdev_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-support/libblockdev/libblockdev_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/libblockdev_%.bbappend
diff --git a/meta-citadel/recipes-support/libbytesize/libbytesize_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libbytesize_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-support/libbytesize/libbytesize_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/libbytesize_%.bbappend
diff --git a/meta-citadel/recipes-support/lvm2/libdevmapper_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-support/lvm2/libdevmapper_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend
diff --git a/meta-citadel/recipes-support/pam/files/pam.d/common-auth b/meta-citadel/recipes-citadel/bbappends/libpam/pam.d/common-auth
similarity index 100%
rename from meta-citadel/recipes-support/pam/files/pam.d/common-auth
rename to meta-citadel/recipes-citadel/bbappends/libpam/pam.d/common-auth
diff --git a/meta-citadel/recipes-citadel/bbappends/libpam_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libpam_%.bbappend
new file mode 100644
index 0000000..c4d87fd
--- /dev/null
+++ b/meta-citadel/recipes-citadel/bbappends/libpam_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/libpam:"
+
+SRC_URI += "file://pam.d/common-auth"
diff --git a/meta-gnome/recipes-support/libpcre/libpcre2_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libpcre2_%.bbappend
similarity index 100%
rename from meta-gnome/recipes-support/libpcre/libpcre2_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/libpcre2_%.bbappend
diff --git a/meta-gnome/recipes-support/libsoup/libsoup-2.4%.bbappend b/meta-citadel/recipes-citadel/bbappends/libsoup-2.4%.bbappend
similarity index 100%
rename from meta-gnome/recipes-support/libsoup/libsoup-2.4%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/libsoup-2.4%.bbappend
diff --git a/meta-citadel/recipes-devtools/llvm/llvm_git.bbappend b/meta-citadel/recipes-citadel/bbappends/llvm_git.bbappend
similarity index 100%
rename from meta-citadel/recipes-devtools/llvm/llvm_git.bbappend
rename to meta-citadel/recipes-citadel/bbappends/llvm_git.bbappend
diff --git a/meta-citadel/recipes-support/lvm2/lvm2_%.bbappend b/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-support/lvm2/lvm2_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend
diff --git a/meta-citadel/recipes-core/mesa/mesa_%.bbappend b/meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-core/mesa/mesa_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend
diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-citadel/recipes-citadel/bbappends/modemmanager_%.bbappend
similarity index 100%
rename from meta-gnome/recipes-connectivity/modemmanager/modemmanager_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/modemmanager_%.bbappend
diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-connectivity/networkmanager/networkmanager_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend
diff --git a/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_13.%.bbappend b/meta-citadel/recipes-citadel/bbappends/pulseaudio_13.%.bbappend
similarity index 100%
rename from meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_13.%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/pulseaudio_13.%.bbappend
diff --git a/meta-citadel/recipes-core/readline/files/inputrc b/meta-citadel/recipes-citadel/bbappends/readline/inputrc
similarity index 100%
rename from meta-citadel/recipes-core/readline/files/inputrc
rename to meta-citadel/recipes-citadel/bbappends/readline/inputrc
diff --git a/meta-citadel/recipes-citadel/bbappends/readline_%.bbappend b/meta-citadel/recipes-citadel/bbappends/readline_%.bbappend
new file mode 100644
index 0000000..411177c
--- /dev/null
+++ b/meta-citadel/recipes-citadel/bbappends/readline_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/readline:"
+
+SRC_URI += "\
+    file://inputrc \
+"
diff --git a/meta-citadel/recipes-devtools/llvm/rust-llvm_%.bbappend b/meta-citadel/recipes-citadel/bbappends/rust-llvm_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-devtools/llvm/rust-llvm_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/rust-llvm_%.bbappend
diff --git a/meta-citadel/recipes-core/systemd/systemd-conf_%.bbappend b/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-core/systemd/systemd-conf_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend
diff --git a/meta-citadel/recipes-core/systemd/systemd_%.bbappend b/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend
similarity index 100%
rename from meta-citadel/recipes-core/systemd/systemd_%.bbappend
rename to meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend
diff --git a/meta-citadel/recipes-core/readline/readline_%.bbappend b/meta-citadel/recipes-core/readline/readline_%.bbappend
deleted file mode 100644
index dc06426..0000000
--- a/meta-citadel/recipes-core/readline/readline_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "\
-    file://inputrc \
-"
diff --git a/meta-citadel/recipes-desktop/gtk+3/gtk+3_%.bbappend b/meta-citadel/recipes-desktop/gtk+3/gtk+3_%.bbappend
deleted file mode 100644
index 0cb2707..0000000
--- a/meta-citadel/recipes-desktop/gtk+3/gtk+3_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://gtk-update-icon-cache-reproducibility-fix.patch"
diff --git a/meta-citadel/recipes-support/pam/libpam_%.bbappend b/meta-citadel/recipes-support/pam/libpam_%.bbappend
deleted file mode 100644
index 7592210..0000000
--- a/meta-citadel/recipes-support/pam/libpam_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://pam.d/common-auth"