diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb
new file mode 100644
index 0000000..3aab2d9
--- /dev/null
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = ""
+HOMEPAGE = ""
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+S = "${WORKDIR}"
+
+SRC_URI = "file://gsettings/90_citadel.gschema.override"
+
+inherit allarch gsettings
+
+do_install() {
+    install -d ${D}${datadir}/glib-2.0/schemas
+    install -m 644 ${S}/gsettings/90_citadel.gschema.override ${D}${datadir}/glib-2.0/schemas
+}
+
+FILES_${PN} = "/"
diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
index ed4e436..731d4da 100644
--- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
@@ -1,6 +1,3 @@
-# Copyright (C) 2018 Bruce Leidl <bruce@subgraph.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
 DESCRIPTION = ""
 HOMEPAGE = ""
 LICENSE = "MIT"
@@ -8,6 +5,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 SECTION = ""
 DEPENDS = ""
 
+S = "${WORKDIR}"
+
+DEFAULT_REALM_UNITS = "\
+    file://systemd/launch-default-realm.path \
+    file://systemd/launch-default-realm.service \
+    file://systemd/watch-run-user.path \
+    file://systemd/watch-run-user.service \
+"
+
 SRC_URI = "\
     file://locale.conf \
     file://environment.sh \
@@ -18,16 +24,22 @@ SRC_URI = "\
     file://citadel-ifconfig.sh \
     file://00-storage-tmpfiles.conf \
     file://NetworkManager.conf \
-    file://zram-swap.service \
     file://share/dot.vimrc \
     file://polkit/citadel.rules \
+    file://systemd/zram-swap.service \
+    ${DEFAULT_REALM_UNITS} \
 "
 
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "-m -u 1000 -s /bin/bash citadel"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
 # for citadel-ifconfig.sh
 RDEPENDS_${PN} = "bash"
 
-inherit systemd
-SYSTEMD_SERVICE_${PN} = "zram-swap.service"
+inherit allarch systemd useradd
+
+SYSTEMD_SERVICE_${PN} = "zram-swap.service watch-run-user.path"
 
 do_install() {
     install -m 0755 -d ${D}/storage
@@ -50,7 +62,12 @@ do_install() {
     install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager
 
     install -d ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/zram-swap.service ${D}${systemd_system_unitdir}
+    install -m 644 ${WORKDIR}/systemd/zram-swap.service ${D}${systemd_system_unitdir}
+
+    install -m 644 ${WORKDIR}/systemd/watch-run-user.path ${D}${systemd_system_unitdir}
+    install -m 644 ${WORKDIR}/systemd/watch-run-user.service ${D}${systemd_system_unitdir}
+    install -m 644 ${WORKDIR}/systemd/launch-default-realm.path ${D}${systemd_system_unitdir}
+    install -m 644 ${WORKDIR}/systemd/launch-default-realm.service ${D}${systemd_system_unitdir}
 
     # disable some pax and grsecurity features so that debootstrap will work
     # this should be removed later
diff --git a/meta-citadel/recipes-citadel/citadel-desktop-gsettings/files/90_citadel.gschema.override b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
similarity index 100%
rename from meta-citadel/recipes-citadel/citadel-desktop-gsettings/files/90_citadel.gschema.override
rename to meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
diff --git a/meta-citadel/recipes-citadel/launch-default-realm/files/launch-default-realm.path b/meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.path
similarity index 100%
rename from meta-citadel/recipes-citadel/launch-default-realm/files/launch-default-realm.path
rename to meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.path
diff --git a/meta-citadel/recipes-citadel/launch-default-realm/files/launch-default-realm.service b/meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.service
similarity index 100%
rename from meta-citadel/recipes-citadel/launch-default-realm/files/launch-default-realm.service
rename to meta-citadel/recipes-citadel/citadel-config/files/systemd/launch-default-realm.service
diff --git a/meta-citadel/recipes-citadel/launch-default-realm/files/watch-run-user.path b/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-run-user.path
similarity index 100%
rename from meta-citadel/recipes-citadel/launch-default-realm/files/watch-run-user.path
rename to meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-run-user.path
diff --git a/meta-citadel/recipes-citadel/launch-default-realm/files/watch-run-user.service b/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-run-user.service
similarity index 100%
rename from meta-citadel/recipes-citadel/launch-default-realm/files/watch-run-user.service
rename to meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-run-user.service
diff --git a/meta-citadel/recipes-citadel/citadel-config/files/zram-swap.service b/meta-citadel/recipes-citadel/citadel-config/files/systemd/zram-swap.service
similarity index 100%
rename from meta-citadel/recipes-citadel/citadel-config/files/zram-swap.service
rename to meta-citadel/recipes-citadel/citadel-config/files/systemd/zram-swap.service
diff --git a/meta-citadel/recipes-citadel/citadel-desktop-gsettings/citadel-desktop-gsettings.bb b/meta-citadel/recipes-citadel/citadel-desktop-gsettings/citadel-desktop-gsettings.bb
deleted file mode 100644
index 92e1337..0000000
--- a/meta-citadel/recipes-citadel/citadel-desktop-gsettings/citadel-desktop-gsettings.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-inherit allarch 
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-S = "${WORKDIR}"
-SRC_URI="file://90_citadel.gschema.override"
-
-inherit gsettings
-
-do_install() {
-    install -d ${D}${datadir}/glib-2.0/schemas
-    install -m 644 ${S}/90_citadel.gschema.override ${D}${datadir}/glib-2.0/schemas
-}
diff --git a/meta-citadel/recipes-citadel/citadel-user/citadel-user.bb b/meta-citadel/recipes-citadel/citadel-user/citadel-user.bb
deleted file mode 100644
index 2c319b0..0000000
--- a/meta-citadel/recipes-citadel/citadel-user/citadel-user.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit allarch useradd
-
-LICENSE = "MIT"
-S = "${WORKDIR}"
-
-ALLOW_EMPTY_${PN} = "1"
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "-m -u 1000 -s /bin/bash citadel"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta-citadel/recipes-citadel/launch-default-realm/launch-default-realm.bb b/meta-citadel/recipes-citadel/launch-default-realm/launch-default-realm.bb
deleted file mode 100644
index d4f08ea..0000000
--- a/meta-citadel/recipes-citadel/launch-default-realm/launch-default-realm.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-
-DESCRIPTION = "Install systemd unit file to automatically start default realm"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-SECTION = ""
-DEPENDS = ""
-
-inherit systemd
-
-SRC_URI = "file://launch-default-realm.path file://launch-default-realm.service file://watch-run-user.path file://watch-run-user.service" 
-
-S = "${WORKDIR}"
-
-SYSTEMD_SERVICE_${PN} = "watch-run-user.path"
-RDEPENDS_${PN} = "bash"
-
-FILES_${PN} += "\
-    ${systemd_system_unitdir}/watch-run-user.service \
-    ${systemd_system_unitdir}/launch-default-realm.path \
-    ${systemd_system_unitdir}/launch-default-realm.service \
-"
-
-do_install() {
-    install -d ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/launch-default-realm.path ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/launch-default-realm.service ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/watch-run-user.path ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/watch-run-user.service ${D}${systemd_system_unitdir}
-}
diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb
index 64861cd..b1a56c3 100644
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb
@@ -42,7 +42,6 @@ RDEPENDS_${PN} = "\
     packagegroup-firmware \
     vim \
     vifm \
-    citadel-user \
     tzdata \
     tzdata-americas \
     tzdata-asia \
diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb
index bf0a965..551b5cd 100644
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb
@@ -7,7 +7,6 @@ RDEPENDS_${PN} = "\
     packagegroup-gnome \
     packagegroup-sway \
     packagegroup-theme \
-    launch-default-realm \
     citadel-rootfs \
     citadel-realms \
 "
diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb
index c58f076..a3a2dee 100644
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb
@@ -20,7 +20,6 @@ RDEPENDS_${PN} = "\
     gjs \
     caribou \
     gnome-keyring \
-    citadel-desktop-gsettings \
     gnome-session \
     gnome-shell \
     adwaita-icon-theme \
@@ -30,5 +29,6 @@ RDEPENDS_${PN} = "\
     adwaita-icon-theme-cursors \
     hicolor-icon-theme \
     dash-to-panel \
+    citadel-config-gnome \
 "