145 files changed, 327 insertions, 250 deletions
diff --git a/Makefile.am b/Makefile.am
index f1d83b1e99..39d6503d7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1428,7 +1428,7 @@ src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@
 
-#@src/system/systemd/Makefile --------------------------------------------------
+#@src/grp-system/systemd/Makefile ----------------------------------------------
 systemd_SOURCES = \
 	src/core/main.c
 
@@ -2663,7 +2663,7 @@ EXTRA_DIST += \
 	units/systemd-hibernate-resume@.service.in \
 	units/systemd-hybrid-sleep.service.in
 
-#@src/boot/Makefile ------------------------------------------------------------
+#@src/grp-boot/bootctl/Makefile ------------------------------------------------
 if ENABLE_EFI
 if HAVE_BLKID
 bootctl_SOURCES = \
@@ -2692,7 +2692,7 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_bootctl
 endif
 
-#@discard.mk -------------------------------------------------------------------
+#@src/grp-boot/systemd-boot/Makefile -------------------------------------------
 if HAVE_GNUEFI
 efi_cppflags = \
 	$(EFI_CPPFLAGS) \
@@ -2753,7 +2753,7 @@ endif
 endif
 endif
 
-#@src/boot/efi/Makefile --------------------------------------------------------
+# ------------------------------------------------------------------------------
 systemd_boot_headers = \
 	src/boot/efi/util.h \
 	src/boot/efi/console.h \
@@ -2935,7 +2935,7 @@ systemd_escape_SOURCES = \
 systemd_escape_LDADD = \
 	libshared.la
 
-#@src/system/systemctl/Makefile ------------------------------------------------
+#@src/grp-system/systemctl/Makefile --------------------------------------------
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
@@ -3035,7 +3035,7 @@ systemd_run_SOURCES = \
 systemd_run_LDADD = \
 	libshared.la
 
-#@src/bus-proxyd/Makefile ------------------------------------------------------
+#@src/libbus-proxy-core/Makefile -----------------------------------------------
 noinst_LTLIBRARIES += \
 	libbus-proxy-core.la
 
@@ -3052,6 +3052,7 @@ libbus_proxy_core_la_SOURCES = \
 libbus_proxy_core_la_LIBADD = \
 	libshared.la
 
+#@src/systemd-bus-proxyd/Makefile
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c
 
@@ -3059,6 +3060,7 @@ systemd_bus_proxyd_LDADD = \
 	libbus-proxy-core.la \
 	libshared.la
 
+#@src/systemd-stdio-bridge/Makefile
 systemd_stdio_bridge_SOURCES = \
 	src/bus-proxyd/stdio-bridge.c
 
@@ -3066,6 +3068,7 @@ systemd_stdio_bridge_LDADD = \
 	libbus-proxy-core.la \
 	libshared.la
 
+#@src/systemd-bus-proxyd/Makefile
 nodist_systemunit_DATA += \
 	units/systemd-bus-proxyd.service
 
@@ -3274,6 +3277,7 @@ tests += \
 bin_PROGRAMS += \
 	busctl
 
+#@src/libsystemd/libsystemd-internal/Makefile
 test_bus_marshal_SOURCES = \
 	src/libsystemd/sd-bus/test-bus-marshal.c
 
@@ -3410,6 +3414,7 @@ test_resolve_SOURCES = \
 test_resolve_LDADD = \
 	libshared.la
 
+#@src/busctl/Makefile
 busctl_SOURCES = \
 	src/libsystemd/sd-bus/busctl.c \
 	src/libsystemd/sd-bus/busctl-introspect.c \
@@ -4466,7 +4471,7 @@ systemd_socket_proxyd_SOURCES = \
 systemd_socket_proxyd_LDADD = \
 	libshared.la
 
-#@src/systemd-coredump/Makefile ------------------------------------------------
+#@src/grp-coredump/systemd-coredump/Makefile -----------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
 	src/coredump/coredump.c \
@@ -4500,7 +4505,7 @@ rootlibexec_PROGRAMS += \
 dist_pkgsysconf_DATA += \
 	src/coredump/coredump.conf
 
-#@src/coredumpctl/Makefile
+#@src/grp-coredump/coredumpctl/Makefile
 coredumpctl_SOURCES = \
 	src/coredump/coredumpctl.c
 
@@ -4510,7 +4515,7 @@ coredumpctl_LDADD = \
 bin_PROGRAMS += \
 	coredumpctl
 
-#@src/systemd-coredump/Makefile
+#@src/grp-coredump/systemd-coredump/Makefile
 manual_tests += \
 	test-coredump-vacuum
 
@@ -4522,14 +4527,14 @@ test_coredump_vacuum_SOURCES = \
 test_coredump_vacuum_LDADD = \
 	libshared.la
 
-#@src/coredumpctl/Makefile
+#@src/grp-coredump/coredumpctl/Makefile
 dist_bashcompletion_data += \
 	shell-completion/bash/coredumpctl
 
 dist_zshcompletion_data += \
 	shell-completion/zsh/_coredumpctl
 
-#@src/systemd-coredump/Makefile
+#@src/grp-coredump/systemd-coredump/Makefile
 nodist_sysctl_DATA = \
 	sysctl.d/50-coredump.conf
 
@@ -4793,7 +4798,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
 
-#@src/system/systemd/Makefile --------------------------------------------------
+#@src/grp-system/systemd/Makefile ----------------------------------------------
 dist_systemunit_DATA_busnames += \
 	units/org.freedesktop.systemd1.busname
 
@@ -4980,7 +4985,7 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
-#@src/machine/src/Makefile -----------------------------------------------------
+#@src/grp-machine/systemd-machined/Makefile ------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
@@ -5252,7 +5257,7 @@ EXTRA_DIST += \
 	units/systemd-importd.service.in
 
 
-#@src/resolve/src/Makefile -----------------------------------------------------
+#@src/grp-resolve/systemd-resolved/Makefile ------------------------------------
 if ENABLE_RESOLVED
 
 systemd_resolved_SOURCES = \
diff --git a/discard.mk b/discard.mk
index 2d2cbfc198..3d3eadb1c9 100644
--- a/discard.mk
+++ b/discard.mk
@@ -715,66 +715,6 @@ dist_factory_pam_DATA = \
 	factory/etc/pam.d/other
 endif
 
-ifneq ($(HAVE_GNUEFI),)
-efi_cppflags = \
-	$(EFI_CPPFLAGS) \
-	-I$(top_builddir) -include config.h \
-	-I$(EFI_INC_DIR)/efi \
-	-I$(EFI_INC_DIR)/efi/$(EFI_ARCH) \
-	-DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\"
-
-efi_cflags = \
-	$(EFI_CFLAGS) \
-	-Wall \
-	-Wextra \
-	-std=gnu90 \
-	-nostdinc \
-	-ggdb -O0 \
-	-fpic \
-	-fshort-wchar \
-	-nostdinc \
-	-ffreestanding \
-	-fno-strict-aliasing \
-	-fno-stack-protector \
-	-Wsign-compare \
-	-Wno-missing-field-initializers
-
-ifneq ($(ARCH_X86_64),)
-efi_cflags += \
-	-mno-red-zone \
-	-mno-sse \
-	-mno-mmx \
-	-DEFI_FUNCTION_WRAPPER \
-	-DGNU_EFI_USE_MS_ABI
-endif
-
-ifneq ($(ARCH_IA32),)
-efi_cflags += \
-	-mno-sse \
-	-mno-mmx
-endif
-
-efi_ldflags = \
-	$(EFI_LDFLAGS) \
-	-T $(EFI_LDS_DIR)/elf_$(EFI_ARCH)_efi.lds \
-	-shared \
-	-Bsymbolic \
-	-nostdlib \
-	-znocombreloc \
-	-L $(EFI_LIB_DIR) \
-	$(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o
-
-# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead,
-# and add required symbols manually.
-ifneq ($(ARCH_AARCH64),)
-efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
-EFI_FORMAT = -O binary
-else
-EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
-endif
-endif
-endif
-
 libsystemd-install-hook:
 	libname=libsystemd.so && $(move-to-libdir)
 
diff --git a/move.sh b/move.sh
index 7fc3c6ebcb..2ec0723073 100755
--- a/move.sh
+++ b/move.sh
@@ -10,7 +10,7 @@ in_array() {
 }
 
 move_files() (
-	for d in libsystemd libudev machine resolve; do
+	for d in libsystemd libudev; do
 		mkdir src/$d-new
 		mv -T src/$d src/$d-new/src
 		mv -T src/$d-new src/$d
@@ -84,26 +84,31 @@ move_files() (
 	mkdir src/libsystemd/include
 	mv -T src/{,libsystemd/include}/systemd
 
-	mv -T src/{,machine}/nss-mymachines
-	mv -T src/{,resolve}/nss-resolve
+	mkdir src/grp-machine
+	mv -T src/{machine,grp-machine/systemd-machined}
+	mv -T src/{,grp-machine}/nss-mymachines
 
-	mkdir src/system
-	mv -T src/{,system}/systemctl
+	mkdir src/grp-resolve
+	mv -T src/{resolve,grp-resolve/systemd-resolved}
+	mv -T src/{,grp-resolve}/nss-resolve
+
+	mkdir src/grp-system
+	mv -T src/{,grp-system}/systemctl
 
 	mkdir src/libfirewall
 	mv -T src/lib{shared,firewall}/firewall-util.c
 	mv -T src/lib{shared,firewall}/firewall-util.h
 
-	mkdir src/system/systemd
-	mv -T src/{libcore,system/systemd}/main.c
-	mv -T src/{libcore,system/systemd}/macros.systemd.in
-	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.conf
-	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.policy.in.in
-	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.service
-	mv -T src/{libcore,system/systemd}/system.conf
-	mv -T src/{libcore,system/systemd}/systemd.pc.in
-	mv -T src/{libcore,system/systemd}/triggers.systemd.in
-	mv -T src/{libcore,system/systemd}/user.conf
+	mkdir src/grp-system/systemd
+	mv -T src/{libcore,grp-system/systemd}/main.c
+	mv -T src/{libcore,grp-system/systemd}/macros.systemd.in
+	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.conf
+	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.policy.in.in
+	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.service
+	mv -T src/{libcore,grp-system/systemd}/system.conf
+	mv -T src/{libcore,grp-system/systemd}/systemd.pc.in
+	mv -T src/{libcore,grp-system/systemd}/triggers.systemd.in
+	mv -T src/{libcore,grp-system/systemd}/user.conf
 
 	mkdir src/libudev/include
 	mv -T src/libudev/{src,include}/libudev.h
@@ -117,8 +122,14 @@ move_files() (
 
 	mkdir src/systemd-shutdown
 
-	mkdir src/coredumpctl
-	mv -T src/{systemd-coredump,coredumpctl}/coredumpctl.c
+	mkdir src/grp-coredump
+	mv -T src/{,grp-coredump}/systemd-coredump
+	mkdir src/grp-coredump/coredumpctl
+	mv -T src/grp-coredump/{systemd-coredump,coredumpctl}/coredumpctl.c
+
+	mkdir src/grp-boot
+	mv -T src/boot/efi src/grp-boot/systemd-boot
+	mv -T src/boot src/grp-boot/bootctl
 
 	mkdir build-aux
 	mkdir build-aux/Makefile.{once,each}.{head,tail}
@@ -160,6 +171,12 @@ move_files() (
 	mv src/libsystemd/libsystemd-internal/sd-bus/busctl* src/busctl
 
 	mv -T src/{udev,libudev/src}/udev.h
+
+	mv -T src/{bus-proxyd,libbus-proxy-core}
+	mkdir src/systemd-bus-proxyd
+	mv  src/{libbus-proxy-core,systemd-bus-proxyd}/bus-proxyd.c
+	mkdir src/systemd-stdio-bridge
+	mv  src/{libbus-proxy-core,systemd-stdio-bridge}/stdio-bridge.c
 )
 
 breakup_makefile() (
diff --git a/src/busctl/Makefile b/src/busctl/Makefile
index f547759ad9..d09dd022a6 100644
--- a/src/busctl/Makefile
+++ b/src/busctl/Makefile
@@ -26,142 +26,6 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 bin_PROGRAMS += \
 	busctl
 
-test_bus_marshal_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-marshal.c
-
-test_bus_marshal_LDADD = \
-	libshared.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_bus_marshal_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_bus_signature_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-signature.c
-
-test_bus_signature_LDADD = \
-	libshared.la
-
-test_bus_chat_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-chat.c
-
-test_bus_chat_LDADD = \
-	libshared.la
-
-test_bus_cleanup_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-cleanup.c
-
-test_bus_cleanup_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-test_bus_cleanup_LDADD = \
-	libshared.la
-
-test_bus_server_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-server.c
-
-test_bus_server_LDADD = \
-	libshared.la
-
-test_bus_objects_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-objects.c
-
-test_bus_objects_LDADD = \
-	libshared.la
-
-test_bus_error_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-error.c
-
-test_bus_error_LDADD = \
-	libshared.la
-
-test_bus_gvariant_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-gvariant.c
-
-test_bus_gvariant_LDADD = \
-	libshared.la \
-	$(GLIB_LIBS)
-
-test_bus_gvariant_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GLIB_CFLAGS)
-
-test_bus_creds_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-creds.c
-
-test_bus_creds_LDADD = \
-	libshared.la
-
-test_bus_match_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-match.c
-
-test_bus_match_LDADD = \
-	libshared.la
-
-test_bus_proxy_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-proxy.c
-
-test_bus_proxy_LDADD = \
-	libshared.la
-
-test_bus_kernel_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-kernel.c
-
-test_bus_kernel_LDADD = \
-	libshared.la
-
-test_bus_kernel_bloom_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-kernel-bloom.c
-
-test_bus_kernel_bloom_LDADD = \
-	libshared.la
-
-test_bus_benchmark_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-benchmark.c
-
-test_bus_benchmark_LDADD = \
-	libshared.la
-
-test_bus_zero_copy_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-zero-copy.c
-
-test_bus_zero_copy_LDADD = \
-	libshared.la
-
-test_bus_introspect_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-introspect.c
-
-test_bus_introspect_LDADD = \
-	libshared.la
-
-test_event_SOURCES = \
-	src/libsystemd/sd-event/test-event.c
-
-test_event_LDADD = \
-	libshared.la
-
-test_netlink_SOURCES = \
-	src/libsystemd/sd-netlink/test-netlink.c
-
-test_netlink_LDADD = \
-	libshared.la
-
-test_local_addresses_SOURCES = \
-	src/libsystemd/sd-netlink/test-local-addresses.c
-
-test_local_addresses_LDADD = \
-	libshared.la
-
-test_resolve_SOURCES = \
-	src/libsystemd/sd-resolve/test-resolve.c
-
-test_resolve_LDADD = \
-	libshared.la
-
 busctl_SOURCES = \
 	src/libsystemd/sd-bus/busctl.c \
 	src/libsystemd/sd-bus/busctl-introspect.c \
diff --git a/src/boot/Makefile b/src/grp-boot/bootctl/Makefile
index 9e6c221cb6..9e6c221cb6 100644
--- a/src/boot/Makefile
+++ b/src/grp-boot/bootctl/Makefile
diff --git a/src/boot/bootctl.c b/src/grp-boot/bootctl/bootctl.c
index e9baf69f6a..e9baf69f6a 100644
--- a/src/boot/bootctl.c
+++ b/src/grp-boot/bootctl/bootctl.c
diff --git a/src/boot/efi/.gitignore b/src/grp-boot/systemd-boot/.gitignore
index e193acbe12..e193acbe12 100644
--- a/src/boot/efi/.gitignore
+++ b/src/grp-boot/systemd-boot/.gitignore
diff --git a/src/boot/efi/Makefile b/src/grp-boot/systemd-boot/Makefile
index 321de4ae90..40aa27203c 100644
--- a/src/boot/efi/Makefile
+++ b/src/grp-boot/systemd-boot/Makefile
@@ -23,6 +23,67 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+ifneq ($(HAVE_GNUEFI),)
+efi_cppflags = \
+	$(EFI_CPPFLAGS) \
+	-I$(top_builddir) -include config.h \
+	-I$(EFI_INC_DIR)/efi \
+	-I$(EFI_INC_DIR)/efi/$(EFI_ARCH) \
+	-DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\"
+
+efi_cflags = \
+	$(EFI_CFLAGS) \
+	-Wall \
+	-Wextra \
+	-std=gnu90 \
+	-nostdinc \
+	-ggdb -O0 \
+	-fpic \
+	-fshort-wchar \
+	-nostdinc \
+	-ffreestanding \
+	-fno-strict-aliasing \
+	-fno-stack-protector \
+	-Wsign-compare \
+	-Wno-missing-field-initializers
+
+ifneq ($(ARCH_X86_64),)
+efi_cflags += \
+	-mno-red-zone \
+	-mno-sse \
+	-mno-mmx \
+	-DEFI_FUNCTION_WRAPPER \
+	-DGNU_EFI_USE_MS_ABI
+endif
+
+ifneq ($(ARCH_IA32),)
+efi_cflags += \
+	-mno-sse \
+	-mno-mmx
+endif
+
+efi_ldflags = \
+	$(EFI_LDFLAGS) \
+	-T $(EFI_LDS_DIR)/elf_$(EFI_ARCH)_efi.lds \
+	-shared \
+	-Bsymbolic \
+	-nostdlib \
+	-znocombreloc \
+	-L $(EFI_LIB_DIR) \
+	$(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o
+
+# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead,
+# and add required symbols manually.
+ifneq ($(ARCH_AARCH64),)
+efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
+EFI_FORMAT = -O binary
+else
+EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
+endif
+endif
+endif
+
+# ------------------------------------------------------------------------------
 systemd_boot_headers = \
 	src/boot/efi/util.h \
 	src/boot/efi/console.h \
diff --git a/src/boot/efi/boot.c b/src/grp-boot/systemd-boot/boot.c
index 893980071f..893980071f 100644
--- a/src/boot/efi/boot.c
+++ b/src/grp-boot/systemd-boot/boot.c
diff --git a/src/boot/efi/console.c b/src/grp-boot/systemd-boot/console.c
index c436f8b476..c436f8b476 100644
--- a/src/boot/efi/console.c
+++ b/src/grp-boot/systemd-boot/console.c
diff --git a/src/boot/efi/console.h b/src/grp-boot/systemd-boot/console.h
index 3fe0ce5ec4..3fe0ce5ec4 100644
--- a/src/boot/efi/console.h
+++ b/src/grp-boot/systemd-boot/console.h
diff --git a/src/boot/efi/disk.c b/src/grp-boot/systemd-boot/disk.c
index 3e3b5b224a..3e3b5b224a 100644
--- a/src/boot/efi/disk.c
+++ b/src/grp-boot/systemd-boot/disk.c
diff --git a/src/boot/efi/disk.h b/src/grp-boot/systemd-boot/disk.h
index af91a9c674..af91a9c674 100644
--- a/src/boot/efi/disk.h
+++ b/src/grp-boot/systemd-boot/disk.h
diff --git a/src/boot/efi/graphics.c b/src/grp-boot/systemd-boot/graphics.c
index 4854baf874..4854baf874 100644
--- a/src/boot/efi/graphics.c
+++ b/src/grp-boot/systemd-boot/graphics.c
diff --git a/src/boot/efi/graphics.h b/src/grp-boot/systemd-boot/graphics.h
index cf48e647e7..cf48e647e7 100644
--- a/src/boot/efi/graphics.h
+++ b/src/grp-boot/systemd-boot/graphics.h
diff --git a/src/boot/efi/linux.c b/src/grp-boot/systemd-boot/linux.c
index 0dc99a6c53..0dc99a6c53 100644
--- a/src/boot/efi/linux.c
+++ b/src/grp-boot/systemd-boot/linux.c
diff --git a/src/boot/efi/linux.h b/src/grp-boot/systemd-boot/linux.h
index d9e6ed7955..d9e6ed7955 100644
--- a/src/boot/efi/linux.h
+++ b/src/grp-boot/systemd-boot/linux.h
diff --git a/src/boot/efi/pefile.c b/src/grp-boot/systemd-boot/pefile.c
index 77fff77b69..77fff77b69 100644
--- a/src/boot/efi/pefile.c
+++ b/src/grp-boot/systemd-boot/pefile.c
diff --git a/src/boot/efi/pefile.h b/src/grp-boot/systemd-boot/pefile.h
index 2e445ede17..2e445ede17 100644
--- a/src/boot/efi/pefile.h
+++ b/src/grp-boot/systemd-boot/pefile.h
diff --git a/src/boot/efi/splash.c b/src/grp-boot/systemd-boot/splash.c
index b1cc2c0b72..b1cc2c0b72 100644
--- a/src/boot/efi/splash.c
+++ b/src/grp-boot/systemd-boot/splash.c
diff --git a/src/boot/efi/splash.h b/src/grp-boot/systemd-boot/splash.h
index 09b543fb47..09b543fb47 100644
--- a/src/boot/efi/splash.h
+++ b/src/grp-boot/systemd-boot/splash.h
diff --git a/src/boot/efi/stub.c b/src/grp-boot/systemd-boot/stub.c
index 9633bc1792..9633bc1792 100644
--- a/src/boot/efi/stub.c
+++ b/src/grp-boot/systemd-boot/stub.c
diff --git a/src/boot/efi/util.c b/src/grp-boot/systemd-boot/util.c
index 98c5be74ce..98c5be74ce 100644
--- a/src/boot/efi/util.c
+++ b/src/grp-boot/systemd-boot/util.c
diff --git a/src/boot/efi/util.h b/src/grp-boot/systemd-boot/util.h
index e673cdf9a0..e673cdf9a0 100644
--- a/src/boot/efi/util.h
+++ b/src/grp-boot/systemd-boot/util.h
diff --git a/src/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile
index c300710492..c300710492 100644
--- a/src/coredumpctl/Makefile
+++ b/src/grp-coredump/coredumpctl/Makefile
diff --git a/src/coredumpctl/coredumpctl.c b/src/grp-coredump/coredumpctl/coredumpctl.c
index 5f4f710a0c..5f4f710a0c 100644
--- a/src/coredumpctl/coredumpctl.c
+++ b/src/grp-coredump/coredumpctl/coredumpctl.c
diff --git a/src/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile
index 638154aeb9..638154aeb9 100644
--- a/src/systemd-coredump/Makefile
+++ b/src/grp-coredump/systemd-coredump/Makefile
diff --git a/src/systemd-coredump/coredump-vacuum.c b/src/grp-coredump/systemd-coredump/coredump-vacuum.c
index f02b6dbd87..f02b6dbd87 100644
--- a/src/systemd-coredump/coredump-vacuum.c
+++ b/src/grp-coredump/systemd-coredump/coredump-vacuum.c
diff --git a/src/systemd-coredump/coredump-vacuum.h b/src/grp-coredump/systemd-coredump/coredump-vacuum.h
index 4b7b9f2d98..4b7b9f2d98 100644
--- a/src/systemd-coredump/coredump-vacuum.h
+++ b/src/grp-coredump/systemd-coredump/coredump-vacuum.h
diff --git a/src/systemd-coredump/coredump.c b/src/grp-coredump/systemd-coredump/coredump.c
index 64ce54d97f..64ce54d97f 100644
--- a/src/systemd-coredump/coredump.c
+++ b/src/grp-coredump/systemd-coredump/coredump.c
diff --git a/src/systemd-coredump/coredump.conf b/src/grp-coredump/systemd-coredump/coredump.conf
index c2f0643e03..c2f0643e03 100644
--- a/src/systemd-coredump/coredump.conf
+++ b/src/grp-coredump/systemd-coredump/coredump.conf
diff --git a/src/systemd-coredump/stacktrace.c b/src/grp-coredump/systemd-coredump/stacktrace.c
index 68806992fc..68806992fc 100644
--- a/src/systemd-coredump/stacktrace.c
+++ b/src/grp-coredump/systemd-coredump/stacktrace.c
diff --git a/src/systemd-coredump/stacktrace.h b/src/grp-coredump/systemd-coredump/stacktrace.h
index 15e9c04465..15e9c04465 100644
--- a/src/systemd-coredump/stacktrace.h
+++ b/src/grp-coredump/systemd-coredump/stacktrace.h
diff --git a/src/systemd-coredump/test-coredump-vacuum.c b/src/grp-coredump/systemd-coredump/test-coredump-vacuum.c
index 70a57f183f..70a57f183f 100644
--- a/src/systemd-coredump/test-coredump-vacuum.c
+++ b/src/grp-coredump/systemd-coredump/test-coredump-vacuum.c
diff --git a/src/machine/nss-mymachines/nss-mymachines.c b/src/grp-machine/nss-mymachines/nss-mymachines.c
index 9d401b39dd..9d401b39dd 100644
--- a/src/machine/nss-mymachines/nss-mymachines.c
+++ b/src/grp-machine/nss-mymachines/nss-mymachines.c
diff --git a/src/machine/nss-mymachines/nss-mymachines.sym b/src/grp-machine/nss-mymachines/nss-mymachines.sym
index 0728ac3ba7..0728ac3ba7 100644
--- a/src/machine/nss-mymachines/nss-mymachines.sym
+++ b/src/grp-machine/nss-mymachines/nss-mymachines.sym
diff --git a/src/machine/src/.gitignore b/src/grp-machine/systemd-machined/.gitignore
index e1065b5894..e1065b5894 100644
--- a/src/machine/src/.gitignore
+++ b/src/grp-machine/systemd-machined/.gitignore
diff --git a/src/machine/src/Makefile b/src/grp-machine/systemd-machined/Makefile
index 261f24bd8d..261f24bd8d 100644
--- a/src/machine/src/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
diff --git a/src/machine/src/image-dbus.c b/src/grp-machine/systemd-machined/image-dbus.c
index 73f5112c4d..73f5112c4d 100644
--- a/src/machine/src/image-dbus.c
+++ b/src/grp-machine/systemd-machined/image-dbus.c
diff --git a/src/machine/src/image-dbus.h b/src/grp-machine/systemd-machined/image-dbus.h
index b62da996c6..b62da996c6 100644
--- a/src/machine/src/image-dbus.h
+++ b/src/grp-machine/systemd-machined/image-dbus.h
diff --git a/src/machine/src/machine-dbus.c b/src/grp-machine/systemd-machined/machine-dbus.c
index 71f20b3f07..71f20b3f07 100644
--- a/src/machine/src/machine-dbus.c
+++ b/src/grp-machine/systemd-machined/machine-dbus.c
diff --git a/src/machine/src/machine-dbus.h b/src/grp-machine/systemd-machined/machine-dbus.h
index 224f36529f..224f36529f 100644
--- a/src/machine/src/machine-dbus.h
+++ b/src/grp-machine/systemd-machined/machine-dbus.h
diff --git a/src/machine/src/machine.c b/src/grp-machine/systemd-machined/machine.c
index 468fc1fecf..468fc1fecf 100644
--- a/src/machine/src/machine.c
+++ b/src/grp-machine/systemd-machined/machine.c
diff --git a/src/machine/src/machine.h b/src/grp-machine/systemd-machined/machine.h
index 1d8cc5911a..1d8cc5911a 100644
--- a/src/machine/src/machine.h
+++ b/src/grp-machine/systemd-machined/machine.h
diff --git a/src/machine/src/machinectl.c b/src/grp-machine/systemd-machined/machinectl.c
index fb743ab6cb..fb743ab6cb 100644
--- a/src/machine/src/machinectl.c
+++ b/src/grp-machine/systemd-machined/machinectl.c
diff --git a/src/machine/src/machined-dbus.c b/src/grp-machine/systemd-machined/machined-dbus.c
index 96f2c4769e..96f2c4769e 100644
--- a/src/machine/src/machined-dbus.c
+++ b/src/grp-machine/systemd-machined/machined-dbus.c
diff --git a/src/machine/src/machined.c b/src/grp-machine/systemd-machined/machined.c
index 6ada8671f8..6ada8671f8 100644
--- a/src/machine/src/machined.c
+++ b/src/grp-machine/systemd-machined/machined.c
diff --git a/src/machine/src/machined.h b/src/grp-machine/systemd-machined/machined.h
index 0fe50aaa66..0fe50aaa66 100644
--- a/src/machine/src/machined.h
+++ b/src/grp-machine/systemd-machined/machined.h
diff --git a/src/machine/src/org.freedesktop.machine1.conf b/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf
index 9d40b90151..9d40b90151 100644
--- a/src/machine/src/org.freedesktop.machine1.conf
+++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf
diff --git a/src/machine/src/org.freedesktop.machine1.policy.in b/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in
index 69f78a5c25..69f78a5c25 100644
--- a/src/machine/src/org.freedesktop.machine1.policy.in
+++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in
diff --git a/src/machine/src/org.freedesktop.machine1.service b/src/grp-machine/systemd-machined/org.freedesktop.machine1.service
index d3dc99852b..d3dc99852b 100644
--- a/src/machine/src/org.freedesktop.machine1.service
+++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.service
diff --git a/src/machine/src/test-machine-tables.c b/src/grp-machine/systemd-machined/test-machine-tables.c
index f851a4d37d..f851a4d37d 100644
--- a/src/machine/src/test-machine-tables.c
+++ b/src/grp-machine/systemd-machined/test-machine-tables.c
diff --git a/src/resolve/nss-resolve/nss-resolve.c b/src/grp-resolve/nss-resolve/nss-resolve.c
index d369f1b0c8..d369f1b0c8 100644
--- a/src/resolve/nss-resolve/nss-resolve.c
+++ b/src/grp-resolve/nss-resolve/nss-resolve.c
diff --git a/src/resolve/nss-resolve/nss-resolve.sym b/src/grp-resolve/nss-resolve/nss-resolve.sym
index df8dff2a20..df8dff2a20 100644
--- a/src/resolve/nss-resolve/nss-resolve.sym
+++ b/src/grp-resolve/nss-resolve/nss-resolve.sym
diff --git a/src/resolve/src/.gitignore b/src/grp-resolve/systemd-resolved/.gitignore
index f0835923b7..f0835923b7 100644
--- a/src/resolve/src/.gitignore
+++ b/src/grp-resolve/systemd-resolved/.gitignore
diff --git a/src/resolve/src/Makefile b/src/grp-resolve/systemd-resolved/Makefile
index 67708841c0..67708841c0 100644
--- a/src/resolve/src/Makefile
+++ b/src/grp-resolve/systemd-resolved/Makefile
diff --git a/src/resolve/src/RFCs b/src/grp-resolve/systemd-resolved/RFCs
index 22004a00cd..22004a00cd 100644
--- a/src/resolve/src/RFCs
+++ b/src/grp-resolve/systemd-resolved/RFCs
diff --git a/src/resolve/src/dns-type.c b/src/grp-resolve/systemd-resolved/dns-type.c
index b2f479cae5..b2f479cae5 100644
--- a/src/resolve/src/dns-type.c
+++ b/src/grp-resolve/systemd-resolved/dns-type.c
diff --git a/src/resolve/src/dns-type.h b/src/grp-resolve/systemd-resolved/dns-type.h
index a6c1630021..a6c1630021 100644
--- a/src/resolve/src/dns-type.h
+++ b/src/grp-resolve/systemd-resolved/dns-type.h
diff --git a/src/resolve/src/org.freedesktop.resolve1.conf b/src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.conf
index 25b09774e5..25b09774e5 100644
--- a/src/resolve/src/org.freedesktop.resolve1.conf
+++ b/src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.conf
diff --git a/src/resolve/src/org.freedesktop.resolve1.service b/src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.service
index 7ac5c323f0..7ac5c323f0 100644
--- a/src/resolve/src/org.freedesktop.resolve1.service
+++ b/src/grp-resolve/systemd-resolved/org.freedesktop.resolve1.service
diff --git a/src/resolve/src/resolve-tool.c b/src/grp-resolve/systemd-resolved/resolve-tool.c
index 3f1b6e32f1..3f1b6e32f1 100644
--- a/src/resolve/src/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolved/resolve-tool.c
diff --git a/src/resolve/src/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c
index fc5e6beca0..fc5e6beca0 100644
--- a/src/resolve/src/resolved-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-bus.c
diff --git a/src/resolve/src/resolved-bus.h b/src/grp-resolve/systemd-resolved/resolved-bus.h
index f49e1337d2..f49e1337d2 100644
--- a/src/resolve/src/resolved-bus.h
+++ b/src/grp-resolve/systemd-resolved/resolved-bus.h
diff --git a/src/resolve/src/resolved-conf.c b/src/grp-resolve/systemd-resolved/resolved-conf.c
index bb93fbfda2..bb93fbfda2 100644
--- a/src/resolve/src/resolved-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-conf.c
diff --git a/src/resolve/src/resolved-conf.h b/src/grp-resolve/systemd-resolved/resolved-conf.h
index e1fd2cceec..e1fd2cceec 100644
--- a/src/resolve/src/resolved-conf.h
+++ b/src/grp-resolve/systemd-resolved/resolved-conf.h
diff --git a/src/resolve/src/resolved-def.h b/src/grp-resolve/systemd-resolved/resolved-def.h
index c4c1915b18..c4c1915b18 100644
--- a/src/resolve/src/resolved-def.h
+++ b/src/grp-resolve/systemd-resolved/resolved-def.h
diff --git a/src/resolve/src/resolved-dns-answer.c b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
index 7eb303ab95..7eb303ab95 100644
--- a/src/resolve/src/resolved-dns-answer.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
diff --git a/src/resolve/src/resolved-dns-answer.h b/src/grp-resolve/systemd-resolved/resolved-dns-answer.h
index 8f9c15eab4..8f9c15eab4 100644
--- a/src/resolve/src/resolved-dns-answer.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.h
diff --git a/src/resolve/src/resolved-dns-cache.c b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
index 9bcc71724e..9bcc71724e 100644
--- a/src/resolve/src/resolved-dns-cache.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
diff --git a/src/resolve/src/resolved-dns-cache.h b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
index 2293718e86..2293718e86 100644
--- a/src/resolve/src/resolved-dns-cache.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
diff --git a/src/resolve/src/resolved-dns-dnssec.c b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
index 7123d2d3a8..7123d2d3a8 100644
--- a/src/resolve/src/resolved-dns-dnssec.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
diff --git a/src/resolve/src/resolved-dns-dnssec.h b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
index 77bd4d71bf..77bd4d71bf 100644
--- a/src/resolve/src/resolved-dns-dnssec.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
diff --git a/src/resolve/src/resolved-dns-packet.c b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
index c940dd8929..c940dd8929 100644
--- a/src/resolve/src/resolved-dns-packet.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
diff --git a/src/resolve/src/resolved-dns-packet.h b/src/grp-resolve/systemd-resolved/resolved-dns-packet.h
index 0bf34d270c..0bf34d270c 100644
--- a/src/resolve/src/resolved-dns-packet.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.h
diff --git a/src/resolve/src/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
index a378b2b7f7..a378b2b7f7 100644
--- a/src/resolve/src/resolved-dns-query.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
diff --git a/src/resolve/src/resolved-dns-query.h b/src/grp-resolve/systemd-resolved/resolved-dns-query.h
index 7f7c76ff20..7f7c76ff20 100644
--- a/src/resolve/src/resolved-dns-query.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.h
diff --git a/src/resolve/src/resolved-dns-question.c b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
index 8e452e79a4..8e452e79a4 100644
--- a/src/resolve/src/resolved-dns-question.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
diff --git a/src/resolve/src/resolved-dns-question.h b/src/grp-resolve/systemd-resolved/resolved-dns-question.h
index ea41478975..ea41478975 100644
--- a/src/resolve/src/resolved-dns-question.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.h
diff --git a/src/resolve/src/resolved-dns-rr.c b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
index 40f8e28dfd..40f8e28dfd 100644
--- a/src/resolve/src/resolved-dns-rr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
diff --git a/src/resolve/src/resolved-dns-rr.h b/src/grp-resolve/systemd-resolved/resolved-dns-rr.h
index 2e0dfbaba3..2e0dfbaba3 100644
--- a/src/resolve/src/resolved-dns-rr.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.h
diff --git a/src/resolve/src/resolved-dns-scope.c b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
index a406872a38..a406872a38 100644
--- a/src/resolve/src/resolved-dns-scope.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
diff --git a/src/resolve/src/resolved-dns-scope.h b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
index 291e5817d0..291e5817d0 100644
--- a/src/resolve/src/resolved-dns-scope.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
diff --git a/src/resolve/src/resolved-dns-search-domain.c b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
index 732471027b..732471027b 100644
--- a/src/resolve/src/resolved-dns-search-domain.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
diff --git a/src/resolve/src/resolved-dns-search-domain.h b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h
index eaacef4edc..eaacef4edc 100644
--- a/src/resolve/src/resolved-dns-search-domain.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h
diff --git a/src/resolve/src/resolved-dns-server.c b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
index 27342a0e04..27342a0e04 100644
--- a/src/resolve/src/resolved-dns-server.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
diff --git a/src/resolve/src/resolved-dns-server.h b/src/grp-resolve/systemd-resolved/resolved-dns-server.h
index 9f4a69c37a..9f4a69c37a 100644
--- a/src/resolve/src/resolved-dns-server.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.h
diff --git a/src/resolve/src/resolved-dns-stream.c b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
index a1040aeff4..a1040aeff4 100644
--- a/src/resolve/src/resolved-dns-stream.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
diff --git a/src/resolve/src/resolved-dns-stream.h b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
index 5ccc842249..5ccc842249 100644
--- a/src/resolve/src/resolved-dns-stream.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
diff --git a/src/resolve/src/resolved-dns-synthesize.c b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
index f4a43dee8c..f4a43dee8c 100644
--- a/src/resolve/src/resolved-dns-synthesize.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
diff --git a/src/resolve/src/resolved-dns-synthesize.h b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h
index 5d829bb2e7..5d829bb2e7 100644
--- a/src/resolve/src/resolved-dns-synthesize.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h
diff --git a/src/resolve/src/resolved-dns-transaction.c b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
index d48fdd1281..d48fdd1281 100644
--- a/src/resolve/src/resolved-dns-transaction.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
diff --git a/src/resolve/src/resolved-dns-transaction.h b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h
index 4617194711..4617194711 100644
--- a/src/resolve/src/resolved-dns-transaction.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h
diff --git a/src/resolve/src/resolved-dns-trust-anchor.c b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
index a75337eb6a..a75337eb6a 100644
--- a/src/resolve/src/resolved-dns-trust-anchor.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
diff --git a/src/resolve/src/resolved-dns-trust-anchor.h b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
index 635c75fde5..635c75fde5 100644
--- a/src/resolve/src/resolved-dns-trust-anchor.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
diff --git a/src/resolve/src/resolved-dns-zone.c b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
index f52383cfd1..f52383cfd1 100644
--- a/src/resolve/src/resolved-dns-zone.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
diff --git a/src/resolve/src/resolved-dns-zone.h b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
index 408833c359..408833c359 100644
--- a/src/resolve/src/resolved-dns-zone.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
diff --git a/src/resolve/src/resolved-etc-hosts.c b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
index ee82c96822..ee82c96822 100644
--- a/src/resolve/src/resolved-etc-hosts.c
+++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
diff --git a/src/resolve/src/resolved-etc-hosts.h b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h
index 9d5a175f18..9d5a175f18 100644
--- a/src/resolve/src/resolved-etc-hosts.h
+++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h
diff --git a/src/resolve/src/resolved-gperf.gperf b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
index 82f26215df..82f26215df 100644
--- a/src/resolve/src/resolved-gperf.gperf
+++ b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
diff --git a/src/resolve/src/resolved-link-bus.c b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
index df7516f4f4..df7516f4f4 100644
--- a/src/resolve/src/resolved-link-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
diff --git a/src/resolve/src/resolved-link-bus.h b/src/grp-resolve/systemd-resolved/resolved-link-bus.h
index 5a8ee08ec7..5a8ee08ec7 100644
--- a/src/resolve/src/resolved-link-bus.h
+++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.h
diff --git a/src/resolve/src/resolved-link.c b/src/grp-resolve/systemd-resolved/resolved-link.c
index 65df95bb1f..65df95bb1f 100644
--- a/src/resolve/src/resolved-link.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link.c
diff --git a/src/resolve/src/resolved-link.h b/src/grp-resolve/systemd-resolved/resolved-link.h
index f534c12824..f534c12824 100644
--- a/src/resolve/src/resolved-link.h
+++ b/src/grp-resolve/systemd-resolved/resolved-link.h
diff --git a/src/resolve/src/resolved-llmnr.c b/src/grp-resolve/systemd-resolved/resolved-llmnr.c
index ef12abfbb5..ef12abfbb5 100644
--- a/src/resolve/src/resolved-llmnr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-llmnr.c
diff --git a/src/resolve/src/resolved-llmnr.h b/src/grp-resolve/systemd-resolved/resolved-llmnr.h
index 8133582fa7..8133582fa7 100644
--- a/src/resolve/src/resolved-llmnr.h
+++ b/src/grp-resolve/systemd-resolved/resolved-llmnr.h
diff --git a/src/resolve/src/resolved-manager.c b/src/grp-resolve/systemd-resolved/resolved-manager.c
index e82c6ec563..e82c6ec563 100644
--- a/src/resolve/src/resolved-manager.c
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.c
diff --git a/src/resolve/src/resolved-manager.h b/src/grp-resolve/systemd-resolved/resolved-manager.h
index 8bef2d2b28..8bef2d2b28 100644
--- a/src/resolve/src/resolved-manager.h
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.h
diff --git a/src/resolve/src/resolved-mdns.c b/src/grp-resolve/systemd-resolved/resolved-mdns.c
index bc8b8b809b..bc8b8b809b 100644
--- a/src/resolve/src/resolved-mdns.c
+++ b/src/grp-resolve/systemd-resolved/resolved-mdns.c
diff --git a/src/resolve/src/resolved-mdns.h b/src/grp-resolve/systemd-resolved/resolved-mdns.h
index 5d274648f4..5d274648f4 100644
--- a/src/resolve/src/resolved-mdns.h
+++ b/src/grp-resolve/systemd-resolved/resolved-mdns.h
diff --git a/src/resolve/src/resolved-resolv-conf.c b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
index 065427b690..065427b690 100644
--- a/src/resolve/src/resolved-resolv-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
diff --git a/src/resolve/src/resolved-resolv-conf.h b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.h
index 75fa080e4c..75fa080e4c 100644
--- a/src/resolve/src/resolved-resolv-conf.h
+++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.h
diff --git a/src/resolve/src/resolved.c b/src/grp-resolve/systemd-resolved/resolved.c
index 07e6bfb54a..07e6bfb54a 100644
--- a/src/resolve/src/resolved.c
+++ b/src/grp-resolve/systemd-resolved/resolved.c
diff --git a/src/resolve/src/resolved.conf.in b/src/grp-resolve/systemd-resolved/resolved.conf.in
index efc9c6733a..efc9c6733a 100644
--- a/src/resolve/src/resolved.conf.in
+++ b/src/grp-resolve/systemd-resolved/resolved.conf.in
diff --git a/src/resolve/src/test-dnssec-complex.c b/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
index 568400ac77..568400ac77 100644
--- a/src/resolve/src/test-dnssec-complex.c
+++ b/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
diff --git a/src/resolve/src/test-dnssec.c b/src/grp-resolve/systemd-resolved/test-dnssec.c
index a093d86a91..a093d86a91 100644
--- a/src/resolve/src/test-dnssec.c
+++ b/src/grp-resolve/systemd-resolved/test-dnssec.c
diff --git a/src/resolve/src/test-resolve-tables.c b/src/grp-resolve/systemd-resolved/test-resolve-tables.c
index 63660afc87..63660afc87 100644
--- a/src/resolve/src/test-resolve-tables.c
+++ b/src/grp-resolve/systemd-resolved/test-resolve-tables.c
diff --git a/src/system/systemctl/Makefile b/src/grp-system/systemctl/Makefile
index a83c552a06..a83c552a06 100644
--- a/src/system/systemctl/Makefile
+++ b/src/grp-system/systemctl/Makefile
diff --git a/src/system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c
index c03fca06c8..c03fca06c8 100644
--- a/src/system/systemctl/systemctl.c
+++ b/src/grp-system/systemctl/systemctl.c
diff --git a/src/system/systemctl/systemd-sysv-install.SKELETON b/src/grp-system/systemctl/systemd-sysv-install.SKELETON
index a53a3e6221..a53a3e6221 100755
--- a/src/system/systemctl/systemd-sysv-install.SKELETON
+++ b/src/grp-system/systemctl/systemd-sysv-install.SKELETON
diff --git a/src/system/systemd/Makefile b/src/grp-system/systemd/Makefile
index e77395c7cf..e77395c7cf 100644
--- a/src/system/systemd/Makefile
+++ b/src/grp-system/systemd/Makefile
diff --git a/src/system/systemd/macros.systemd.in b/src/grp-system/systemd/macros.systemd.in
index 2cace3d3ba..2cace3d3ba 100644
--- a/src/system/systemd/macros.systemd.in
+++ b/src/grp-system/systemd/macros.systemd.in
diff --git a/src/system/systemd/main.c b/src/grp-system/systemd/main.c
index bc151cde85..bc151cde85 100644
--- a/src/system/systemd/main.c
+++ b/src/grp-system/systemd/main.c
diff --git a/src/system/systemd/org.freedesktop.systemd1.conf b/src/grp-system/systemd/org.freedesktop.systemd1.conf
index 6a7a37ee92..6a7a37ee92 100644
--- a/src/system/systemd/org.freedesktop.systemd1.conf
+++ b/src/grp-system/systemd/org.freedesktop.systemd1.conf
diff --git a/src/system/systemd/org.freedesktop.systemd1.policy.in.in b/src/grp-system/systemd/org.freedesktop.systemd1.policy.in.in
index cc39a9e1c3..cc39a9e1c3 100644
--- a/src/system/systemd/org.freedesktop.systemd1.policy.in.in
+++ b/src/grp-system/systemd/org.freedesktop.systemd1.policy.in.in
diff --git a/src/system/systemd/org.freedesktop.systemd1.service b/src/grp-system/systemd/org.freedesktop.systemd1.service
index d4df3e93a2..d4df3e93a2 100644
--- a/src/system/systemd/org.freedesktop.systemd1.service
+++ b/src/grp-system/systemd/org.freedesktop.systemd1.service
diff --git a/src/system/systemd/system.conf b/src/grp-system/systemd/system.conf
index e2ded27333..e2ded27333 100644
--- a/src/system/systemd/system.conf
+++ b/src/grp-system/systemd/system.conf
diff --git a/src/system/systemd/systemd.pc.in b/src/grp-system/systemd/systemd.pc.in
index ac52b30dd3..ac52b30dd3 100644
--- a/src/system/systemd/systemd.pc.in
+++ b/src/grp-system/systemd/systemd.pc.in
diff --git a/src/system/systemd/triggers.systemd.in b/src/grp-system/systemd/triggers.systemd.in
index 9e18a39a67..9e18a39a67 100644
--- a/src/system/systemd/triggers.systemd.in
+++ b/src/grp-system/systemd/triggers.systemd.in
diff --git a/src/system/systemd/user.conf b/src/grp-system/systemd/user.conf
index 87c8164378..87c8164378 100644
--- a/src/system/systemd/user.conf
+++ b/src/grp-system/systemd/user.conf
diff --git a/src/libbus-proxy-core/Makefile b/src/libbus-proxy-core/Makefile
new file mode 100644
index 0000000000..3ac995f31c
--- /dev/null
+++ b/src/libbus-proxy-core/Makefile
@@ -0,0 +1,43 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+noinst_LTLIBRARIES += \
+	libbus-proxy-core.la
+
+libbus_proxy_core_la_SOURCES = \
+	src/bus-proxyd/bus-xml-policy.c \
+	src/bus-proxyd/bus-xml-policy.h \
+	src/bus-proxyd/driver.c \
+	src/bus-proxyd/driver.h \
+	src/bus-proxyd/proxy.c \
+	src/bus-proxyd/proxy.h \
+	src/bus-proxyd/synthesize.c \
+	src/bus-proxyd/synthesize.h
+
+libbus_proxy_core_la_LIBADD = \
+	libshared.la
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/libbus-proxy-core/bus-xml-policy.c
index 86a8362142..86a8362142 100644
--- a/src/bus-proxyd/bus-xml-policy.c
+++ b/src/libbus-proxy-core/bus-xml-policy.c
diff --git a/src/bus-proxyd/bus-xml-policy.h b/src/libbus-proxy-core/bus-xml-policy.h
index 3dcddaa048..3dcddaa048 100644
--- a/src/bus-proxyd/bus-xml-policy.h
+++ b/src/libbus-proxy-core/bus-xml-policy.h
diff --git a/src/bus-proxyd/driver.c b/src/libbus-proxy-core/driver.c
index 133b2e0f39..133b2e0f39 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/libbus-proxy-core/driver.c
diff --git a/src/bus-proxyd/driver.h b/src/libbus-proxy-core/driver.h
index cad7aa7851..cad7aa7851 100644
--- a/src/bus-proxyd/driver.h
+++ b/src/libbus-proxy-core/driver.h
diff --git a/src/bus-proxyd/proxy.c b/src/libbus-proxy-core/proxy.c
index bcfbab0dad..bcfbab0dad 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/libbus-proxy-core/proxy.c
diff --git a/src/bus-proxyd/proxy.h b/src/libbus-proxy-core/proxy.h
index 0e3ed8a87a..0e3ed8a87a 100644
--- a/src/bus-proxyd/proxy.h
+++ b/src/libbus-proxy-core/proxy.h
diff --git a/src/bus-proxyd/synthesize.c b/src/libbus-proxy-core/synthesize.c
index 7562f29ecb..7562f29ecb 100644
--- a/src/bus-proxyd/synthesize.c
+++ b/src/libbus-proxy-core/synthesize.c
diff --git a/src/bus-proxyd/synthesize.h b/src/libbus-proxy-core/synthesize.h
index cb8c21cdb7..cb8c21cdb7 100644
--- a/src/bus-proxyd/synthesize.h
+++ b/src/libbus-proxy-core/synthesize.h
diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/libbus-proxy-core/test-bus-xml-policy.c
index 6f32c09789..6f32c09789 100644
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ b/src/libbus-proxy-core/test-bus-xml-policy.c
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index f855da96ce..086e904d0e 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -120,5 +120,141 @@ libsystemd_internal_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libsystemd-internal.la
 
+test_bus_marshal_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-marshal.c
+
+test_bus_marshal_LDADD = \
+	libshared.la \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS)
+
+test_bus_marshal_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+test_bus_signature_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-signature.c
+
+test_bus_signature_LDADD = \
+	libshared.la
+
+test_bus_chat_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-chat.c
+
+test_bus_chat_LDADD = \
+	libshared.la
+
+test_bus_cleanup_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-cleanup.c
+
+test_bus_cleanup_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(SECCOMP_CFLAGS)
+
+test_bus_cleanup_LDADD = \
+	libshared.la
+
+test_bus_server_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-server.c
+
+test_bus_server_LDADD = \
+	libshared.la
+
+test_bus_objects_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-objects.c
+
+test_bus_objects_LDADD = \
+	libshared.la
+
+test_bus_error_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-error.c
+
+test_bus_error_LDADD = \
+	libshared.la
+
+test_bus_gvariant_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-gvariant.c
+
+test_bus_gvariant_LDADD = \
+	libshared.la \
+	$(GLIB_LIBS)
+
+test_bus_gvariant_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(GLIB_CFLAGS)
+
+test_bus_creds_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-creds.c
+
+test_bus_creds_LDADD = \
+	libshared.la
+
+test_bus_match_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-match.c
+
+test_bus_match_LDADD = \
+	libshared.la
+
+test_bus_proxy_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-proxy.c
+
+test_bus_proxy_LDADD = \
+	libshared.la
+
+test_bus_kernel_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-kernel.c
+
+test_bus_kernel_LDADD = \
+	libshared.la
+
+test_bus_kernel_bloom_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-kernel-bloom.c
+
+test_bus_kernel_bloom_LDADD = \
+	libshared.la
+
+test_bus_benchmark_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-benchmark.c
+
+test_bus_benchmark_LDADD = \
+	libshared.la
+
+test_bus_zero_copy_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-zero-copy.c
+
+test_bus_zero_copy_LDADD = \
+	libshared.la
+
+test_bus_introspect_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-introspect.c
+
+test_bus_introspect_LDADD = \
+	libshared.la
+
+test_event_SOURCES = \
+	src/libsystemd/sd-event/test-event.c
+
+test_event_LDADD = \
+	libshared.la
+
+test_netlink_SOURCES = \
+	src/libsystemd/sd-netlink/test-netlink.c
+
+test_netlink_LDADD = \
+	libshared.la
+
+test_local_addresses_SOURCES = \
+	src/libsystemd/sd-netlink/test-local-addresses.c
+
+test_local_addresses_LDADD = \
+	libshared.la
+
+test_resolve_SOURCES = \
+	src/libsystemd/sd-resolve/test-resolve.c
+
+test_resolve_LDADD = \
+	libshared.la
+
 $(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/Makefile b/src/systemd-bus-proxyd/Makefile
index ef70e3e456..83f3552d6d 100644
--- a/src/bus-proxyd/Makefile
+++ b/src/systemd-bus-proxyd/Makefile
@@ -23,22 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
-	libbus-proxy-core.la
-
-libbus_proxy_core_la_SOURCES = \
-	src/bus-proxyd/bus-xml-policy.c \
-	src/bus-proxyd/bus-xml-policy.h \
-	src/bus-proxyd/driver.c \
-	src/bus-proxyd/driver.h \
-	src/bus-proxyd/proxy.c \
-	src/bus-proxyd/proxy.h \
-	src/bus-proxyd/synthesize.c \
-	src/bus-proxyd/synthesize.h
-
-libbus_proxy_core_la_LIBADD = \
-	libshared.la
-
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c
 
@@ -46,13 +30,6 @@ systemd_bus_proxyd_LDADD = \
 	libbus-proxy-core.la \
 	libshared.la
 
-systemd_stdio_bridge_SOURCES = \
-	src/bus-proxyd/stdio-bridge.c
-
-systemd_stdio_bridge_LDADD = \
-	libbus-proxy-core.la \
-	libshared.la
-
 nodist_systemunit_DATA += \
 	units/systemd-bus-proxyd.service
 
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/systemd-bus-proxyd/bus-proxyd.c
index 17b80c3e9a..17b80c3e9a 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/systemd-bus-proxyd/bus-proxyd.c
diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile
new file mode 100644
index 0000000000..24852e78ed
--- /dev/null
+++ b/src/systemd-stdio-bridge/Makefile
@@ -0,0 +1,34 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd_stdio_bridge_SOURCES = \
+	src/bus-proxyd/stdio-bridge.c
+
+systemd_stdio_bridge_LDADD = \
+	libbus-proxy-core.la \
+	libshared.la
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c
index 60c4a08325..60c4a08325 100644
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/systemd-stdio-bridge/stdio-bridge.c